r9565 - in /desktop/experimental/gnome-games/debian: ./ patches/ pixmaps/

joss at users.alioth.debian.org joss at users.alioth.debian.org
Sat Apr 7 16:25:02 UTC 2007


Author: joss
Date: Sat Apr  7 16:25:01 2007
New Revision: 9565

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=9565
Log:
* Make patches numbered.
* Update package descriptions.
* 01_ggz.patch: use the packaged ggz libraries instead of the bundled
  ones.
* 02_desktop-path.patch: add the two new games.
* games-server_relocate.patch: removed, deprecated by GGZ.
* 03_dont_build_ggz.patch: remove the ggz build.
* 99_reautoconf.patch: re-run autoconf because of upper patches.
* Disable bundled gnuchess.
* pixmaps, gnome-games.menu: remove gataxx, add glchess and sudoku.
* Switch to Guile 1.8.
* Build-depend on gnome-doc-utils, intltool 0.35.0, python 2.4,
  python-gtk2-dev 2.10.0, python-gnome2-desktop-dev 2.17.3,
  python-support, libxml2-dev 2.4.0, libglade2-dev, libggzdmod-dev
  0.0.14, libggz-gtk-dev 0.0.14, ggzcore-bin 0.0.14.
* Depend on python-gtk2 2.10.0, python-gnome2-desktop 2.17.3,
  gnuchess.
* Bump libgnome/libgnomeui requirements to 2.16.0.
* Pass --disable-scrollkeeper to the configure.
* gnome-games.{postinst,postrm}: move gtali scores to the new scheme.
* Use 2.4- as pyversions.
* *.install: update file distribution accordingly.
* Recommend python-gtkglext1, python-opengl.

Added:
    desktop/experimental/gnome-games/debian/patches/01_ggz.patch
    desktop/experimental/gnome-games/debian/patches/02_desktop-path.patch
      - copied, changed from r9553, desktop/experimental/gnome-games/debian/patches/desktop-path.patch
    desktop/experimental/gnome-games/debian/patches/03_dont_build_ggz.patch
    desktop/experimental/gnome-games/debian/patches/99_reautoconf.patch
    desktop/experimental/gnome-games/debian/patches/series
    desktop/experimental/gnome-games/debian/pixmaps/glchess.xpm
    desktop/experimental/gnome-games/debian/pixmaps/gnome-sudoku.xpm
    desktop/experimental/gnome-games/debian/pyversions
Removed:
    desktop/experimental/gnome-games/debian/patches/desktop-path.patch
    desktop/experimental/gnome-games/debian/patches/games-server_relocate.patch
    desktop/experimental/gnome-games/debian/pixmaps/gataxx.xpm
Modified:
    desktop/experimental/gnome-games/debian/changelog
    desktop/experimental/gnome-games/debian/control
    desktop/experimental/gnome-games/debian/control.in
    desktop/experimental/gnome-games/debian/gnome-games-data.install
    desktop/experimental/gnome-games/debian/gnome-games.install
    desktop/experimental/gnome-games/debian/gnome-games.menu
    desktop/experimental/gnome-games/debian/gnome-games.postinst
    desktop/experimental/gnome-games/debian/gnome-games.postrm
    desktop/experimental/gnome-games/debian/rules

Modified: desktop/experimental/gnome-games/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-games/debian/changelog?rev=9565&op=diff
==============================================================================
--- desktop/experimental/gnome-games/debian/changelog (original)
+++ desktop/experimental/gnome-games/debian/changelog Sat Apr  7 16:25:01 2007
@@ -1,9 +1,32 @@
-gnome-games (1:2.18.0.1-1) UNRELEASED; urgency=low
+gnome-games (1:2.18.0.1-1) experimental; urgency=low
 
   * New upstream release.
   * Switch to quilt for patch handling.
-
- -- Josselin Mouette <joss at debian.org>  Sat, 07 Apr 2007 11:27:27 +0200
+  * Make patches numbered.
+  * Update package descriptions.
+  * 01_ggz.patch: use the packaged ggz libraries instead of the bundled
+    ones.
+  * 02_desktop-path.patch: add the two new games.
+  * games-server_relocate.patch: removed, deprecated by GGZ.
+  * 03_dont_build_ggz.patch: remove the ggz build.
+  * 99_reautoconf.patch: re-run autoconf because of upper patches.
+  * Disable bundled gnuchess.
+  * pixmaps, gnome-games.menu: remove gataxx, add glchess and sudoku.
+  * Switch to Guile 1.8.
+  * Build-depend on gnome-doc-utils, intltool 0.35.0, python 2.4,
+    python-gtk2-dev 2.10.0, python-gnome2-desktop-dev 2.17.3,
+    python-support, libxml2-dev 2.4.0, libglade2-dev, libggzdmod-dev
+    0.0.14, libggz-gtk-dev 0.0.14, ggzcore-bin 0.0.14.
+  * Depend on python-gtk2 2.10.0, python-gnome2-desktop 2.17.3,
+    gnuchess.
+  * Bump libgnome/libgnomeui requirements to 2.16.0.
+  * Pass --disable-scrollkeeper to the configure.
+  * gnome-games.{postinst,postrm}: move gtali scores to the new scheme.
+  * Use 2.4- as pyversions.
+  * *.install: update file distribution accordingly.
+  * Recommend python-gtkglext1, python-opengl.
+
+ -- Josselin Mouette <joss at debian.org>  Sat, 07 Apr 2007 18:07:22 +0200
 
 gnome-games (1:2.16.3-1) unstable; urgency=medium
 

Modified: desktop/experimental/gnome-games/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-games/debian/control?rev=9565&op=diff
==============================================================================
--- desktop/experimental/gnome-games/debian/control (original)
+++ desktop/experimental/gnome-games/debian/control Sat Apr  7 16:25:01 2007
@@ -2,14 +2,14 @@
 Section: gnome
 Priority: optional
 Maintainer: Josselin Mouette <joss at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Andrew Lau <netsnipe at users.sourceforge.net>, Clément Stenac <zorglub at debian.org>, Dafydd Harries <daf at debian.org>, Guilherme de S. Pastore <gpastore at debian.org>, Gustavo Franco <stratus at debian.org>, Gustavo Noronha Silva <kov at debian.org>, J.H.M. Dassen (Ray) <jdassen at debian.org>, Jordi Mallach <jordi at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Kilian Krause <kilian at debian.org>, Loic Minier <lool at dooz.org>, Marc 'HE' Brockschmidt <he at debian.org>, Marco Cabizza <marco87 at gmail.com>, Oystein Gisnas <oystein at gisnas.net>, Ondřej Surý <ondrej at debian.org>, Ross Burton <ross at debian.org>, Sebastien Bacher <seb128 at debian.org>, Sjoerd Simons <sjoerd at debian.org>
-Build-Depends: cdbs, debhelper (>= 4.2.21), libgtk2.0-dev (>= 2.8.0), libgnome2-dev (>= 2.10), libgnomeui-dev (>= 2.10), libgconf2-dev (>= 2.10), libgnomevfs2-dev (>= 2.10), scrollkeeper (>= 0.3.8), gettext, gnome-pkg-tools, dpkg-dev (>= 1.13.19), guile-1.6-dev, libxml-parser-perl, librsvg2-dev (>= 2.7), libesd0-dev, libcairo2-dev, python, pkg-config
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Loic Minier <lool at dooz.org>
+Build-Depends: cdbs, debhelper (>= 4.2.21), quilt, intltool (>= 0.35.0), gnome-doc-utils, libgtk2.0-dev (>= 2.8.0), libgnome2-dev (>= 2.16.0), libgnomeui-dev (>= 2.16.0), libgconf2-dev (>= 2.10), libgnomevfs2-dev (>= 2.10), scrollkeeper (>= 0.3.8), gettext, gnome-pkg-tools, dpkg-dev (>= 1.13.19), guile-1.8-dev, libxml-parser-perl, librsvg2-dev (>= 2.7), libesd0-dev, libcairo2-dev, python (>= 2.4), python-gtk2-dev (>= 2.10.0), python-gnome2-desktop-dev (>= 2.17.3), pkg-config, python-support, libxml2-dev (>= 2.4.0), libglade2-dev, libggzdmod-dev (>= 0.0.14), libggz-gtk-dev (>= 0.0.14), ggzcore-bin
 Standards-Version: 3.7.2
 
 Package: gnome-games
 Architecture: any
-Depends: ${shlibs:Depends}, gnome-games-data (= ${source:Version}), librsvg2-common
-Recommends: gnome-games-extra-data, ${python:Depends}
+Depends: ${shlibs:Depends}, gnome-games-data (= ${source:Version}), librsvg2-common, ${python:Depends}, python-gtk2 (>= 2.10.0), python-gnome2-desktop (>= 2.17.3), gnuchess
+Recommends: gnome-games-extra-data
 Suggests: gnome-hearts
 Description: games for the GNOME desktop
  These are the games from the official GNOME release. They have the look and
@@ -18,14 +18,16 @@
  The package contains the following games:
   * aisleriot - different solitaire card games
   * blackjack - the casino card game
-  * gataxx - another disc-flipping game
+  * glchess - chess game with 3D graphics
   * glines - color lines game, aka fiveormore
   * gnect - four in a row game
   * gnibbles - snake game, up to four players
   * gnobots2 - improved old BSD robots game
+  * gnome-sudoku - 
   * gnometris - Tetris, the popular Russian game
   * gnomine - popular minesweeper puzzle game
   * gnotravex - puzzle where you match tile edges together
+  * gnotski - klotski puzzle game
   * gtali - sort of poker with dice and less money
   * iagno - the popular Othello game
   * mahjongg - classic Eastern tile game

Modified: desktop/experimental/gnome-games/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-games/debian/control.in?rev=9565&op=diff
==============================================================================
--- desktop/experimental/gnome-games/debian/control.in (original)
+++ desktop/experimental/gnome-games/debian/control.in Sat Apr  7 16:25:01 2007
@@ -3,13 +3,13 @@
 Priority: optional
 Maintainer: Josselin Mouette <joss at debian.org>
 Uploaders: @GNOME_TEAM@
-Build-Depends: cdbs, debhelper (>= 4.2.21), quilt, libgtk2.0-dev (>= 2.8.0), libgnome2-dev (>= 2.10), libgnomeui-dev (>= 2.10), libgconf2-dev (>= 2.10), libgnomevfs2-dev (>= 2.10), scrollkeeper (>= 0.3.8), gettext, gnome-pkg-tools, dpkg-dev (>= 1.13.19), guile-1.6-dev, libxml-parser-perl, librsvg2-dev (>= 2.7), libesd0-dev, libcairo2-dev, python, pkg-config
+Build-Depends: cdbs, debhelper (>= 4.2.21), quilt, intltool (>= 0.35.0), gnome-doc-utils, libgtk2.0-dev (>= 2.8.0), libgnome2-dev (>= 2.16.0), libgnomeui-dev (>= 2.16.0), libgconf2-dev (>= 2.10), libgnomevfs2-dev (>= 2.10), scrollkeeper (>= 0.3.8), gettext, gnome-pkg-tools, dpkg-dev (>= 1.13.19), guile-1.8-dev, libxml-parser-perl, librsvg2-dev (>= 2.7), libesd0-dev, libcairo2-dev, python (>= 2.4), python-gtk2-dev (>= 2.10.0), python-gnome2-desktop-dev (>= 2.17.3), pkg-config, python-support (>= 0.3), libxml2-dev (>= 2.4.0), libglade2-dev, libggzdmod-dev (>= 0.0.14), libggz-gtk-dev (>= 0.0.14), ggzcore-bin (>= 0.0.14)
 Standards-Version: 3.7.2
 
 Package: gnome-games
 Architecture: any
-Depends: ${shlibs:Depends}, gnome-games-data (= ${source:Version}), librsvg2-common
-Recommends: gnome-games-extra-data, ${python:Depends}
+Depends: ${shlibs:Depends}, gnome-games-data (= ${source:Version}), librsvg2-common, ${python:Depends}, python-gtk2 (>= 2.10.0), python-gnome2-desktop (>= 2.17.3), gnuchess
+Recommends: gnome-games-extra-data, python-gtkglext1, python-opengl
 Suggests: gnome-hearts
 Description: games for the GNOME desktop
  These are the games from the official GNOME release. They have the look and
@@ -18,14 +18,16 @@
  The package contains the following games:
   * aisleriot - different solitaire card games
   * blackjack - the casino card game
-  * gataxx - another disc-flipping game
+  * glchess - chess game with 3D graphics
   * glines - color lines game, aka fiveormore
   * gnect - four in a row game
   * gnibbles - snake game, up to four players
   * gnobots2 - improved old BSD robots game
+  * gnome-sudoku - 
   * gnometris - Tetris, the popular Russian game
   * gnomine - popular minesweeper puzzle game
   * gnotravex - puzzle where you match tile edges together
+  * gnotski - klotski puzzle game
   * gtali - sort of poker with dice and less money
   * iagno - the popular Othello game
   * mahjongg - classic Eastern tile game
@@ -35,10 +37,10 @@
 
 Package: gnome-games-data
 Architecture: all
-Depends: ${misc:Depends}, gnome-cards-data
+Depends: ${misc:Depends}, ${python:Depends}, gnome-cards-data
 Conflicts: gnome-games (<= 1:2.10.1-2), gnome-icon-theme (<< 2.14)
 Replaces: gnome-card-games, gnome-games-locale
-Recommends: gnome-games, gnome-games-extra-data, ${python:Depends}
+Recommends: gnome-games, gnome-games-extra-data
 Description: data files for the GNOME games
  This package contains the data files, sound and pictures used by the
  GNOME games.

Modified: desktop/experimental/gnome-games/debian/gnome-games-data.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-games/debian/gnome-games-data.install?rev=9565&op=diff
==============================================================================
--- desktop/experimental/gnome-games/debian/gnome-games-data.install (original)
+++ desktop/experimental/gnome-games/debian/gnome-games-data.install Sat Apr  7 16:25:01 2007
@@ -3,14 +3,30 @@
 debian/tmp/usr/share/icons/hicolor
 debian/tmp/usr/share/locale
 debian/tmp/usr/share/omf
-debian/tmp/usr/share/pixmaps/*.{png,svg}
-debian/tmp/usr/share/pixmaps/{gnibbles,gnobots2,iagno,glines,gtali,mahjongg,gnomine,gnect,gnometris,blackjack}
+debian/tmp/usr/share/pixmaps/*.png
+debian/tmp/usr/share/pixmaps/*.svg
+debian/tmp/usr/share/pixmaps/gnibbles
+debian/tmp/usr/share/pixmaps/gnobots2
+debian/tmp/usr/share/pixmaps/iagno
+debian/tmp/usr/share/pixmaps/glines
+debian/tmp/usr/share/pixmaps/gtali
+debian/tmp/usr/share/pixmaps/mahjongg
+debian/tmp/usr/share/pixmaps/gnomine
+debian/tmp/usr/share/pixmaps/gnect
+debian/tmp/usr/share/pixmaps/gnometris
+debian/tmp/usr/share/pixmaps/blackjack
+debian/tmp/usr/share/pixmaps/gnotravex
+debian/tmp/usr/share/pixmaps/gnome-sudoku
+debian/tmp/usr/share/pixmaps/glchess
 debian/tmp/usr/share/sounds
 debian/tmp/usr/share/blackjack
+debian/tmp/usr/share/glchess
 debian/tmp/usr/share/gnect
 debian/tmp/usr/share/gnibbles
 debian/tmp/usr/share/gnobots2
+debian/tmp/usr/share/gnome-sudoku
 debian/tmp/usr/share/sol-games
 debian/tmp/usr/share/gnome-games
 debian/tmp/etc/gconf
-debian/tmp/usr/games/games-server.py /usr/share/gnome-games
+debian/tmp/usr/etc/ggzd /etc
+debian/tmp/usr/lib/python*

Modified: desktop/experimental/gnome-games/debian/gnome-games.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-games/debian/gnome-games.install?rev=9565&op=diff
==============================================================================
--- desktop/experimental/gnome-games/debian/gnome-games.install (original)
+++ desktop/experimental/gnome-games/debian/gnome-games.install Sat Apr  7 16:25:01 2007
@@ -1,3 +1,3 @@
-debian/tmp/usr/games/*[!y]
+debian/tmp/usr/games
 debian/tmp/usr/share/applications
 debian/tmp/etc/sound

Modified: desktop/experimental/gnome-games/debian/gnome-games.menu
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-games/debian/gnome-games.menu?rev=9565&op=diff
==============================================================================
--- desktop/experimental/gnome-games/debian/gnome-games.menu (original)
+++ desktop/experimental/gnome-games/debian/gnome-games.menu Sat Apr  7 16:25:01 2007
@@ -3,8 +3,8 @@
 	icon="/usr/share/pixmaps/blackjack.xpm"
 
 ?package(gnome-games):needs="X11" section="Games/Board" \
-	title="Gataxx" command="/usr/games/gataxx" \
-	icon="/usr/share/pixmaps/gataxx.xpm"
+	title="GL Chess" command="/usr/games/glchess" \
+	icon="/usr/share/pixmaps/glchess.xpm"
 
 ?package(gnome-games):needs="X11" section="Games/Board" \
 	title="Gnome Lines" command="/usr/games/glines" \
@@ -21,6 +21,10 @@
 ?package(gnome-games):needs="X11" section="Games/Puzzles" \
 	title="Gnome Robots" command="/usr/games/gnobots2" \
 	icon="/usr/share/pixmaps/gnobots2.xpm"
+
+?package(gnome-games):needs="X11" section="Games/Puzzles" \
+	title="Gnome Sudoku" command="/usr/games/gnome-sudoku" \
+	icon="/usr/share/pixmaps/gnome-sudoku.xpm"
 
 ?package(gnome-games):needs="X11" section="Games/Tetris-like" \
 	title="Gnometris" command="/usr/games/gnometris" \

Modified: desktop/experimental/gnome-games/debian/gnome-games.postinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-games/debian/gnome-games.postinst?rev=9565&op=diff
==============================================================================
--- desktop/experimental/gnome-games/debian/gnome-games.postinst (original)
+++ desktop/experimental/gnome-games/debian/gnome-games.postinst Sat Apr  7 16:25:01 2007
@@ -80,7 +80,8 @@
 gnotski.35.scores \
 gnotski.36.scores \
 gnotski.37.scores \
-gtali.scores \
+gtali.Colors.scores \
+gtali.Regular.scores \
 mahjongg.bridges.scores \
 mahjongg.cloud.scores \
 mahjongg.confounding.scores \
@@ -104,6 +105,10 @@
     fi
 done
 
+if [ -f /var/games/gtali.scores ] && [ ! -e /var/games/gtali.Regular.scores ]; then
+    mv -f /var/games/gtali.scores /var/games/gtali.Regular.scores
+fi
+
 for FILES in $SCORE_FILES; do
 
 	if [ -e /var/games/$FILES ]; then

Modified: desktop/experimental/gnome-games/debian/gnome-games.postrm
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-games/debian/gnome-games.postrm?rev=9565&op=diff
==============================================================================
--- desktop/experimental/gnome-games/debian/gnome-games.postrm (original)
+++ desktop/experimental/gnome-games/debian/gnome-games.postrm Sat Apr  7 16:25:01 2007
@@ -85,6 +85,8 @@
 gnotski.36.scores \
 gnotski.37.scores \
 gtali.scores \
+gtali.Colors.scores \
+gtali.Regular.scores \
 iagno.b1.scores \
 iagno.b2.scores \
 iagno.b3.scores \

Added: desktop/experimental/gnome-games/debian/patches/01_ggz.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-games/debian/patches/01_ggz.patch?rev=9565&op=file
==============================================================================
--- desktop/experimental/gnome-games/debian/patches/01_ggz.patch (added)
+++ desktop/experimental/gnome-games/debian/patches/01_ggz.patch Sat Apr  7 16:25:01 2007
@@ -1,0 +1,64 @@
+Index: gnome-games-2.18.0.1/configure.in
+===================================================================
+--- gnome-games-2.18.0.1.orig/configure.in	2007-04-07 16:48:58.658673750 +0200
++++ gnome-games-2.18.0.1/configure.in	2007-04-07 16:58:15.861496750 +0200
+@@ -124,57 +124,17 @@
+ 
+ 
+ dnl Check for GGZ
+-AC_GGZ_CHECK_SERVER
+-
++AC_GGZ_GGZCORE
++AC_GGZ_CHECK([gtk])
+ AC_GGZ_PTHREADS
+ AC_GGZ_GCRYPT
+ AC_GGZ_TLS
+ 
+-LIBGGZ_INCLUDES="-I\$(top_srcdir)/dependencies/libggz"
+-AC_SUBST(LIBGGZ_INCLUDES)
+-LIBGGZ_LDFLAGS=""
+-AC_SUBST(LIBGGZ_LDFLAGS)
+-LIB_GGZ="\$(top_builddir)/dependencies/libggz/libggz.la"
+-AC_SUBST(LIB_GGZ)
+ AM_CONDITIONAL(INSTALL_LIBGGZ, false)
+-
+-GGZDMOD_INCLUDES="$LIBGGZ_INCLUDES -I\$(top_srcdir)/dependencies/ggzdmod"
+-AC_SUBST(GGZDMOD_INCLUDES)
+-GGZDMOD_LDFLAGS="$LIBGGZ_LDFLAGS"
+-AC_SUBST(GGZDMOD_LDFLAGS)
+-LIB_GGZDMOD="$LIB_GGZ \$(top_builddir)/dependencies/ggzdmod/libggzdmod.la"
+-AC_SUBST(LIB_GGZDMOD)
+ AM_CONDITIONAL(INSTALL_GGZDMOD, false)
+-
+-GGZMOD_INCLUDES="-I\$(top_srcdir)/dependencies/ggzmod"
+-AC_SUBST(GGZMOD_INCLUDES)
+-GGZMOD_LDFLAGS=""
+-AC_SUBST(GGZMOD_LDFLAGS)
+-LIB_GGZMOD="\$(top_builddir)/dependencies/ggzmod/libggzmod.la"
+-AC_SUBST(LIB_GGZMOD)
+ AM_CONDITIONAL(INSTALL_GGZMOD, false)
+-
+-GGZCORE_INCLUDES="-I\$(top_srcdir)/dependencies/ggzcore"
+-AC_SUBST(GGZCORE_INCLUDES)
+-GGZCORE_LDFLAGS=""
+-AC_SUBST(GGZCORE_LDFLAGS)
+-LIB_GGZCORE="\$(top_builddir)/dependencies/ggzcore/libggzcore.la"
+-AC_SUBST(LIB_GGZCORE)
+ AM_CONDITIONAL(INSTALL_GGZCORE, false)
+-
+-GGZ_GTK_INCLUDES="-I\$(top_srcdir)/dependencies/ggz-gtk"
+-AC_SUBST(GGZ_GTK_INCLUDES)
+-GGZ_GTK_LDFLAGS=""
+-AC_SUBST(GGZ_GTK_LDFLAGS)
+-LIB_GGZ_GTK="\$(top_builddir)/dependencies/ggz-gtk/libggz-gtk.la"
+-AC_SUBST(LIB_GGZ_GTK)
+-
+-AC_DEFINE(GGZ_GTK, 1, [Support for embedded GGZ through libggz-gtk])
+-AM_CONDITIONAL(GGZ_GTK, true)
+ AM_CONDITIONAL(INSTALL_GGZ_GTK, false)
+- 
+-AC_DEFINE(GGZ_CLIENT, 1, [Client support for GGZ])
+-AM_CONDITIONAL(GGZ_CLIENT, true)
+ 
+ GNOME_GAMES_CXXFLAGS="$GNOME_GAMES_CFLAGS -I\$(top_srcdir)/libgames-support $WARN_CXXFLAGS"
+ GNOME_GAMES_CFLAGS="$GNOME_GAMES_CFLAGS -I\$(top_srcdir)/libgames-support $WARN_CFLAGS"

Copied: desktop/experimental/gnome-games/debian/patches/02_desktop-path.patch (from r9553, desktop/experimental/gnome-games/debian/patches/desktop-path.patch)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-games/debian/patches/02_desktop-path.patch?rev=9565&op=diff
==============================================================================
--- desktop/experimental/gnome-games/debian/patches/desktop-path.patch (original)
+++ desktop/experimental/gnome-games/debian/patches/02_desktop-path.patch Sat Apr  7 16:25:01 2007
@@ -1,6 +1,7 @@
-diff -urN gnome-games-2.15.6.orig/aisleriot/freecell.desktop.in gnome-games-2.15.6/aisleriot/freecell.desktop.in
---- gnome-games-2.15.6.orig/aisleriot/freecell.desktop.in	2006-04-02 11:07:40.000000000 +0200
-+++ gnome-games-2.15.6/aisleriot/freecell.desktop.in	2006-08-13 19:39:15.000000000 +0200
+Index: gnome-games-2.18.0.1/aisleriot/freecell.desktop.in
+===================================================================
+--- gnome-games-2.18.0.1.orig/aisleriot/freecell.desktop.in	2007-03-20 21:20:13.000000000 +0100
++++ gnome-games-2.18.0.1/aisleriot/freecell.desktop.in	2007-04-07 12:19:15.464882000 +0200
 @@ -2,7 +2,7 @@
  Encoding=UTF-8
  _Name=FreeCell Solitaire
@@ -10,9 +11,10 @@
  Icon=gnome-freecell
  Terminal=false
  Type=Application
-diff -urN gnome-games-2.15.6.orig/aisleriot/sol.desktop.in gnome-games-2.15.6/aisleriot/sol.desktop.in
---- gnome-games-2.15.6.orig/aisleriot/sol.desktop.in	2006-04-02 11:07:40.000000000 +0200
-+++ gnome-games-2.15.6/aisleriot/sol.desktop.in	2006-08-13 19:39:18.000000000 +0200
+Index: gnome-games-2.18.0.1/aisleriot/sol.desktop.in
+===================================================================
+--- gnome-games-2.18.0.1.orig/aisleriot/sol.desktop.in	2007-03-20 21:20:13.000000000 +0100
++++ gnome-games-2.18.0.1/aisleriot/sol.desktop.in	2007-04-07 12:19:15.464882000 +0200
 @@ -2,7 +2,7 @@
  Encoding=UTF-8
  _Name=AisleRiot Solitaire
@@ -22,9 +24,10 @@
  Icon=gnome-aisleriot
  Terminal=false
  Type=Application
-diff -urN gnome-games-2.15.6.orig/blackjack/data/blackjack.desktop.in gnome-games-2.15.6/blackjack/data/blackjack.desktop.in
---- gnome-games-2.15.6.orig/blackjack/data/blackjack.desktop.in	2006-04-02 11:07:41.000000000 +0200
-+++ gnome-games-2.15.6/blackjack/data/blackjack.desktop.in	2006-08-13 19:39:20.000000000 +0200
+Index: gnome-games-2.18.0.1/blackjack/data/blackjack.desktop.in
+===================================================================
+--- gnome-games-2.18.0.1.orig/blackjack/data/blackjack.desktop.in	2007-03-20 21:20:15.000000000 +0100
++++ gnome-games-2.18.0.1/blackjack/data/blackjack.desktop.in	2007-04-07 12:19:15.464882000 +0200
 @@ -2,7 +2,7 @@
  Encoding=UTF-8
  _Name=Blackjack
@@ -34,22 +37,10 @@
  Icon=gnome-blackjack
  Terminal=false
  Type=Application
-Binary files gnome-games-2.15.6.orig/debian/patches/.desktop-path.patch.swp and gnome-games-2.15.6/debian/patches/.desktop-path.patch.swp differ
-diff -urN gnome-games-2.15.6.orig/gataxx/gataxx.desktop.in gnome-games-2.15.6/gataxx/gataxx.desktop.in
---- gnome-games-2.15.6.orig/gataxx/gataxx.desktop.in	2006-07-18 23:42:45.000000000 +0200
-+++ gnome-games-2.15.6/gataxx/gataxx.desktop.in	2006-08-13 19:39:22.000000000 +0200
-@@ -3,7 +3,7 @@
- Icon=gnome-ataxx
- _Name=Ataxx
- _Comment=Dominate the board in a modern variation of Reversi
--Exec=gataxx
-+Exec=/usr/games/gataxx
- Terminal=false
- Type=Application
- Categories=GNOME;GTK;Game;BoardGame;
-diff -urN gnome-games-2.15.6.orig/glines/glines.desktop.in gnome-games-2.15.6/glines/glines.desktop.in
---- gnome-games-2.15.6.orig/glines/glines.desktop.in	2006-04-02 11:07:43.000000000 +0200
-+++ gnome-games-2.15.6/glines/glines.desktop.in	2006-08-13 19:39:24.000000000 +0200
+Index: gnome-games-2.18.0.1/glines/glines.desktop.in
+===================================================================
+--- gnome-games-2.18.0.1.orig/glines/glines.desktop.in	2007-03-20 21:20:22.000000000 +0100
++++ gnome-games-2.18.0.1/glines/glines.desktop.in	2007-04-07 12:19:15.472882500 +0200
 @@ -2,7 +2,7 @@
  Encoding=UTF-8
  _Name=Five or More
@@ -59,9 +50,10 @@
  Icon=gnome-five-or-more
  Terminal=false
  Type=Application
-diff -urN gnome-games-2.15.6.orig/gnect/data/gnect.desktop.in gnome-games-2.15.6/gnect/data/gnect.desktop.in
---- gnome-games-2.15.6.orig/gnect/data/gnect.desktop.in	2006-07-18 23:42:47.000000000 +0200
-+++ gnome-games-2.15.6/gnect/data/gnect.desktop.in	2006-08-13 19:39:26.000000000 +0200
+Index: gnome-games-2.18.0.1/gnect/data/gnect.desktop.in
+===================================================================
+--- gnome-games-2.18.0.1.orig/gnect/data/gnect.desktop.in	2007-03-20 21:20:27.000000000 +0100
++++ gnome-games-2.18.0.1/gnect/data/gnect.desktop.in	2007-04-07 12:19:15.472882500 +0200
 @@ -3,7 +3,7 @@
  Icon=gnome-four-in-a-row
  _Name=Four-in-a-Row
@@ -71,9 +63,10 @@
  Terminal=false
  Type=Application
  Categories=GNOME;GTK;Game;LogicGame;
-diff -urN gnome-games-2.15.6.orig/gnibbles/gnibbles.desktop.in gnome-games-2.15.6/gnibbles/gnibbles.desktop.in
---- gnome-games-2.15.6.orig/gnibbles/gnibbles.desktop.in	2006-04-02 10:51:40.000000000 +0200
-+++ gnome-games-2.15.6/gnibbles/gnibbles.desktop.in	2006-08-13 19:39:28.000000000 +0200
+Index: gnome-games-2.18.0.1/gnibbles/gnibbles.desktop.in
+===================================================================
+--- gnome-games-2.18.0.1.orig/gnibbles/gnibbles.desktop.in	2007-03-20 21:20:23.000000000 +0100
++++ gnome-games-2.18.0.1/gnibbles/gnibbles.desktop.in	2007-04-07 12:19:15.472882500 +0200
 @@ -2,7 +2,7 @@
  Encoding=UTF-8
  _Name=Nibbles
@@ -83,9 +76,10 @@
  Icon=gnome-nibbles
  Terminal=false
  Type=Application
-diff -urN gnome-games-2.15.6.orig/gnobots2/gnobots2.desktop.in gnome-games-2.15.6/gnobots2/gnobots2.desktop.in
---- gnome-games-2.15.6.orig/gnobots2/gnobots2.desktop.in	2006-05-18 21:55:11.000000000 +0200
-+++ gnome-games-2.15.6/gnobots2/gnobots2.desktop.in	2006-08-13 19:39:29.000000000 +0200
+Index: gnome-games-2.18.0.1/gnobots2/gnobots2.desktop.in
+===================================================================
+--- gnome-games-2.18.0.1.orig/gnobots2/gnobots2.desktop.in	2007-03-20 21:20:26.000000000 +0100
++++ gnome-games-2.18.0.1/gnobots2/gnobots2.desktop.in	2007-04-07 12:19:15.472882500 +0200
 @@ -2,7 +2,7 @@
  Encoding=UTF-8
  _Name=Robots
@@ -95,9 +89,10 @@
  Icon=gnome-robots
  Terminal=false
  Type=Application
-diff -urN gnome-games-2.15.6.orig/gnometris/gnometris.desktop.in gnome-games-2.15.6/gnometris/gnometris.desktop.in
---- gnome-games-2.15.6.orig/gnometris/gnometris.desktop.in	2006-04-03 04:45:29.000000000 +0200
-+++ gnome-games-2.15.6/gnometris/gnometris.desktop.in	2006-08-13 19:39:31.000000000 +0200
+Index: gnome-games-2.18.0.1/gnometris/gnometris.desktop.in
+===================================================================
+--- gnome-games-2.18.0.1.orig/gnometris/gnometris.desktop.in	2007-03-20 21:20:15.000000000 +0100
++++ gnome-games-2.18.0.1/gnometris/gnometris.desktop.in	2007-04-07 12:19:15.472882500 +0200
 @@ -3,7 +3,7 @@
  _Name=Gnometris
  _Comment=Fit falling blocks together
@@ -107,9 +102,10 @@
  Terminal=false
  Type=Application
  Categories=GNOME;GTK;Game;BlocksGame;
-diff -urN gnome-games-2.15.6.orig/gnomine/gnomine.desktop.in gnome-games-2.15.6/gnomine/gnomine.desktop.in
---- gnome-games-2.15.6.orig/gnomine/gnomine.desktop.in	2006-07-18 23:42:48.000000000 +0200
-+++ gnome-games-2.15.6/gnomine/gnomine.desktop.in	2006-08-13 19:39:33.000000000 +0200
+Index: gnome-games-2.18.0.1/gnomine/gnomine.desktop.in
+===================================================================
+--- gnome-games-2.18.0.1.orig/gnomine/gnomine.desktop.in	2007-03-20 21:20:14.000000000 +0100
++++ gnome-games-2.18.0.1/gnomine/gnomine.desktop.in	2007-04-07 12:19:15.472882500 +0200
 @@ -2,7 +2,7 @@
  Encoding=UTF-8
  _Name=Mines
@@ -119,9 +115,10 @@
  Icon=gnome-gnomine
  Terminal=false
  Type=Application
-diff -urN gnome-games-2.15.6.orig/gnotravex/gnotravex.desktop.in gnome-games-2.15.6/gnotravex/gnotravex.desktop.in
---- gnome-games-2.15.6.orig/gnotravex/gnotravex.desktop.in	2006-07-18 23:42:49.000000000 +0200
-+++ gnome-games-2.15.6/gnotravex/gnotravex.desktop.in	2006-08-13 19:39:35.000000000 +0200
+Index: gnome-games-2.18.0.1/gnotravex/gnotravex.desktop.in
+===================================================================
+--- gnome-games-2.18.0.1.orig/gnotravex/gnotravex.desktop.in	2007-03-20 21:20:15.000000000 +0100
++++ gnome-games-2.18.0.1/gnotravex/gnotravex.desktop.in	2007-04-07 12:19:15.472882500 +0200
 @@ -2,7 +2,7 @@
  Encoding=UTF-8
  _Name=Tetravex
@@ -131,9 +128,10 @@
  Icon=gnome-tetravex
  Terminal=false
  Type=Application
-diff -urN gnome-games-2.15.6.orig/gnotski/gnotski.desktop.in gnome-games-2.15.6/gnotski/gnotski.desktop.in
---- gnome-games-2.15.6.orig/gnotski/gnotski.desktop.in	2006-07-18 23:42:50.000000000 +0200
-+++ gnome-games-2.15.6/gnotski/gnotski.desktop.in	2006-08-13 19:39:36.000000000 +0200
+Index: gnome-games-2.18.0.1/gnotski/gnotski.desktop.in
+===================================================================
+--- gnome-games-2.18.0.1.orig/gnotski/gnotski.desktop.in	2007-03-20 21:20:15.000000000 +0100
++++ gnome-games-2.18.0.1/gnotski/gnotski.desktop.in	2007-04-07 12:19:15.472882500 +0200
 @@ -2,7 +2,7 @@
  Encoding=UTF-8
  _Name=Klotski
@@ -143,9 +141,10 @@
  Icon=gnome-klotski
  Terminal=false
  Type=Application
-diff -urN gnome-games-2.15.6.orig/gtali/gtali.desktop.in gnome-games-2.15.6/gtali/gtali.desktop.in
---- gnome-games-2.15.6.orig/gtali/gtali.desktop.in	2006-07-18 23:42:54.000000000 +0200
-+++ gnome-games-2.15.6/gtali/gtali.desktop.in	2006-08-13 19:39:38.000000000 +0200
+Index: gnome-games-2.18.0.1/gtali/gtali.desktop.in
+===================================================================
+--- gnome-games-2.18.0.1.orig/gtali/gtali.desktop.in	2007-03-20 21:20:14.000000000 +0100
++++ gnome-games-2.18.0.1/gtali/gtali.desktop.in	2007-04-07 12:19:15.472882500 +0200
 @@ -2,7 +2,7 @@
  Encoding=UTF-8
  _Name=Tali
@@ -155,9 +154,10 @@
  Icon=gnome-tali
  Terminal=false
  Type=Application
-diff -urN gnome-games-2.15.6.orig/iagno/iagno.desktop.in gnome-games-2.15.6/iagno/iagno.desktop.in
---- gnome-games-2.15.6.orig/iagno/iagno.desktop.in	2006-07-18 23:42:58.000000000 +0200
-+++ gnome-games-2.15.6/iagno/iagno.desktop.in	2006-08-13 19:39:40.000000000 +0200
+Index: gnome-games-2.18.0.1/iagno/iagno.desktop.in
+===================================================================
+--- gnome-games-2.18.0.1.orig/iagno/iagno.desktop.in	2007-03-20 21:20:26.000000000 +0100
++++ gnome-games-2.18.0.1/iagno/iagno.desktop.in	2007-04-07 12:19:15.472882500 +0200
 @@ -3,7 +3,7 @@
  Icon=gnome-iagno
  _Name=Iagno
@@ -167,9 +167,10 @@
  Terminal=false
  Type=Application
  Categories=GNOME;GTK;Game;
-diff -urN gnome-games-2.15.6.orig/mahjongg/mahjongg.desktop.in gnome-games-2.15.6/mahjongg/mahjongg.desktop.in
---- gnome-games-2.15.6.orig/mahjongg/mahjongg.desktop.in	2006-04-03 06:02:35.000000000 +0200
-+++ gnome-games-2.15.6/mahjongg/mahjongg.desktop.in	2006-08-13 19:39:42.000000000 +0200
+Index: gnome-games-2.18.0.1/mahjongg/mahjongg.desktop.in
+===================================================================
+--- gnome-games-2.18.0.1.orig/mahjongg/mahjongg.desktop.in	2007-03-20 21:20:25.000000000 +0100
++++ gnome-games-2.18.0.1/mahjongg/mahjongg.desktop.in	2007-04-07 12:19:15.472882500 +0200
 @@ -2,7 +2,7 @@
  Encoding=UTF-8
  _Name=Mahjongg
@@ -179,9 +180,10 @@
  Icon=gnome-mahjongg
  Terminal=false
  Type=Application
-diff -urN gnome-games-2.15.6.orig/same-gnome/same-gnome.desktop.in gnome-games-2.15.6/same-gnome/same-gnome.desktop.in
---- gnome-games-2.15.6.orig/same-gnome/same-gnome.desktop.in	2006-07-18 23:42:58.000000000 +0200
-+++ gnome-games-2.15.6/same-gnome/same-gnome.desktop.in	2006-08-13 19:39:54.000000000 +0200
+Index: gnome-games-2.18.0.1/same-gnome/same-gnome.desktop.in
+===================================================================
+--- gnome-games-2.18.0.1.orig/same-gnome/same-gnome.desktop.in	2007-03-20 21:20:24.000000000 +0100
++++ gnome-games-2.18.0.1/same-gnome/same-gnome.desktop.in	2007-04-07 12:19:15.472882500 +0200
 @@ -2,7 +2,7 @@
  Encoding=UTF-8
  _Name=Same GNOME
@@ -191,3 +193,29 @@
  Icon=gnome-same-gnome
  Terminal=false
  Type=Application
+Index: gnome-games-2.18.0.1/glchess/glchess.desktop.in
+===================================================================
+--- gnome-games-2.18.0.1.orig/glchess/glchess.desktop.in	2007-04-07 12:19:36.962225500 +0200
++++ gnome-games-2.18.0.1/glchess/glchess.desktop.in	2007-04-07 12:20:00.803715500 +0200
+@@ -3,7 +3,7 @@
+ _Comment=Play the classic two-player boardgame of chess 
+ Version=1.0
+ Encoding=UTF-8
+-Exec=glchess
++Exec=/usr/games/glchess
+ Terminal=false
+ Type=Application
+ Categories=GNOME;Game;BoardGame;
+Index: gnome-games-2.18.0.1/gnome-sudoku/gnome-sudoku.desktop.in
+===================================================================
+--- gnome-games-2.18.0.1.orig/gnome-sudoku/gnome-sudoku.desktop.in	2007-04-07 12:19:49.038980250 +0200
++++ gnome-games-2.18.0.1/gnome-sudoku/gnome-sudoku.desktop.in	2007-04-07 12:20:14.216553750 +0200
+@@ -3,7 +3,7 @@
+ _Comment=GNOME Sudoku; a logic puzzle
+ Version=1.0
+ Encoding=UTF-8
+-Exec=gnome-sudoku
++Exec=/usr/games/gnome-sudoku
+ Terminal=false
+ Type=Application
+ Categories=GNOME;Game;LogicGame;

Added: desktop/experimental/gnome-games/debian/patches/03_dont_build_ggz.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-games/debian/patches/03_dont_build_ggz.patch?rev=9565&op=file
==============================================================================
--- desktop/experimental/gnome-games/debian/patches/03_dont_build_ggz.patch (added)
+++ desktop/experimental/gnome-games/debian/patches/03_dont_build_ggz.patch Sat Apr  7 16:25:01 2007
@@ -1,0 +1,55 @@
+Index: gnome-games-2.18.0.1/configure.in
+===================================================================
+--- gnome-games-2.18.0.1.orig/configure.in	2007-04-07 16:48:26.828684500 +0200
++++ gnome-games-2.18.0.1/configure.in	2007-04-07 16:48:34.325153000 +0200
+@@ -189,14 +189,6 @@
+ AC_FUNC_STRCOLL
+ AC_FUNC_VPRINTF
+ 
+-# Check for expat
+-# ===============
+-AC_CHECK_LIB(expat, XML_ParserCreate, [LIBEXPAT="-lexpat"],
+-             [AC_MSG_ERROR(cannot find expat library)])
+-AC_CHECK_HEADER(expat.h, [],
+-                [AC_MSG_ERROR(cannot find expat.h header)])
+-AC_SUBST(LIBEXPAT)
+-
+ # Check for PF_LOCAL/PF_UNIX
+ # ==========================
+ # There should be an autoconf macro to check this???
+@@ -394,13 +386,6 @@
+ Makefile
+ po/Makefile.in
+ dependencies/Makefile
+-dependencies/libggz/Makefile
+-dependencies/libggz/security/Makefile
+-dependencies/ggzdmod/Makefile
+-dependencies/ggzcore/Makefile
+-dependencies/ggzmod/Makefile
+-dependencies/ggzmod-ggz/Makefile
+-dependencies/ggz-gtk/Makefile
+ dependencies/gnuchess/Makefile
+ libgames-support/Makefile
+ blackjack/Makefile
+Index: gnome-games-2.18.0.1/dependencies/Makefile.am
+===================================================================
+--- gnome-games-2.18.0.1.orig/dependencies/Makefile.am	2007-04-07 16:47:56.446785750 +0200
++++ gnome-games-2.18.0.1/dependencies/Makefile.am	2007-04-07 16:48:34.325153000 +0200
+@@ -1,3 +1,3 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-SUBDIRS=        libggz ggzdmod ggzmod-ggz ggzcore ggzmod ggz-gtk gnuchess
++SUBDIRS=        gnuchess
+Index: gnome-games-2.18.0.1/dependencies/Makefile.in
+===================================================================
+--- gnome-games-2.18.0.1.orig/dependencies/Makefile.in	2007-04-07 16:47:56.434785000 +0200
++++ gnome-games-2.18.0.1/dependencies/Makefile.in	2007-04-07 16:48:34.329153250 +0200
+@@ -312,7 +312,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-SUBDIRS = libggz ggzdmod ggzmod-ggz ggzcore ggzmod ggz-gtk gnuchess
++SUBDIRS = gnuchess
+ all: all-recursive
+ 
+ .SUFFIXES:

Added: desktop/experimental/gnome-games/debian/patches/99_reautoconf.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-games/debian/patches/99_reautoconf.patch?rev=9565&op=file
==============================================================================
--- desktop/experimental/gnome-games/debian/patches/99_reautoconf.patch (added)
+++ desktop/experimental/gnome-games/debian/patches/99_reautoconf.patch Sat Apr  7 16:25:01 2007
@@ -1,0 +1,7752 @@
+Index: gnome-games-2.18.0.1/configure
+===================================================================
+--- gnome-games-2.18.0.1.orig/configure	2007-04-07 16:57:57.008318500 +0200
++++ gnome-games-2.18.0.1/configure	2007-04-07 16:58:43.843245500 +0200
+@@ -1,6 +1,6 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.60 for gnome-games 2.18.0.1.
++# Generated by GNU Autoconf 2.61 for gnome-games 2.18.0.1.
+ #
+ # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-games>.
+ #
+@@ -12,7 +12,8 @@
+ ## M4sh Initialization.  ##
+ ## --------------------- ##
+ 
+-# Be Bourne compatible
++# Be more Bourne compatible
++DUALCASE=1; export DUALCASE # for MKS sh
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+   emulate sh
+   NULLCMD=:
+@@ -21,10 +22,13 @@
+   alias -g '${1+"$@"}'='"$@"'
+   setopt NO_GLOB_SUBST
+ else
+-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
++  case `(set -o) 2>/dev/null` in
++  *posix*) set -o posix ;;
++esac
++
+ fi
+-BIN_SH=xpg4; export BIN_SH # for Tru64
+-DUALCASE=1; export DUALCASE # for MKS sh
++
++
+ 
+ 
+ # PATH needs CR
+@@ -217,7 +221,7 @@
+ else
+   as_candidate_shells=
+     as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
++for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+@@ -235,7 +239,6 @@
+ 	 # Try only shells that exist, to save several forks.
+ 	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+ 		{ ("$as_shell") 2> /dev/null <<\_ASEOF
+-# Be Bourne compatible
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+   emulate sh
+   NULLCMD=:
+@@ -244,10 +247,12 @@
+   alias -g '${1+"$@"}'='"$@"'
+   setopt NO_GLOB_SUBST
+ else
+-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
++  case `(set -o) 2>/dev/null` in
++  *posix*) set -o posix ;;
++esac
++
+ fi
+-BIN_SH=xpg4; export BIN_SH # for Tru64
+-DUALCASE=1; export DUALCASE # for MKS sh
++
+ 
+ :
+ _ASEOF
+@@ -255,7 +260,6 @@
+   CONFIG_SHELL=$as_shell
+ 	       as_have_required=yes
+ 	       if { "$as_shell" 2> /dev/null <<\_ASEOF
+-# Be Bourne compatible
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+   emulate sh
+   NULLCMD=:
+@@ -264,10 +268,12 @@
+   alias -g '${1+"$@"}'='"$@"'
+   setopt NO_GLOB_SUBST
+ else
+-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
++  case `(set -o) 2>/dev/null` in
++  *posix*) set -o posix ;;
++esac
++
+ fi
+-BIN_SH=xpg4; export BIN_SH # for Tru64
+-DUALCASE=1; export DUALCASE # for MKS sh
++
+ 
+ :
+ (as_func_return () {
+@@ -514,19 +520,28 @@
+   as_mkdir_p=false
+ fi
+ 
+-# Find out whether ``test -x'' works.  Don't use a zero-byte file, as
+-# systems may use methods other than mode bits to determine executability.
+-cat >conf$$.file <<_ASEOF
+-#! /bin/sh
+-exit 0
+-_ASEOF
+-chmod +x conf$$.file
+-if test -x conf$$.file >/dev/null 2>&1; then
+-  as_executable_p="test -x"
++if test -x / >/dev/null 2>&1; then
++  as_test_x='test -x'
+ else
+-  as_executable_p=:
++  if ls -dL / >/dev/null 2>&1; then
++    as_ls_L_option=L
++  else
++    as_ls_L_option=
++  fi
++  as_test_x='
++    eval sh -c '\''
++      if test -d "$1"; then
++        test -d "$1/.";
++      else
++	case $1 in
++        -*)set "./$1";;
++	esac;
++	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
++	???[sx]*):;;*)false;;esac;fi
++    '\'' sh
++  '
+ fi
+-rm -f conf$$.file
++as_executable_p=$as_test_x
+ 
+ # Sed expression to map a string onto a valid CPP name.
+ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+@@ -721,36 +736,36 @@
+ # Factoring default headers for most tests.
+ ac_includes_default="\
+ #include <stdio.h>
+-#if HAVE_SYS_TYPES_H
++#ifdef HAVE_SYS_TYPES_H
+ # include <sys/types.h>
+ #endif
+-#if HAVE_SYS_STAT_H
++#ifdef HAVE_SYS_STAT_H
+ # include <sys/stat.h>
+ #endif
+-#if STDC_HEADERS
++#ifdef STDC_HEADERS
+ # include <stdlib.h>
+ # include <stddef.h>
+ #else
+-# if HAVE_STDLIB_H
++# ifdef HAVE_STDLIB_H
+ #  include <stdlib.h>
+ # endif
+ #endif
+-#if HAVE_STRING_H
+-# if !STDC_HEADERS && HAVE_MEMORY_H
++#ifdef HAVE_STRING_H
++# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
+ #  include <memory.h>
+ # endif
+ # include <string.h>
+ #endif
+-#if HAVE_STRINGS_H
++#ifdef HAVE_STRINGS_H
+ # include <strings.h>
+ #endif
+-#if HAVE_INTTYPES_H
++#ifdef HAVE_INTTYPES_H
+ # include <inttypes.h>
+ #endif
+-#if HAVE_STDINT_H
++#ifdef HAVE_STDINT_H
+ # include <stdint.h>
+ #endif
+-#if HAVE_UNISTD_H
++#ifdef HAVE_UNISTD_H
+ # include <unistd.h>
+ #endif"
+ 
+@@ -929,18 +944,43 @@
+ CAIRO_LIBS
+ GLADE_CFLAGS
+ GLADE_LIBS
++ggzcore_libraries
++ggzcore_includes
++GGZCORE_INCLUDES
++GGZCORE_LDFLAGS
++LIB_GGZCORE
+ libggz_libraries
+ libggz_includes
+ LIBGGZ_INCLUDES
+ LIBGGZ_LDFLAGS
+ LIB_GGZ
++ggzmod_libraries
++ggzmod_includes
++GGZMOD_INCLUDES
++GGZMOD_LDFLAGS
++LIB_GGZMOD
++GGZ_CONFIG
++ggzexecmoddir
++ggzdatadir
++ggz_config
++ggzmoduleconfdir
++packagesrcdir
++ggz_gtk_libraries
++ggz_gtk_includes
++GGZ_GTK_INCLUDES
++GGZ_GTK_LDFLAGS
++LIB_GGZ_GTK
++GGZ_CLIENT_TRUE
++GGZ_CLIENT_FALSE
++GGZ_SERVER_TRUE
++GGZ_SERVER_FALSE
++GGZ_GTK_TRUE
++GGZ_GTK_FALSE
+ ggzdmod_libraries
+ ggzdmod_includes
+ GGZDMOD_INCLUDES
+ GGZDMOD_LDFLAGS
+ LIB_GGZDMOD
+-GGZ_SERVER_TRUE
+-GGZ_SERVER_FALSE
+ LIB_ASYNC
+ LDADD
+ LIB_GCRYPT
+@@ -951,25 +991,12 @@
+ INSTALL_LIBGGZ_FALSE
+ INSTALL_GGZDMOD_TRUE
+ INSTALL_GGZDMOD_FALSE
+-GGZMOD_INCLUDES
+-GGZMOD_LDFLAGS
+-LIB_GGZMOD
+ INSTALL_GGZMOD_TRUE
+ INSTALL_GGZMOD_FALSE
+-GGZCORE_INCLUDES
+-GGZCORE_LDFLAGS
+-LIB_GGZCORE
+ INSTALL_GGZCORE_TRUE
+ INSTALL_GGZCORE_FALSE
+-GGZ_GTK_INCLUDES
+-GGZ_GTK_LDFLAGS
+-LIB_GGZ_GTK
+-GGZ_GTK_TRUE
+-GGZ_GTK_FALSE
+ INSTALL_GGZ_GTK_TRUE
+ INSTALL_GGZ_GTK_FALSE
+-GGZ_CLIENT_TRUE
+-GGZ_CLIENT_FALSE
+ GNOME_GAMES_CXXFLAGS
+ ESD_CFLAGS
+ ESD_LIBS
+@@ -988,7 +1015,6 @@
+ PO_IN_DATADIR_FALSE
+ POFILES
+ POSUB
+-LIBEXPAT
+ LIBOBJS
+ PLATFORM_WIN32_TRUE
+ PLATFORM_WIN32_FALSE
+@@ -1014,6 +1040,7 @@
+ CC
+ CFLAGS
+ LDFLAGS
++LIBS
+ CPPFLAGS
+ CPP
+ CXX
+@@ -1140,10 +1167,10 @@
+   -disable-* | --disable-*)
+     ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+     # Reject names that are not valid shell variable names.
+-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
++    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    { (exit 1); exit 1; }; }
+-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
++    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
+     eval enable_$ac_feature=no ;;
+ 
+   -docdir | --docdir | --docdi | --doc | --do)
+@@ -1159,10 +1186,10 @@
+   -enable-* | --enable-*)
+     ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+     # Reject names that are not valid shell variable names.
+-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
++    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    { (exit 1); exit 1; }; }
+-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
++    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
+     eval enable_$ac_feature=\$ac_optarg ;;
+ 
+   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+@@ -1356,19 +1383,19 @@
+   -with-* | --with-*)
+     ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+     # Reject names that are not valid shell variable names.
+-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
++    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+       { echo "$as_me: error: invalid package name: $ac_package" >&2
+    { (exit 1); exit 1; }; }
+-    ac_package=`echo $ac_package| sed 's/-/_/g'`
++    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
+     eval with_$ac_package=\$ac_optarg ;;
+ 
+   -without-* | --without-*)
+     ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+     # Reject names that are not valid shell variable names.
+-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
++    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+       { echo "$as_me: error: invalid package name: $ac_package" >&2
+    { (exit 1); exit 1; }; }
+-    ac_package=`echo $ac_package | sed 's/-/_/g'`
++    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
+     eval with_$ac_package=no ;;
+ 
+   --x)
+@@ -1633,6 +1660,7 @@
+ 
+   --enable-iso-cxx        Try to warn if code is not ISO C++
+   --disable-schemas-install	Disable the schemas installation
++  --enable-noregistry     Do not register game modules.
+   --disable-threading     Don't build in threading support
+   --enable-anl            Enable asynchronous hostname lookups
+   --disable-tests         disable building test apps
+@@ -1660,11 +1688,28 @@
+                           list of formats
+   --with-gconf-source=sourceaddress      Config database for installing schema files.
+   --with-gconf-schema-file-dir=dir        Directory for installing schema files.
++  --with-ggzcore-dir=DIR  ggzcore installation prefix
++  --with-ggzcore-includes=DIR
++                          where the ggzcore includes are
++  --with-ggzcore-libraries=DIR
++                          where the ggzcore libs are
+   --with-libggz-dir=DIR   libggz installation prefix
+   --with-libggz-includes=DIR
+                           where the libggz includes are
+   --with-libggz-libraries=DIR
+                           where the libggz libs are
++  --with-ggz-client       Force GGZ client support
++  --with-ggzmod-dir=DIR   ggzmod installation prefix
++  --with-ggzmod-includes=DIR
++                          where the ggzmod includes are
++  --with-ggzmod-libraries=DIR
++                          where the ggzmod libs are
++  --with-ggzconfig=DIR    path to ggz-config
++  --with-ggz-gtk-dir=DIR  ggz-gtk installation prefix
++  --with-ggz-gtk-includes=DIR
++                          where the ggz-gtk includes are
++  --with-ggz-gtk-libraries=DIR
++                          where the ggz-gtk libs are
+   --with-ggz-server       Force GGZ server support
+   --with-ggzdmod-dir=DIR  ggzdmod installation prefix
+   --with-ggzdmod-includes=DIR
+@@ -1688,6 +1733,7 @@
+   CFLAGS      C compiler flags
+   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
+               nonstandard directory <lib dir>
++  LIBS        libraries to pass to the linker, e.g. -l<library>
+   CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
+               you have headers in a nonstandard directory <include dir>
+   CPP         C preprocessor
+@@ -1783,7 +1829,7 @@
+ if $ac_init_version; then
+   cat <<\_ACEOF
+ gnome-games configure 2.18.0.1
+-generated by GNU Autoconf 2.60
++generated by GNU Autoconf 2.61
+ 
+ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+ 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+@@ -1797,7 +1843,7 @@
+ running configure, to aid debugging if configure makes a mistake.
+ 
+ It was created by gnome-games $as_me 2.18.0.1, which was
+-generated by GNU Autoconf 2.60.  Invocation command line was
++generated by GNU Autoconf 2.61.  Invocation command line was
+ 
+   $ $0 $@
+ 
+@@ -2150,14 +2196,6 @@
+ 
+ 
+ 
+-case m4 in
+-  [\\/]* | ?:[\\/]* ) ac_macro_dir=m4         ;;
+-  *)                      ac_macro_dir=$srcdir/m4 ;;
+-esac
+-test -d "$ac_macro_dir" ||
+-  { { echo "$as_me:$LINENO: error: cannot find macro directory \`m4'" >&5
+-echo "$as_me: error: cannot find macro directory \`m4'" >&2;}
+-   { (exit 1); exit 1; }; }
+ 
+ 
+ ac_config_headers="$ac_config_headers config.h"
+@@ -2231,7 +2269,7 @@
+     # by default.
+     for ac_prog in ginstall scoinst install; do
+       for ac_exec_ext in '' $ac_executable_extensions; do
+-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then
++	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+ 	  if test $ac_prog = install &&
+ 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+ 	    # AIX install.  It has an incompatible calling convention.
+@@ -2397,7 +2435,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  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"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -2532,7 +2570,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  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"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -2572,7 +2610,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  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"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -2674,7 +2712,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  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"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -2714,7 +2752,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  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"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -2771,7 +2809,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  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"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -2812,7 +2850,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+        ac_prog_rejected=yes
+        continue
+@@ -2870,7 +2908,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  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"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -2914,7 +2952,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  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"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -3055,7 +3093,7 @@
+ # in a Makefile.  We should not override ac_cv_exeext if it was cached,
+ # so that the user can short-circuit this test for compilers unknown to
+ # Autoconf.
+-for ac_file in $ac_files
++for ac_file in $ac_files ''
+ do
+   test -f "$ac_file" || continue
+   case $ac_file in
+@@ -3083,6 +3121,12 @@
+ test "$ac_cv_exeext" = no && ac_cv_exeext=
+ 
+ else
++  ac_file=''
++fi
++
++{ echo "$as_me:$LINENO: result: $ac_file" >&5
++echo "${ECHO_T}$ac_file" >&6; }
++if test -z "$ac_file"; then
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+@@ -3094,8 +3138,6 @@
+ fi
+ 
+ ac_exeext=$ac_cv_exeext
+-{ echo "$as_me:$LINENO: result: $ac_file" >&5
+-echo "${ECHO_T}$ac_file" >&6; }
+ 
+ # Check that the compiler produces executables we can run.  If not, either
+ # the compiler is broken, or we cross compile.
+@@ -3273,27 +3315,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_compiler_gnu=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -3348,27 +3373,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   echo "$as_me: failed program was:" >&5
+@@ -3403,27 +3411,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -3459,27 +3450,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   echo "$as_me: failed program was:" >&5
+@@ -3595,27 +3569,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   echo "$as_me: failed program was:" >&5
+@@ -3878,17 +3835,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -3922,17 +3872,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   # Broken: success on invalid input.
+ continue
+ else
+@@ -3997,17 +3940,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -4041,17 +3977,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   # Broken: success on invalid input.
+ continue
+ else
+@@ -4112,7 +4041,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  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"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -4156,7 +4085,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  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"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -4269,27 +4198,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_compiler_gnu=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -4344,27 +4256,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   echo "$as_me: failed program was:" >&5
+@@ -4399,27 +4294,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -4455,27 +4333,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   echo "$as_me: failed program was:" >&5
+@@ -4716,7 +4577,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  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"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -4779,7 +4640,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  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_ICONV="$as_dir/$ac_word$ac_exec_ext"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -4820,7 +4681,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  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_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -4861,7 +4722,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  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_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -4902,7 +4763,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  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_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -5047,27 +4908,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -5104,7 +4948,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  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"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -5144,7 +4988,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  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"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -5201,7 +5045,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  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"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -5242,7 +5086,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+        ac_prog_rejected=yes
+        continue
+@@ -5300,7 +5144,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  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"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -5344,7 +5188,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  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"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -5464,27 +5308,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_compiler_gnu=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -5539,27 +5366,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   echo "$as_me: failed program was:" >&5
+@@ -5594,27 +5404,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -5650,27 +5443,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   echo "$as_me: failed program was:" >&5
+@@ -5786,27 +5562,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   echo "$as_me: failed program was:" >&5
+@@ -5980,7 +5739,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  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"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -6024,7 +5783,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  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"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -6137,27 +5896,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_compiler_gnu=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -6212,27 +5954,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   echo "$as_me: failed program was:" >&5
+@@ -6267,27 +5992,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -6323,27 +6031,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   echo "$as_me: failed program was:" >&5
+@@ -6529,7 +6220,7 @@
+     # by default.
+     for ac_prog in ginstall scoinst install; do
+       for ac_exec_ext in '' $ac_executable_extensions; do
+-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then
++	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+ 	  if test $ac_prog = install &&
+ 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+ 	    # AIX install.  It has an incompatible calling convention.
+@@ -6636,17 +6327,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -6680,17 +6364,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   # Broken: success on invalid input.
+ continue
+ else
+@@ -6755,17 +6432,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -6799,17 +6469,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   # Broken: success on invalid input.
+ continue
+ else
+@@ -6862,7 +6525,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  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"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -6902,7 +6565,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  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"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -7205,7 +6868,7 @@
+   for ac_prog in grep ggrep; do
+   for ac_exec_ext in '' $ac_executable_extensions; do
+     ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+-    { test -f "$ac_path_GREP" && $as_executable_p "$ac_path_GREP"; } || continue
++    { 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
+@@ -7287,7 +6950,7 @@
+   for ac_prog in egrep; do
+   for ac_exec_ext in '' $ac_executable_extensions; do
+     ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+-    { test -f "$ac_path_EGREP" && $as_executable_p "$ac_path_EGREP"; } || continue
++    { 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
+@@ -7756,7 +7419,7 @@
+   ;;
+ *-*-irix6*)
+   # Find out which ABI we are using.
+-  echo '#line 7759 "configure"' > conftest.$ac_ext
++  echo '#line 7422 "configure"' > conftest.$ac_ext
+   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+@@ -7880,27 +7543,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   lt_cv_cc_needs_belf=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -7909,7 +7556,7 @@
+ 	lt_cv_cc_needs_belf=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+      ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -7963,7 +7610,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -8003,7 +7650,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  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_DLLTOOL="dlltool"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -8059,7 +7706,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_AS="${ac_tool_prefix}as"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -8099,7 +7746,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  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_AS="as"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -8155,7 +7802,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -8195,7 +7842,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  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_OBJDUMP="objdump"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -8279,27 +7926,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   echo "$as_me: failed program was:" >&5
+@@ -8475,27 +8105,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   echo "$as_me: failed program was:" >&5
+@@ -8558,27 +8171,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -8614,17 +8210,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (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
+   echo "$as_me: failed program was:" >&5
+@@ -8741,17 +8330,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_cxx_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -8785,17 +8367,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_cxx_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   # Broken: success on invalid input.
+ continue
+ else
+@@ -8860,17 +8435,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_cxx_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -8904,17 +8472,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_cxx_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   # Broken: success on invalid input.
+ continue
+ else
+@@ -8955,7 +8516,7 @@
+ ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_f77_compiler_gnu
+ if test -n "$ac_tool_prefix"; then
+-  for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn
++  for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
+   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
+@@ -8973,7 +8534,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  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"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -8999,7 +8560,7 @@
+ fi
+ if test -z "$F77"; then
+   ac_ct_F77=$F77
+-  for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn
++  for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+@@ -9017,7 +8578,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  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"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -9124,27 +8685,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_f77_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_compiler_gnu=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -9187,27 +8731,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   echo "$as_me: failed program was:" >&5
+@@ -9662,7 +9189,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  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"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -9702,7 +9229,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  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"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -9758,7 +9285,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  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"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -9798,7 +9325,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  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"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -9854,7 +9381,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  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"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -9894,7 +9421,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  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"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -10211,11 +9738,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:10214: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9741: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:10218: \$? = $ac_status" >&5
++   echo "$as_me:9745: \$? = $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.
+@@ -10479,11 +10006,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:10482: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:10009: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:10486: \$? = $ac_status" >&5
++   echo "$as_me:10013: \$? = $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.
+@@ -10583,11 +10110,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:10586: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:10113: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:10590: \$? = $ac_status" >&5
++   echo "$as_me:10117: \$? = $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
+@@ -11063,27 +10590,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+ 
+ aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+ }'`
+@@ -11097,7 +10608,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+ 
+@@ -11138,27 +10649,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+ 
+ aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+ }'`
+@@ -11172,7 +10667,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+ 
+@@ -12420,27 +11915,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_dl_dlopen=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -12449,7 +11928,7 @@
+ 	ac_cv_lib_dl_dlopen=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+@@ -12531,27 +12010,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_shl_load=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -12560,7 +12023,7 @@
+ 	ac_cv_func_shl_load=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
+@@ -12610,27 +12073,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_dld_shl_load=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -12639,7 +12086,7 @@
+ 	ac_cv_lib_dld_shl_load=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+@@ -12711,27 +12158,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_dlopen=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -12740,7 +12171,7 @@
+ 	ac_cv_func_dlopen=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
+@@ -12790,27 +12221,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_dl_dlopen=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -12819,7 +12234,7 @@
+ 	ac_cv_lib_dl_dlopen=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+@@ -12870,27 +12285,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_svld_dlopen=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -12899,7 +12298,7 @@
+ 	ac_cv_lib_svld_dlopen=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+@@ -12950,27 +12349,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_dld_dld_link=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -12979,7 +12362,7 @@
+ 	ac_cv_lib_dld_dld_link=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+@@ -13035,7 +12418,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<EOF
+-#line 13038 "configure"
++#line 12421 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -13135,7 +12518,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<EOF
+-#line 13138 "configure"
++#line 12521 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -14222,27 +13605,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+ 
+ aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+ }'`
+@@ -14256,7 +13623,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+ 
+@@ -14298,27 +13665,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+ 
+ aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+ }'`
+@@ -14332,7 +13683,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+ 
+@@ -15503,11 +14854,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:15506: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14857: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:15510: \$? = $ac_status" >&5
++   echo "$as_me:14861: \$? = $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.
+@@ -15607,11 +14958,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:15610: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14961: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:15614: \$? = $ac_status" >&5
++   echo "$as_me:14965: \$? = $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
+@@ -17177,11 +16528,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:17180: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16531: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:17184: \$? = $ac_status" >&5
++   echo "$as_me:16535: \$? = $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.
+@@ -17281,11 +16632,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:17284: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16635: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:17288: \$? = $ac_status" >&5
++   echo "$as_me:16639: \$? = $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
+@@ -17751,27 +17102,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_f77_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+ 
+ aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+ }'`
+@@ -17785,7 +17120,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+ 
+@@ -17816,27 +17151,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_f77_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+ 
+ aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+ }'`
+@@ -17850,7 +17169,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+ 
+@@ -19511,11 +18830,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:19514: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18833: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:19518: \$? = $ac_status" >&5
++   echo "$as_me:18837: \$? = $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.
+@@ -19779,11 +19098,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:19782: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:19101: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:19786: \$? = $ac_status" >&5
++   echo "$as_me:19105: \$? = $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.
+@@ -19883,11 +19202,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:19886: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:19205: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:19890: \$? = $ac_status" >&5
++   echo "$as_me:19209: \$? = $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
+@@ -20363,27 +19682,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+ 
+ aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+ }'`
+@@ -20397,7 +19700,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+ 
+@@ -20438,27 +19741,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+ 
+ aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+ }'`
+@@ -20472,7 +19759,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+ 
+@@ -22628,27 +21915,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -22684,17 +21954,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (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
+   echo "$as_me: failed program was:" >&5
+@@ -22819,27 +22082,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_c99_variable_arrays=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -22897,27 +22143,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -22953,17 +22182,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (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
+   echo "$as_me: failed program was:" >&5
+@@ -23098,27 +22320,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_sendmsg=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -23127,7 +22333,7 @@
+ 	ac_cv_func_sendmsg=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_func_sendmsg" >&5
+@@ -23177,27 +22383,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   have_localsockets=1
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -23232,27 +22421,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+ 
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -23326,27 +22498,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+ 
+     { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+@@ -23364,7 +22520,7 @@
+ echo "${ECHO_T}no" >&6; }
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+ # Check for msghdr member msg_controllen and friends
+@@ -23400,27 +22556,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   have_controllen=1
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -23473,27 +22612,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+ 
+       { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+@@ -23511,7 +22634,7 @@
+ echo "${ECHO_T}no" >&6; }
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+   { echo "$as_me:$LINENO: checking for network feature: CMSG_LEN" >&5
+@@ -23547,27 +22670,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+ 
+       { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+@@ -23585,7 +22692,7 @@
+ echo "${ECHO_T}no" >&6; }
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+   { echo "$as_me:$LINENO: checking for network feature: CMSG_SPACE" >&5
+@@ -23621,27 +22728,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+ 
+       { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+@@ -23659,7 +22750,7 @@
+ echo "${ECHO_T}no" >&6; }
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ else
+   { echo "$as_me:$LINENO: result: no" >&5
+@@ -23713,27 +22804,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_socket_socket=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -23742,7 +22817,7 @@
+ 	ac_cv_lib_socket_socket=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+@@ -23794,27 +22869,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_nsl_gethostbyname=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -23823,7 +22882,7 @@
+ 	ac_cv_lib_nsl_gethostbyname=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+@@ -23888,27 +22947,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -23944,17 +22986,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (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
+   echo "$as_me: failed program was:" >&5
+@@ -24043,7 +23078,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  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"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -24086,7 +23121,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  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"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -24332,7 +23367,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  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_PRESENT="yes"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -24399,27 +23434,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -24455,17 +23473,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (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
+   echo "$as_me: failed program was:" >&5
+@@ -24651,27 +23662,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   has_option=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -24837,27 +23831,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_c99_variadic_macros=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -24912,27 +23889,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_c99_variable_arrays=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -24994,27 +23954,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_c99_initializers=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -25073,27 +24016,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -25129,17 +24055,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (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
+   echo "$as_me: failed program was:" >&5
+@@ -25291,7 +24210,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  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"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -25339,7 +24258,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_SCROLLKEEPER_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -25449,7 +24368,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -25917,6 +24836,289 @@
+ 
+ 
+ 
++{ echo "$as_me:$LINENO: checking for GGZ library: ggzcore" >&5
++echo $ECHO_N "checking for GGZ library: ggzcore... $ECHO_C" >&6; }
++
++ac_ggzcore_includes=NO ac_ggzcore_libraries=NO
++ggzcore_libraries=""
++ggzcore_includes=""
++
++
++# Check whether --with-ggzcore-dir was given.
++if test "${with_ggzcore_dir+set}" = set; then
++  withval=$with_ggzcore_dir;   ac_ggzcore_includes="$withval"/include
++       ac_ggzcore_libraries="$withval"/lib
++
++fi
++
++
++# Check whether --with-ggzcore-includes was given.
++if test "${with_ggzcore_includes+set}" = set; then
++  withval=$with_ggzcore_includes;   ac_ggzcore_includes="$withval"
++
++fi
++
++
++# Check whether --with-ggzcore-libraries was given.
++if test "${with_ggzcore_libraries+set}" = set; then
++  withval=$with_ggzcore_libraries;   ac_ggzcore_libraries="$withval"
++
++fi
++
++
++if test "${ac_cv_have_ggzcore+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++
++ggzcore_incdirs="$ac_ggzcore_includes $ac_ggz_stdinc"
++
++ret=""
++for i in $ggzcore_incdirs; do
++  add=yes
++  for j in $ret; do
++    if test "x$i" = "x$j"; then
++      add=no
++    fi
++  done
++  if test "x$i" = "xNO"; then
++    add=no
++  fi
++  if test "x$add" = "xyes"; then
++  ret="$ret $i"
++  fi
++done
++ggzcore_incdirs=$ret
++
++ggzcore_header=ggzcore.h
++
++
++ggzcore_incdir=NO
++for i in $ggzcore_incdirs;
++do
++  for j in $ggzcore_header;
++  do
++    echo "configure: 24900: $i/$j" >&5
++    if test -r "$i/$j"; then
++      echo "taking that" >&5
++      ggzcore_incdir=$i
++      break 2
++    fi
++  done
++done
++
++ac_ggzcore_includes="$ggzcore_incdir"
++
++ggzcore_libdirs="$ac_ggzcore_libraries $ac_ggz_stdlib"
++
++ret=""
++for i in $ggzcore_libdirs; do
++  add=yes
++  for j in $ret; do
++    if test "x$i" = "x$j"; then
++      add=no
++    fi
++  done
++  if test "x$i" = "xNO"; then
++    add=no
++  fi
++  if test "x$add" = "xyes"; then
++  ret="$ret $i"
++  fi
++done
++ggzcore_libdirs=$ret
++
++
++ggzcore_libdir=NO
++for dir in $ggzcore_libdirs; do
++  try="ls -1 $dir/libggzcore.la $dir/libggzcore.so"
++  if test -n "`$try 2> /dev/null`"; then ggzcore_libdir=$dir; break; else echo "tried $dir" >&5 ; fi
++done
++
++ac_ggzcore_libraries="$ggzcore_libdir"
++
++if test "$ac_ggzcore_includes" = NO || test "$ac_ggzcore_libraries" = NO; then
++  ac_cv_have_ggzcore="have_ggzcore=no"
++  ac_ggzcore_notfound=""
++else
++  have_ggzcore="yes"
++fi
++
++fi
++
++
++eval "$ac_cv_have_ggzcore"
++
++if test "$have_ggzcore" != yes; then
++  if test "x" = "xignore"; then
++    { echo "$as_me:$LINENO: result: $have_ggzcore (intentionally ignored)" >&5
++echo "${ECHO_T}$have_ggzcore (intentionally ignored)" >&6; }
++  else
++    { echo "$as_me:$LINENO: result: $have_ggzcore" >&5
++echo "${ECHO_T}$have_ggzcore" >&6; }
++    if test "x" = "x"; then
++
++  { echo "$as_me:$LINENO: WARNING: no
++  The library 'ggzcore' does not seem to be installed correctly.
++  Headers searched in: $ggzcore_incdirs
++  Libraries searched in: $ggzcore_libdirs
++  Please read QuickStart.GGZ in order to fix this.
++  " >&5
++echo "$as_me: WARNING: no
++  The library 'ggzcore' does not seem to be installed correctly.
++  Headers searched in: $ggzcore_incdirs
++  Libraries searched in: $ggzcore_libdirs
++  Please read QuickStart.GGZ in order to fix this.
++  " >&2;}
++  exit 1
++
++    fi
++
++    # Perform actions given by argument 2.
++
++  fi
++else
++  ac_cv_have_ggzcore="have_ggzcore=yes \
++    ac_ggzcore_includes=$ac_ggzcore_includes ac_ggzcore_libraries=$ac_ggzcore_libraries"
++  { echo "$as_me:$LINENO: result: $have_ggzcore (libraries $ac_ggzcore_libraries, headers $ac_ggzcore_includes)" >&5
++echo "${ECHO_T}$have_ggzcore (libraries $ac_ggzcore_libraries, headers $ac_ggzcore_includes)" >&6; }
++
++  ggzcore_libraries="$ac_ggzcore_libraries"
++  ggzcore_includes="$ac_ggzcore_includes"
++
++
++
++
++  GGZCORE_INCLUDES="-isystem $ggzcore_includes"
++  GGZCORE_LDFLAGS="-L$ggzcore_libraries"
++
++
++
++
++  LIB_GGZCORE='-lggzcore'
++
++
++  # Perform actions given by argument 1.
++
++fi
++
++
++
++
++if test "x$prefix" = "xNONE"; then
++  prefix="${ac_default_prefix}"
++fi
++if test "x$exec_prefix" = "xNONE"; then
++  exec_prefix='${prefix}'
++fi
++
++cat >>confdefs.h <<_ACEOF
++#define PREFIX "${prefix}"
++_ACEOF
++
++
++ac_ggz_prefix=""
++
++# Check whether --with-ggz-dir was given.
++if test "${with_ggz_dir+set}" = set; then
++  withval=$with_ggz_dir;   ac_ggz_prefix="$withval"
++
++fi
++
++
++if test "x${prefix}" = "xNONE"; then
++   ac_ggz_prefix_incdir="${ac_default_prefix}/include"
++   ac_ggz_prefix_libdir="${ac_default_prefix}/lib"
++   ac_ggz_prefix_bindir="${ac_default_prefix}/bin"
++   ac_ggz_prefix_etcdir="${ac_default_prefix}/etc"
++else
++   unq_includedir="${includedir}"
++   unq_libdir="${libdir}"
++   unq_bindir="${bindir}"
++   unq_sysconfdir="${sysconfdir}"
++
++   eval unq_includedir=`echo $unq_includedir`
++   eval unq_includedir=`echo $unq_includedir`
++   eval unq_libdir=`echo $unq_libdir`
++   eval unq_libdir=`echo $unq_libdir`
++   eval unq_bindir=`echo $unq_bindir`
++   eval unq_bindir=`echo $unq_bindir`
++   eval unq_sysconfdir=`echo $unq_sysconfdir`
++   eval unq_sysconfdir=`echo $unq_sysconfdir`
++
++   ac_ggz_prefix_incdir="${unq_includedir}"
++   ac_ggz_prefix_libdir="${unq_libdir}"
++   ac_ggz_prefix_bindir="${unq_bindir}"
++   ac_ggz_prefix_etcdir="${unq_sysconfdir}"
++fi
++ac_ggz_stdinc="$ac_ggz_prefix_incdir"
++ac_ggz_stdlib="$ac_ggz_prefix_libdir"
++ac_ggz_stdbin="$ac_ggz_prefix_bindir"
++ac_ggz_stdetc="$ac_ggz_prefix_etcdir/ggzd"
++if test "x$ac_ggz_prefix" != "x"; then
++  ac_ggz_stdinc="$ac_ggz_stdinc $ac_ggz_prefix/include"
++  ac_ggz_stdlib="$ac_ggz_stdlib $ac_ggz_prefix/lib $ac_ggz_prefix/lib64"
++  ac_ggz_stdbin="$ac_ggz_stdbin $ac_ggz_prefix/bin"
++  ac_ggz_stdetc="$ac_ggz_stdetc $ac_ggz_prefix/etc/ggzd"
++fi
++if test "x" = "xdefaults" || test "x" = "xdefaults"; then
++  ac_ggz_stdinc="$ac_ggz_stdinc /usr/local/include /usr/include"
++  ac_ggz_stdlib="$ac_ggz_stdlib /usr/local/lib /usr/local/lib64 /usr/lib /usr/lib64"
++  ac_ggz_stdbin="$ac_ggz_stdbin /usr/local/bin /usr/bin"
++  ac_ggz_stdetc="$ac_ggz_stdetc /usr/local/etc/ggzd /etc/ggzd"
++fi
++if test "x" = "xexport" || test "x" = "xexport"; then
++  CPPFLAGS="$CPPFLAGS -isystem ${ac_ggz_prefix_incdir} -isystem /usr/local/include"
++  LDFLAGS="$LDFLAGS -L${ac_ggz_prefix_libdir} -L/usr/local/lib"
++fi
++
++save_cflags=$CFLAGS
++save_cxxflags=$CXXFLAGS
++CFLAGS="-Wall -Werror"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++void signedness(void){char c;if(c==-1)c=0;}
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++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
++  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
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	save_cflags="$save_cflags -fsigned-char"
++	 save_cxxflags="$save_cxxflags -fsigned-char"
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++CFLAGS=$save_cflags
++CXXFLAGS=$save_cxxflags
++
+ 
+ { echo "$as_me:$LINENO: checking for GGZ library: libggz" >&5
+ echo $ECHO_N "checking for GGZ library: libggz... $ECHO_C" >&6; }
+@@ -25979,7 +25181,7 @@
+ do
+   for j in $libggz_header;
+   do
+-    echo "configure: 25982: $i/$j" >&5
++    echo "configure: 25184: $i/$j" >&5
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       libggz_incdir=$i
+@@ -26084,6 +25286,7 @@
+ fi
+ 
+ 
++
+   if test "$try_ggz" = "yes"; then
+     # For now, version 0.0.14 is required.  This could be an additional
+     # parameter.
+@@ -26177,56 +25380,56 @@
+ 
+   fi
+ 
+-  ggz_server="no"
++  ggz_client="no"
+ 
+-# Check whether --with-ggz-server was given.
+-if test "${with_ggz_server+set}" = set; then
+-  withval=$with_ggz_server; try_ggz_server=$withval
++# Check whether --with-ggz-client was given.
++if test "${with_ggz_client+set}" = set; then
++  withval=$with_ggz_client; try_ggz_client=$withval
+ fi
+ 
+ 
+-  if test "x$try_ggz_server" != "xno"; then
++  if test "x$try_ggz_client" != "xno"; then
+     if test "$try_ggz" = "yes"; then
+       # Must pass something as the action-if-failed, or the macro will exit
+ 
+-{ echo "$as_me:$LINENO: checking for GGZ library: ggzdmod" >&5
+-echo $ECHO_N "checking for GGZ library: ggzdmod... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: checking for GGZ library: ggzmod" >&5
++echo $ECHO_N "checking for GGZ library: ggzmod... $ECHO_C" >&6; }
+ 
+-ac_ggzdmod_includes=NO ac_ggzdmod_libraries=NO
+-ggzdmod_libraries=""
+-ggzdmod_includes=""
++ac_ggzmod_includes=NO ac_ggzmod_libraries=NO
++ggzmod_libraries=""
++ggzmod_includes=""
+ 
+ 
+-# Check whether --with-ggzdmod-dir was given.
+-if test "${with_ggzdmod_dir+set}" = set; then
+-  withval=$with_ggzdmod_dir;   ac_ggzdmod_includes="$withval"/include
+-       ac_ggzdmod_libraries="$withval"/lib
++# Check whether --with-ggzmod-dir was given.
++if test "${with_ggzmod_dir+set}" = set; then
++  withval=$with_ggzmod_dir;   ac_ggzmod_includes="$withval"/include
++       ac_ggzmod_libraries="$withval"/lib
+ 
+ fi
+ 
+ 
+-# Check whether --with-ggzdmod-includes was given.
+-if test "${with_ggzdmod_includes+set}" = set; then
+-  withval=$with_ggzdmod_includes;   ac_ggzdmod_includes="$withval"
++# Check whether --with-ggzmod-includes was given.
++if test "${with_ggzmod_includes+set}" = set; then
++  withval=$with_ggzmod_includes;   ac_ggzmod_includes="$withval"
+ 
+ fi
+ 
+ 
+-# Check whether --with-ggzdmod-libraries was given.
+-if test "${with_ggzdmod_libraries+set}" = set; then
+-  withval=$with_ggzdmod_libraries;   ac_ggzdmod_libraries="$withval"
++# Check whether --with-ggzmod-libraries was given.
++if test "${with_ggzmod_libraries+set}" = set; then
++  withval=$with_ggzmod_libraries;   ac_ggzmod_libraries="$withval"
+ 
+ fi
+ 
+ 
+-if test "${ac_cv_have_ggzdmod+set}" = set; then
++if test "${ac_cv_have_ggzmod+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-ggzdmod_incdirs="$ac_ggzdmod_includes $ac_ggz_stdinc"
++ggzmod_incdirs="$ac_ggzmod_includes $ac_ggz_stdinc"
+ 
+ ret=""
+-for i in $ggzdmod_incdirs; do
++for i in $ggzmod_incdirs; do
+   add=yes
+   for j in $ret; do
+     if test "x$i" = "x$j"; then
+@@ -26240,31 +25443,31 @@
+   ret="$ret $i"
+   fi
+ done
+-ggzdmod_incdirs=$ret
++ggzmod_incdirs=$ret
+ 
+-ggzdmod_header=ggzdmod.h
++ggzmod_header=ggzmod.h
+ 
+ 
+-ggzdmod_incdir=NO
+-for i in $ggzdmod_incdirs;
++ggzmod_incdir=NO
++for i in $ggzmod_incdirs;
+ do
+-  for j in $ggzdmod_header;
++  for j in $ggzmod_header;
+   do
+-    echo "configure: 26253: $i/$j" >&5
++    echo "configure: 25456: $i/$j" >&5
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+-      ggzdmod_incdir=$i
++      ggzmod_incdir=$i
+       break 2
+     fi
+   done
+ done
+ 
+-ac_ggzdmod_includes="$ggzdmod_incdir"
++ac_ggzmod_includes="$ggzmod_incdir"
+ 
+-ggzdmod_libdirs="$ac_ggzdmod_libraries $ac_ggz_stdlib"
++ggzmod_libdirs="$ac_ggzmod_libraries $ac_ggz_stdlib"
+ 
+ ret=""
+-for i in $ggzdmod_libdirs; do
++for i in $ggzmod_libdirs; do
+   add=yes
+   for j in $ret; do
+     if test "x$i" = "x$j"; then
+@@ -26278,48 +25481,48 @@
+   ret="$ret $i"
+   fi
+ done
+-ggzdmod_libdirs=$ret
++ggzmod_libdirs=$ret
+ 
+ 
+-ggzdmod_libdir=NO
+-for dir in $ggzdmod_libdirs; do
+-  try="ls -1 $dir/libggzdmod.la $dir/libggzdmod.so"
+-  if test -n "`$try 2> /dev/null`"; then ggzdmod_libdir=$dir; break; else echo "tried $dir" >&5 ; fi
++ggzmod_libdir=NO
++for dir in $ggzmod_libdirs; do
++  try="ls -1 $dir/libggzmod.la $dir/libggzmod.so"
++  if test -n "`$try 2> /dev/null`"; then ggzmod_libdir=$dir; break; else echo "tried $dir" >&5 ; fi
+ done
+ 
+-ac_ggzdmod_libraries="$ggzdmod_libdir"
++ac_ggzmod_libraries="$ggzmod_libdir"
+ 
+-if test "$ac_ggzdmod_includes" = NO || test "$ac_ggzdmod_libraries" = NO; then
+-  ac_cv_have_ggzdmod="have_ggzdmod=no"
+-  ac_ggzdmod_notfound=""
++if test "$ac_ggzmod_includes" = NO || test "$ac_ggzmod_libraries" = NO; then
++  ac_cv_have_ggzmod="have_ggzmod=no"
++  ac_ggzmod_notfound=""
+ else
+-  have_ggzdmod="yes"
++  have_ggzmod="yes"
+ fi
+ 
+ fi
+ 
+ 
+-eval "$ac_cv_have_ggzdmod"
++eval "$ac_cv_have_ggzmod"
+ 
+-if test "$have_ggzdmod" != yes; then
+-  if test "xggz_server="no"" = "xignore"; then
+-    { echo "$as_me:$LINENO: result: $have_ggzdmod (intentionally ignored)" >&5
+-echo "${ECHO_T}$have_ggzdmod (intentionally ignored)" >&6; }
++if test "$have_ggzmod" != yes; then
++  if test "xggz_client="no"" = "xignore"; then
++    { echo "$as_me:$LINENO: result: $have_ggzmod (intentionally ignored)" >&5
++echo "${ECHO_T}$have_ggzmod (intentionally ignored)" >&6; }
+   else
+-    { echo "$as_me:$LINENO: result: $have_ggzdmod" >&5
+-echo "${ECHO_T}$have_ggzdmod" >&6; }
+-    if test "xggz_server="no"" = "x"; then
++    { echo "$as_me:$LINENO: result: $have_ggzmod" >&5
++echo "${ECHO_T}$have_ggzmod" >&6; }
++    if test "xggz_client="no"" = "x"; then
+ 
+   { echo "$as_me:$LINENO: WARNING: no
+-  The library 'ggzdmod' does not seem to be installed correctly.
+-  Headers searched in: $ggzdmod_incdirs
+-  Libraries searched in: $ggzdmod_libdirs
++  The library 'ggzmod' does not seem to be installed correctly.
++  Headers searched in: $ggzmod_incdirs
++  Libraries searched in: $ggzmod_libdirs
+   Please read QuickStart.GGZ in order to fix this.
+   " >&5
+ echo "$as_me: WARNING: no
+-  The library 'ggzdmod' does not seem to be installed correctly.
+-  Headers searched in: $ggzdmod_incdirs
+-  Libraries searched in: $ggzdmod_libdirs
++  The library 'ggzmod' does not seem to be installed correctly.
++  Headers searched in: $ggzmod_incdirs
++  Libraries searched in: $ggzmod_libdirs
+   Please read QuickStart.GGZ in order to fix this.
+   " >&2;}
+   exit 1
+@@ -26327,110 +25530,650 @@
+     fi
+ 
+     # Perform actions given by argument 2.
+-    ggz_server="no"
++    ggz_client="no"
+   fi
+ else
+-  ac_cv_have_ggzdmod="have_ggzdmod=yes \
+-    ac_ggzdmod_includes=$ac_ggzdmod_includes ac_ggzdmod_libraries=$ac_ggzdmod_libraries"
+-  { echo "$as_me:$LINENO: result: $have_ggzdmod (libraries $ac_ggzdmod_libraries, headers $ac_ggzdmod_includes)" >&5
+-echo "${ECHO_T}$have_ggzdmod (libraries $ac_ggzdmod_libraries, headers $ac_ggzdmod_includes)" >&6; }
++  ac_cv_have_ggzmod="have_ggzmod=yes \
++    ac_ggzmod_includes=$ac_ggzmod_includes ac_ggzmod_libraries=$ac_ggzmod_libraries"
++  { echo "$as_me:$LINENO: result: $have_ggzmod (libraries $ac_ggzmod_libraries, headers $ac_ggzmod_includes)" >&5
++echo "${ECHO_T}$have_ggzmod (libraries $ac_ggzmod_libraries, headers $ac_ggzmod_includes)" >&6; }
+ 
+-  ggzdmod_libraries="$ac_ggzdmod_libraries"
+-  ggzdmod_includes="$ac_ggzdmod_includes"
++  ggzmod_libraries="$ac_ggzmod_libraries"
++  ggzmod_includes="$ac_ggzmod_includes"
+ 
+ 
+ 
+ 
+-  GGZDMOD_INCLUDES="-isystem $ggzdmod_includes"
+-  GGZDMOD_LDFLAGS="-L$ggzdmod_libraries"
++  GGZMOD_INCLUDES="-isystem $ggzmod_includes"
++  GGZMOD_LDFLAGS="-L$ggzmod_libraries"
+ 
+ 
+ 
+ 
+-  LIB_GGZDMOD='-lggzdmod'
++  LIB_GGZMOD='-lggzmod'
+ 
+ 
+   # Perform actions given by argument 1.
+-  ggz_server="yes"
++
++{ echo "$as_me:$LINENO: checking for GGZ configuration tool: ggz-config" >&5
++echo $ECHO_N "checking for GGZ configuration tool: ggz-config... $ECHO_C" >&6; }
++
++ac_ggz_config=NO
++ggz_config=""
++
++
++# Check whether --with-ggzconfig was given.
++if test "${with_ggzconfig+set}" = set; then
++  withval=$with_ggzconfig;   ac_ggz_config="$withval"
++
+ fi
+ 
+ 
++if test "${ac_cv_have_ggzconfig+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++
++ggz_config_dirs="$ac_ggz_config $ac_ggz_stdbin"
++
++
++ggz_config_dir=NO
++for i in $ggz_config_dirs;
++do
++  for j in ggz-config;
++  do
++    echo "configure: 25584: $i/$j" >&5
++    if test -r "$i/$j"; then
++      echo "taking that" >&5
++      ggz_config_dir=$i
++      break 2
+     fi
+-    if test "$ggz_server" = "yes"; then
++  done
++done
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define GGZ_SERVER 1
++ac_ggz_config="$ggz_config_dir"
++
++if test "$ac_ggz_config" = NO; then
++  ac_cv_have_ggzcore="have_ggz_config=no"
++  ac_ggz_config_notfound=""
++  have_ggz_config="no"
++else
++  have_ggz_config="yes"
++fi
++
++fi
++
++
++eval "$ac_cv_have_ggz_config"
++
++if test "$have_ggz_config" != yes; then
++  if test "xggz_client="no"" = "xignore"; then
++    { echo "$as_me:$LINENO: result: $have_ggz_config (intentionally ignored)" >&5
++echo "${ECHO_T}$have_ggz_config (intentionally ignored)" >&6; }
++    GGZ_CONFIG="true"
++    ggzexecmoddir="\${prefix}/lib/ggz"
++    ggzdatadir="\${prefix}/share/ggz"
++
++
++
++
++cat >>confdefs.h <<_ACEOF
++#define GAMEDIR "${prefix}/lib/ggz"
+ _ACEOF
+ 
+-    else
+-      if test "$try_ggz_server" = "yes"; then
+-        { { echo "$as_me:$LINENO: error: Could not configure GGZ server support. See above messages." >&5
+-echo "$as_me: error: Could not configure GGZ server support. See above messages." >&2;}
++
++cat >>confdefs.h <<_ACEOF
++#define GGZDATADIR "${prefix}/share/ggz"
++_ACEOF
++
++  else
++    { echo "$as_me:$LINENO: result: $have_ggz_config" >&5
++echo "${ECHO_T}$have_ggz_config" >&6; }
++    if test "xggz_client="no"" = "x"; then
++      { { echo "$as_me:$LINENO: error: ggz-config not found. Please check your installation! " >&5
++echo "$as_me: error: ggz-config not found. Please check your installation! " >&2;}
+    { (exit 1); exit 1; }; }
+-      fi
+     fi
++
++    # Perform actions given by argument 2.
++    ggz_client="no"
+   fi
++else
++  pathto_app=`echo $prefix/bin/ | tr -s "/"`
++  pathto_ggz=`echo $ac_ggz_config/ | tr -s "/"`
+ 
++  if test "x$pathto_app" != "x$pathto_ggz"; then
++    { echo "$as_me:$LINENO: result: $have_ggz_config (dismissed due to different prefix)" >&5
++echo "${ECHO_T}$have_ggz_config (dismissed due to different prefix)" >&6; }
++    GGZ_CONFIG="true"
++    ggzexecmoddir="\${prefix}/lib/ggz"
++    ggzdatadir="\${prefix}/share/ggz"
+ 
+ 
+-if test "$ggz_server" = "yes"; then
+-  GGZ_SERVER_TRUE=
+-  GGZ_SERVER_FALSE='#'
+-else
+-  GGZ_SERVER_TRUE='#'
+-  GGZ_SERVER_FALSE=
+-fi
+ 
+ 
++cat >>confdefs.h <<_ACEOF
++#define GGZMODULECONFDIR "${prefix}/etc"
++_ACEOF
+ 
+ 
+-# Check whether --enable-threading was given.
+-if test "${enable_threading+set}" = set; then
+-  enableval=$enable_threading; enable_threading=$enableval
++cat >>confdefs.h <<_ACEOF
++#define GAMEDIR "${prefix}/lib/ggz"
++_ACEOF
++
++
++cat >>confdefs.h <<_ACEOF
++#define GGZDATADIR "${prefix}/share/ggz"
++_ACEOF
++
++  else
++    ac_cv_have_ggz_config="have_ggz_config=yes \
++      ac_ggz_config=$ac_ggz_config"
++    { echo "$as_me:$LINENO: result: $ac_ggz_config/ggz-config" >&5
++echo "${ECHO_T}$ac_ggz_config/ggz-config" >&6; }
++
++    ggz_config="$ac_ggz_config"
++
++
++    # Check whether --enable-noregistry was given.
++if test "${enable_noregistry+set}" = set; then
++  enableval=$enable_noregistry; enable_noregistry=yes
+ else
+-  enable_threading=yes
++  enable_noregistry=no
+ fi
+ 
+ 
+-if test $enable_threading != "no"; then
+-  # Threading support is not available on all platforms.  It's dangerous
+-  # to disable it so this must be done explicitly.
+-  if test "${ac_cv_header_pthread_h+set}" = set; then
+-  { echo "$as_me:$LINENO: checking for pthread.h" >&5
+-echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6; }
+-if test "${ac_cv_header_pthread_h+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-fi
+-{ echo "$as_me:$LINENO: result: $ac_cv_header_pthread_h" >&5
+-echo "${ECHO_T}$ac_cv_header_pthread_h" >&6; }
+-else
+-  # Is the header compilable?
+-{ echo "$as_me:$LINENO: checking pthread.h usability" >&5
+-echo $ECHO_N "checking pthread.h usability... $ECHO_C" >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
++    GGZ_CONFIG="${ggz_config}/ggz-config"
++    if test "$enable_noregistry" = yes; then
++      GGZ_CONFIG="$GGZ_CONFIG --noregistry=$enableval"
++    fi
++
++
++    ggzmoduleconfdir=`$GGZ_CONFIG --configdir`
++
++cat >>confdefs.h <<_ACEOF
++#define GGZMODULECONFDIR "${ggzmoduleconfdir}"
+ _ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-#include <pthread.h>
++
++    ggzexecmoddir=`$GGZ_CONFIG --gamedir`
++
++cat >>confdefs.h <<_ACEOF
++#define GAMEDIR "${ggzexecmoddir}"
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
++
++    ggzdatadir=`$GGZ_CONFIG --datadir`
++
++cat >>confdefs.h <<_ACEOF
++#define GGZDATADIR "${ggzdatadir}"
++_ACEOF
++
++    packagesrcdir=`cd $srcdir && pwd`
++
++cat >>confdefs.h <<_ACEOF
++#define PACKAGE_SOURCE_DIR "${packagesrcdir}"
++_ACEOF
++
++
++
++
++
++
++
++    # Perform actions given by argument 1.
++    ggz_client="yes"
++  fi
++fi
++
++
++fi
++
++
++    fi
++    if test "$ggz_client" = "yes"; then
++
++cat >>confdefs.h <<\_ACEOF
++#define GGZ_CLIENT 1
++_ACEOF
++
++    else
++      if test "$try_ggz_client" = "yes"; then
++        { { echo "$as_me:$LINENO: error: Could not configure GGZ client support. See above messages." >&5
++echo "$as_me: error: Could not configure GGZ client support. See above messages." >&2;}
++   { (exit 1); exit 1; }; }
++      fi
++    fi
++  fi
++
++  ggz_gtk="no"
++  if test "$ggz_client" = "yes"; then
++    if test "xgtk" = "xgtk"; then
++
++{ echo "$as_me:$LINENO: checking for GGZ library: ggz-gtk" >&5
++echo $ECHO_N "checking for GGZ library: ggz-gtk... $ECHO_C" >&6; }
++
++ac_ggz_gtk_includes=NO ac_ggz_gtk_libraries=NO
++ggz_gtk_libraries=""
++ggz_gtk_includes=""
++
++
++# Check whether --with-ggz-gtk-dir was given.
++if test "${with_ggz_gtk_dir+set}" = set; then
++  withval=$with_ggz_gtk_dir;   ac_ggz_gtk_includes="$withval"/include
++       ac_ggz_gtk_libraries="$withval"/lib
++
++fi
++
++
++# Check whether --with-ggz-gtk-includes was given.
++if test "${with_ggz_gtk_includes+set}" = set; then
++  withval=$with_ggz_gtk_includes;   ac_ggz_gtk_includes="$withval"
++
++fi
++
++
++# Check whether --with-ggz-gtk-libraries was given.
++if test "${with_ggz_gtk_libraries+set}" = set; then
++  withval=$with_ggz_gtk_libraries;   ac_ggz_gtk_libraries="$withval"
++
++fi
++
++
++if test "${ac_cv_have_ggz_gtk+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++
++ggz_gtk_incdirs="$ac_ggz_gtk_includes $ac_ggz_stdinc"
++
++ret=""
++for i in $ggz_gtk_incdirs; do
++  add=yes
++  for j in $ret; do
++    if test "x$i" = "x$j"; then
++      add=no
++    fi
++  done
++  if test "x$i" = "xNO"; then
++    add=no
++  fi
++  if test "x$add" = "xyes"; then
++  ret="$ret $i"
++  fi
++done
++ggz_gtk_incdirs=$ret
++
++ggz_gtk_header=ggz-gtk.h
++
++
++ggz_gtk_incdir=NO
++for i in $ggz_gtk_incdirs;
++do
++  for j in $ggz_gtk_header;
++  do
++    echo "configure: 25811: $i/$j" >&5
++    if test -r "$i/$j"; then
++      echo "taking that" >&5
++      ggz_gtk_incdir=$i
++      break 2
++    fi
++  done
++done
++
++ac_ggz_gtk_includes="$ggz_gtk_incdir"
++
++ggz_gtk_libdirs="$ac_ggz_gtk_libraries $ac_ggz_stdlib"
++
++ret=""
++for i in $ggz_gtk_libdirs; do
++  add=yes
++  for j in $ret; do
++    if test "x$i" = "x$j"; then
++      add=no
++    fi
++  done
++  if test "x$i" = "xNO"; then
++    add=no
++  fi
++  if test "x$add" = "xyes"; then
++  ret="$ret $i"
++  fi
++done
++ggz_gtk_libdirs=$ret
++
++
++ggz_gtk_libdir=NO
++for dir in $ggz_gtk_libdirs; do
++  try="ls -1 $dir/libggz-gtk.la $dir/libggz-gtk.so"
++  if test -n "`$try 2> /dev/null`"; then ggz_gtk_libdir=$dir; break; else echo "tried $dir" >&5 ; fi
++done
++
++ac_ggz_gtk_libraries="$ggz_gtk_libdir"
++
++if test "$ac_ggz_gtk_includes" = NO || test "$ac_ggz_gtk_libraries" = NO; then
++  ac_cv_have_ggz_gtk="have_ggz_gtk=no"
++  ac_ggz_gtk_notfound=""
++else
++  have_ggz_gtk="yes"
++fi
++
++fi
++
++
++eval "$ac_cv_have_ggz_gtk"
++
++if test "$have_ggz_gtk" != yes; then
++  if test "x" = "xignore"; then
++    { echo "$as_me:$LINENO: result: $have_ggz_gtk (intentionally ignored)" >&5
++echo "${ECHO_T}$have_ggz_gtk (intentionally ignored)" >&6; }
++  else
++    { echo "$as_me:$LINENO: result: $have_ggz_gtk" >&5
++echo "${ECHO_T}$have_ggz_gtk" >&6; }
++    if test "x" = "x"; then
++
++  { echo "$as_me:$LINENO: WARNING: no
++  The library 'ggz-gtk' does not seem to be installed correctly.
++  Headers searched in: $ggz_gtk_incdirs
++  Libraries searched in: $ggz_gtk_libdirs
++  Please read QuickStart.GGZ in order to fix this.
++  " >&5
++echo "$as_me: WARNING: no
++  The library 'ggz-gtk' does not seem to be installed correctly.
++  Headers searched in: $ggz_gtk_incdirs
++  Libraries searched in: $ggz_gtk_libdirs
++  Please read QuickStart.GGZ in order to fix this.
++  " >&2;}
++  exit 1
++
++    fi
++
++    # Perform actions given by argument 2.
++
++  fi
++else
++  ac_cv_have_ggz_gtk="have_ggz_gtk=yes \
++    ac_ggz_gtk_includes=$ac_ggz_gtk_includes ac_ggz_gtk_libraries=$ac_ggz_gtk_libraries"
++  { echo "$as_me:$LINENO: result: $have_ggz_gtk (libraries $ac_ggz_gtk_libraries, headers $ac_ggz_gtk_includes)" >&5
++echo "${ECHO_T}$have_ggz_gtk (libraries $ac_ggz_gtk_libraries, headers $ac_ggz_gtk_includes)" >&6; }
++
++  ggz_gtk_libraries="$ac_ggz_gtk_libraries"
++  ggz_gtk_includes="$ac_ggz_gtk_includes"
++
++
++
++
++  GGZ_GTK_INCLUDES="-isystem $ggz_gtk_includes"
++  GGZ_GTK_LDFLAGS="-L$ggz_gtk_libraries"
++
++
++
++
++  LIB_GGZ_GTK='-lggz-gtk'
++
++
++  # Perform actions given by argument 1.
++  ggz_gtk="yes"
++fi
++
++      if test $ggz_gtk = "yes"; then
++
++cat >>confdefs.h <<\_ACEOF
++#define GGZ_GTK 1
++_ACEOF
++
++      fi
++    fi
++  fi
++
++
++
++if test "$ggz_client" = "yes"; then
++  GGZ_CLIENT_TRUE=
++  GGZ_CLIENT_FALSE='#'
++else
++  GGZ_CLIENT_TRUE='#'
++  GGZ_CLIENT_FALSE=
++fi
++
++
++
++if test "$ggz_server" = "yes"; then
++  GGZ_SERVER_TRUE=
++  GGZ_SERVER_FALSE='#'
++else
++  GGZ_SERVER_TRUE='#'
++  GGZ_SERVER_FALSE=
++fi
++
++
++
++if test "$ggz_gtk" = "yes"; then
++  GGZ_GTK_TRUE=
++  GGZ_GTK_FALSE='#'
++else
++  GGZ_GTK_TRUE='#'
++  GGZ_GTK_FALSE=
++fi
++
++
++
++
++{ echo "$as_me:$LINENO: checking for GGZ library: libggz" >&5
++echo $ECHO_N "checking for GGZ library: libggz... $ECHO_C" >&6; }
++
++ac_libggz_includes=NO ac_libggz_libraries=NO
++libggz_libraries=""
++libggz_includes=""
++
++
++# Check whether --with-libggz-dir was given.
++if test "${with_libggz_dir+set}" = set; then
++  withval=$with_libggz_dir;   ac_libggz_includes="$withval"/include
++       ac_libggz_libraries="$withval"/lib
++
++fi
++
++
++# Check whether --with-libggz-includes was given.
++if test "${with_libggz_includes+set}" = set; then
++  withval=$with_libggz_includes;   ac_libggz_includes="$withval"
++
++fi
++
++
++# Check whether --with-libggz-libraries was given.
++if test "${with_libggz_libraries+set}" = set; then
++  withval=$with_libggz_libraries;   ac_libggz_libraries="$withval"
++
++fi
++
++
++if test "${ac_cv_have_libggz+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++
++libggz_incdirs="$ac_libggz_includes $ac_ggz_stdinc"
++
++ret=""
++for i in $libggz_incdirs; do
++  add=yes
++  for j in $ret; do
++    if test "x$i" = "x$j"; then
++      add=no
++    fi
++  done
++  if test "x$i" = "xNO"; then
++    add=no
++  fi
++  if test "x$add" = "xyes"; then
++  ret="$ret $i"
++  fi
++done
++libggz_incdirs=$ret
++
++libggz_header=ggz.h
++
++
++libggz_incdir=NO
++for i in $libggz_incdirs;
++do
++  for j in $libggz_header;
++  do
++    echo "configure: 26019: $i/$j" >&5
++    if test -r "$i/$j"; then
++      echo "taking that" >&5
++      libggz_incdir=$i
++      break 2
++    fi
++  done
++done
++
++ac_libggz_includes="$libggz_incdir"
++
++libggz_libdirs="$ac_libggz_libraries $ac_ggz_stdlib"
++
++ret=""
++for i in $libggz_libdirs; do
++  add=yes
++  for j in $ret; do
++    if test "x$i" = "x$j"; then
++      add=no
++    fi
++  done
++  if test "x$i" = "xNO"; then
++    add=no
++  fi
++  if test "x$add" = "xyes"; then
++  ret="$ret $i"
++  fi
++done
++libggz_libdirs=$ret
++
++
++libggz_libdir=NO
++for dir in $libggz_libdirs; do
++  try="ls -1 $dir/libggz.la $dir/libggz.so"
++  if test -n "`$try 2> /dev/null`"; then libggz_libdir=$dir; break; else echo "tried $dir" >&5 ; fi
++done
++
++ac_libggz_libraries="$libggz_libdir"
++
++if test "$ac_libggz_includes" = NO || test "$ac_libggz_libraries" = NO; then
++  ac_cv_have_libggz="have_libggz=no"
++  ac_libggz_notfound=""
++else
++  have_libggz="yes"
++fi
++
++fi
++
++
++eval "$ac_cv_have_libggz"
++
++if test "$have_libggz" != yes; then
++  if test "xtry_ggz="no"" = "xignore"; then
++    { echo "$as_me:$LINENO: result: $have_libggz (ignored)" >&5
++echo "${ECHO_T}$have_libggz (ignored)" >&6; }
++  else
++    { echo "$as_me:$LINENO: result: $have_libggz" >&5
++echo "${ECHO_T}$have_libggz" >&6; }
++    if test "xtry_ggz="no"" = "x"; then
++
++  { echo "$as_me:$LINENO: WARNING: no
++  The library 'libggz' does not seem to be installed correctly.
++  Headers searched in: $libggz_incdirs
++  Libraries searched in: $libggz_libdirs
++  Please read QuickStart.GGZ in order to fix this.
++  " >&5
++echo "$as_me: WARNING: no
++  The library 'libggz' does not seem to be installed correctly.
++  Headers searched in: $libggz_incdirs
++  Libraries searched in: $libggz_libdirs
++  Please read QuickStart.GGZ in order to fix this.
++  " >&2;}
++  exit 1
++
++    fi
++
++    # perform actions given by argument 2.
++    try_ggz="no"
++  fi
++else
++  ac_cv_have_libggz="have_libggz=yes \
++    ac_libggz_includes=$ac_libggz_includes ac_libggz_libraries=$ac_libggz_libraries"
++  { echo "$as_me:$LINENO: result: $have_libggz (libraries $ac_libggz_libraries, headers $ac_libggz_includes)" >&5
++echo "${ECHO_T}$have_libggz (libraries $ac_libggz_libraries, headers $ac_libggz_includes)" >&6; }
++
++  libggz_libraries="$ac_libggz_libraries"
++  libggz_includes="$ac_libggz_includes"
++
++
++
++
++  LIBGGZ_INCLUDES="-isystem $libggz_includes"
++  LIBGGZ_LDFLAGS="-L$libggz_libraries"
++
++
++
++
++  LIB_GGZ='-lggz'
++
++
++  # perform actions given by argument 1.
++  try_ggz="yes"
++fi
++
++
++  if test "$try_ggz" = "yes"; then
++    # For now, version 0.0.14 is required.  This could be an additional
++    # parameter.
++
++	major=0
++	minor=0
++	micro=14
++
++	testprologue="#include <ggz.h>"
++	testbody=""
++	testbody="$testbody if(LIBGGZ_VERSION_MAJOR > $major) return 0;"
++	testbody="$testbody if(LIBGGZ_VERSION_MAJOR < $major) return -1;"
++	testbody="$testbody if(LIBGGZ_VERSION_MINOR > $minor) return 0;"
++	testbody="$testbody if(LIBGGZ_VERSION_MINOR < $minor) return -1;"
++	testbody="$testbody if(LIBGGZ_VERSION_MICRO > $micro) return 0;"
++	testbody="$testbody if(LIBGGZ_VERSION_MICRO < $micro) return -1;"
++	testbody="$testbody return 0;"
++
++	{ echo "$as_me:$LINENO: checking for GGZ library version: $major.$minor.$micro" >&5
++echo $ECHO_N "checking for GGZ library version: $major.$minor.$micro... $ECHO_C" >&6; }
++	if test "$cross_compiling" = yes; then
++  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot run test program while cross compiling
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$testprologue
++int
++main ()
++{
++$testbody
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest$ac_exeext
++if { (ac_try="$ac_link"
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_compile") 2>conftest.er1
++  (eval "$ac_link") 2>&5
+   ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+@@ -26439,17 +26182,294 @@
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
++  (exit $ac_status); }; }; then
++  ac_ggz_version_check=yes
++else
++  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_ggz_version_check=no
++
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++
++
++	if test "x$ac_ggz_version_check" = "xyes"; then
++		{ 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; }
++		if test "xtry_ggz=no" = "x"; then
++			{ { echo "$as_me:$LINENO: error: The GGZ version is too old. Version $major.$minor.$micro is required." >&5
++echo "$as_me: error: The GGZ version is too old. Version $major.$minor.$micro is required." >&2;}
++   { (exit 1); exit 1; }; }
++		fi
++		try_ggz=no
++	fi
++
++  fi
++
++  ggz_server="no"
++
++# Check whether --with-ggz-server was given.
++if test "${with_ggz_server+set}" = set; then
++  withval=$with_ggz_server; try_ggz_server=$withval
++fi
++
++
++  if test "x$try_ggz_server" != "xno"; then
++    if test "$try_ggz" = "yes"; then
++      # Must pass something as the action-if-failed, or the macro will exit
++
++{ echo "$as_me:$LINENO: checking for GGZ library: ggzdmod" >&5
++echo $ECHO_N "checking for GGZ library: ggzdmod... $ECHO_C" >&6; }
++
++ac_ggzdmod_includes=NO ac_ggzdmod_libraries=NO
++ggzdmod_libraries=""
++ggzdmod_includes=""
++
++
++# Check whether --with-ggzdmod-dir was given.
++if test "${with_ggzdmod_dir+set}" = set; then
++  withval=$with_ggzdmod_dir;   ac_ggzdmod_includes="$withval"/include
++       ac_ggzdmod_libraries="$withval"/lib
++
++fi
++
++
++# Check whether --with-ggzdmod-includes was given.
++if test "${with_ggzdmod_includes+set}" = set; then
++  withval=$with_ggzdmod_includes;   ac_ggzdmod_includes="$withval"
++
++fi
++
++
++# Check whether --with-ggzdmod-libraries was given.
++if test "${with_ggzdmod_libraries+set}" = set; then
++  withval=$with_ggzdmod_libraries;   ac_ggzdmod_libraries="$withval"
++
++fi
++
++
++if test "${ac_cv_have_ggzdmod+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++
++ggzdmod_incdirs="$ac_ggzdmod_includes $ac_ggz_stdinc"
++
++ret=""
++for i in $ggzdmod_incdirs; do
++  add=yes
++  for j in $ret; do
++    if test "x$i" = "x$j"; then
++      add=no
++    fi
++  done
++  if test "x$i" = "xNO"; then
++    add=no
++  fi
++  if test "x$add" = "xyes"; then
++  ret="$ret $i"
++  fi
++done
++ggzdmod_incdirs=$ret
++
++ggzdmod_header=ggzdmod.h
++
++
++ggzdmod_incdir=NO
++for i in $ggzdmod_incdirs;
++do
++  for j in $ggzdmod_header;
++  do
++    echo "configure: 26290: $i/$j" >&5
++    if test -r "$i/$j"; then
++      echo "taking that" >&5
++      ggzdmod_incdir=$i
++      break 2
++    fi
++  done
++done
++
++ac_ggzdmod_includes="$ggzdmod_incdir"
++
++ggzdmod_libdirs="$ac_ggzdmod_libraries $ac_ggz_stdlib"
++
++ret=""
++for i in $ggzdmod_libdirs; do
++  add=yes
++  for j in $ret; do
++    if test "x$i" = "x$j"; then
++      add=no
++    fi
++  done
++  if test "x$i" = "xNO"; then
++    add=no
++  fi
++  if test "x$add" = "xyes"; then
++  ret="$ret $i"
++  fi
++done
++ggzdmod_libdirs=$ret
++
++
++ggzdmod_libdir=NO
++for dir in $ggzdmod_libdirs; do
++  try="ls -1 $dir/libggzdmod.la $dir/libggzdmod.so"
++  if test -n "`$try 2> /dev/null`"; then ggzdmod_libdir=$dir; break; else echo "tried $dir" >&5 ; fi
++done
++
++ac_ggzdmod_libraries="$ggzdmod_libdir"
++
++if test "$ac_ggzdmod_includes" = NO || test "$ac_ggzdmod_libraries" = NO; then
++  ac_cv_have_ggzdmod="have_ggzdmod=no"
++  ac_ggzdmod_notfound=""
++else
++  have_ggzdmod="yes"
++fi
++
++fi
++
++
++eval "$ac_cv_have_ggzdmod"
++
++if test "$have_ggzdmod" != yes; then
++  if test "xggz_server="no"" = "xignore"; then
++    { echo "$as_me:$LINENO: result: $have_ggzdmod (intentionally ignored)" >&5
++echo "${ECHO_T}$have_ggzdmod (intentionally ignored)" >&6; }
++  else
++    { echo "$as_me:$LINENO: result: $have_ggzdmod" >&5
++echo "${ECHO_T}$have_ggzdmod" >&6; }
++    if test "xggz_server="no"" = "x"; then
++
++  { echo "$as_me:$LINENO: WARNING: no
++  The library 'ggzdmod' does not seem to be installed correctly.
++  Headers searched in: $ggzdmod_incdirs
++  Libraries searched in: $ggzdmod_libdirs
++  Please read QuickStart.GGZ in order to fix this.
++  " >&5
++echo "$as_me: WARNING: no
++  The library 'ggzdmod' does not seem to be installed correctly.
++  Headers searched in: $ggzdmod_incdirs
++  Libraries searched in: $ggzdmod_libdirs
++  Please read QuickStart.GGZ in order to fix this.
++  " >&2;}
++  exit 1
++
++    fi
++
++    # Perform actions given by argument 2.
++    ggz_server="no"
++  fi
++else
++  ac_cv_have_ggzdmod="have_ggzdmod=yes \
++    ac_ggzdmod_includes=$ac_ggzdmod_includes ac_ggzdmod_libraries=$ac_ggzdmod_libraries"
++  { echo "$as_me:$LINENO: result: $have_ggzdmod (libraries $ac_ggzdmod_libraries, headers $ac_ggzdmod_includes)" >&5
++echo "${ECHO_T}$have_ggzdmod (libraries $ac_ggzdmod_libraries, headers $ac_ggzdmod_includes)" >&6; }
++
++  ggzdmod_libraries="$ac_ggzdmod_libraries"
++  ggzdmod_includes="$ac_ggzdmod_includes"
++
++
++
++
++  GGZDMOD_INCLUDES="-isystem $ggzdmod_includes"
++  GGZDMOD_LDFLAGS="-L$ggzdmod_libraries"
++
++
++
++
++  LIB_GGZDMOD='-lggzdmod'
++
++
++  # Perform actions given by argument 1.
++  ggz_server="yes"
++fi
++
++
++    fi
++    if test "$ggz_server" = "yes"; then
++
++cat >>confdefs.h <<\_ACEOF
++#define GGZ_SERVER 1
++_ACEOF
++
++    else
++      if test "$try_ggz_server" = "yes"; then
++        { { echo "$as_me:$LINENO: error: Could not configure GGZ server support. See above messages." >&5
++echo "$as_me: error: Could not configure GGZ server support. See above messages." >&2;}
++   { (exit 1); exit 1; }; }
++      fi
++    fi
++  fi
++
++
++
++if test "$ggz_server" = "yes"; then
++  GGZ_SERVER_TRUE=
++  GGZ_SERVER_FALSE='#'
++else
++  GGZ_SERVER_TRUE='#'
++  GGZ_SERVER_FALSE=
++fi
++
++
++
++
++# Check whether --enable-threading was given.
++if test "${enable_threading+set}" = set; then
++  enableval=$enable_threading; enable_threading=$enableval
++else
++  enable_threading=yes
++fi
++
++
++if test $enable_threading != "no"; then
++  # Threading support is not available on all platforms.  It's dangerous
++  # to disable it so this must be done explicitly.
++  if test "${ac_cv_header_pthread_h+set}" = set; then
++  { echo "$as_me:$LINENO: checking for pthread.h" >&5
++echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6; }
++if test "${ac_cv_header_pthread_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_header_pthread_h" >&5
++echo "${ECHO_T}$ac_cv_header_pthread_h" >&6; }
++else
++  # Is the header compilable?
++{ echo "$as_me:$LINENO: checking pthread.h usability" >&5
++echo $ECHO_N "checking pthread.h usability... $ECHO_C" >&6; }
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++#include <pthread.h>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -26485,17 +26505,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (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
+   echo "$as_me: failed program was:" >&5
+@@ -26600,27 +26613,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_pthread_pthread_create=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -26629,7 +26626,7 @@
+ 	ac_cv_lib_pthread_pthread_create=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+@@ -26681,27 +26678,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_c_r_pthread_create=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -26710,7 +26691,7 @@
+ 	ac_cv_lib_c_r_pthread_create=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+@@ -26781,27 +26762,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_anl_getaddrinfo_a=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -26810,7 +26775,7 @@
+ 	ac_cv_lib_anl_getaddrinfo_a=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+@@ -26896,27 +26861,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_gcrypt_gcry_check_version=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -26925,7 +26874,7 @@
+ 	ac_cv_lib_gcrypt_gcry_check_version=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+@@ -26967,27 +26916,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -27023,17 +26955,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (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
+   echo "$as_me: failed program was:" >&5
+@@ -27201,7 +27126,7 @@
+ do
+   for j in $gnutls_header;
+   do
+-    echo "configure: 27204: $i/$j" >&5
++    echo "configure: 27129: $i/$j" >&5
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       gnutls_incdir=$i
+@@ -27292,7 +27217,7 @@
+ do
+   for j in openssl/ssl.h;
+   do
+-    echo "configure: 27295: $i/$j" >&5
++    echo "configure: 27220: $i/$j" >&5
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       ssl_incdir=$i
+@@ -27361,27 +27286,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_ssl_rsaref="yes"
+ 
+ else
+@@ -27392,7 +27301,7 @@
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+   CFLAGS="$ac_cflags_safe"
+@@ -27556,12 +27465,6 @@
+ 
+ 
+ 
+-LIBGGZ_INCLUDES="-I\$(top_srcdir)/dependencies/libggz"
+-
+-LIBGGZ_LDFLAGS=""
+-
+-LIB_GGZ="\$(top_builddir)/dependencies/libggz/libggz.la"
+-
+ 
+ 
+ if false; then
+@@ -27569,15 +27472,8 @@
+   INSTALL_LIBGGZ_FALSE='#'
+ else
+   INSTALL_LIBGGZ_TRUE='#'
+-  INSTALL_LIBGGZ_FALSE=
+-fi
+-
+-
+-GGZDMOD_INCLUDES="$LIBGGZ_INCLUDES -I\$(top_srcdir)/dependencies/ggzdmod"
+-
+-GGZDMOD_LDFLAGS="$LIBGGZ_LDFLAGS"
+-
+-LIB_GGZDMOD="$LIB_GGZ \$(top_builddir)/dependencies/ggzdmod/libggzdmod.la"
++  INSTALL_LIBGGZ_FALSE=
++fi
+ 
+ 
+ 
+@@ -27590,13 +27486,6 @@
+ fi
+ 
+ 
+-GGZMOD_INCLUDES="-I\$(top_srcdir)/dependencies/ggzmod"
+-
+-GGZMOD_LDFLAGS=""
+-
+-LIB_GGZMOD="\$(top_builddir)/dependencies/ggzmod/libggzmod.la"
+-
+-
+ 
+ if false; then
+   INSTALL_GGZMOD_TRUE=
+@@ -27607,13 +27496,6 @@
+ fi
+ 
+ 
+-GGZCORE_INCLUDES="-I\$(top_srcdir)/dependencies/ggzcore"
+-
+-GGZCORE_LDFLAGS=""
+-
+-LIB_GGZCORE="\$(top_builddir)/dependencies/ggzcore/libggzcore.la"
+-
+-
+ 
+ if false; then
+   INSTALL_GGZCORE_TRUE=
+@@ -27624,29 +27506,6 @@
+ fi
+ 
+ 
+-GGZ_GTK_INCLUDES="-I\$(top_srcdir)/dependencies/ggz-gtk"
+-
+-GGZ_GTK_LDFLAGS=""
+-
+-LIB_GGZ_GTK="\$(top_builddir)/dependencies/ggz-gtk/libggz-gtk.la"
+-
+-
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define GGZ_GTK 1
+-_ACEOF
+-
+-
+-
+-if true; then
+-  GGZ_GTK_TRUE=
+-  GGZ_GTK_FALSE='#'
+-else
+-  GGZ_GTK_TRUE='#'
+-  GGZ_GTK_FALSE=
+-fi
+-
+-
+ 
+ if false; then
+   INSTALL_GGZ_GTK_TRUE=
+@@ -27657,22 +27516,6 @@
+ fi
+ 
+ 
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define GGZ_CLIENT 1
+-_ACEOF
+-
+-
+-
+-if true; then
+-  GGZ_CLIENT_TRUE=
+-  GGZ_CLIENT_FALSE='#'
+-else
+-  GGZ_CLIENT_TRUE='#'
+-  GGZ_CLIENT_FALSE=
+-fi
+-
+-
+ GNOME_GAMES_CXXFLAGS="$GNOME_GAMES_CFLAGS -I\$(top_srcdir)/libgames-support $WARN_CXXFLAGS"
+ GNOME_GAMES_CFLAGS="$GNOME_GAMES_CFLAGS -I\$(top_srcdir)/libgames-support $WARN_CFLAGS"
+ 
+@@ -27818,27 +27661,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -27874,17 +27700,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (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
+   echo "$as_me: failed program was:" >&5
+@@ -27982,27 +27801,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   am_cv_val_LC_MESSAGES=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -28011,7 +27814,7 @@
+ 	am_cv_val_LC_MESSAGES=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
+@@ -28067,27 +27870,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -28123,17 +27909,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (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
+   echo "$as_me: failed program was:" >&5
+@@ -28229,27 +28008,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   gt_cv_func_ngettext_libc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -28258,7 +28021,7 @@
+ 	gt_cv_func_ngettext_libc=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+@@ -28301,27 +28064,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   gt_cv_func_dgettext_libc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -28330,7 +28077,7 @@
+ 	gt_cv_func_dgettext_libc=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+@@ -28406,27 +28153,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -28435,7 +28166,7 @@
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ ac_res=`eval echo '${'$as_ac_var'}'`
+@@ -28500,27 +28231,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_intl_bindtextdomain=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -28529,7 +28244,7 @@
+ 	ac_cv_lib_intl_bindtextdomain=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+@@ -28578,27 +28293,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_intl_ngettext=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -28607,7 +28306,7 @@
+ 	ac_cv_lib_intl_ngettext=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+@@ -28656,27 +28355,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_intl_dgettext=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -28685,7 +28368,7 @@
+ 	ac_cv_lib_intl_dgettext=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+@@ -28747,27 +28430,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_intl_ngettext=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -28776,7 +28443,7 @@
+ 	ac_cv_lib_intl_ngettext=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+@@ -28825,27 +28492,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_lib_intl_dcgettext=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -28854,7 +28505,7 @@
+ 	ac_cv_lib_intl_dcgettext=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++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
+@@ -28949,27 +28600,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -28978,7 +28613,7 @@
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ ac_res=`eval echo '${'$as_ac_var'}'`
+@@ -29125,27 +28760,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -29154,7 +28773,7 @@
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ ac_res=`eval echo '${'$as_ac_var'}'`
+@@ -29186,7 +28805,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  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"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -29274,27 +28893,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   CATOBJEXT=.gmo
+              DATADIRNAME=share
+ else
+@@ -29366,27 +28969,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func_bind_textdomain_codeset=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -29395,7 +28982,7 @@
+ 	ac_cv_func_bind_textdomain_codeset=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
+@@ -29416,7 +29003,7 @@
+ 	    esac
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+           LIBS="$glib_save_LIBS"
+ 	  INSTOBJEXT=.mo
+@@ -29598,27 +29185,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -29627,7 +29198,7 @@
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ ac_res=`eval echo '${'$as_ac_var'}'`
+@@ -29713,27 +29284,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -29742,7 +29297,7 @@
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ ac_res=`eval echo '${'$as_ac_var'}'`
+@@ -29832,27 +29387,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -29861,7 +29400,7 @@
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ ac_res=`eval echo '${'$as_ac_var'}'`
+@@ -29916,27 +29455,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -29972,17 +29494,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (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
+   echo "$as_me: failed program was:" >&5
+@@ -30061,10 +29576,10 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-#if HAVE_SYS_SELECT_H
++#ifdef HAVE_SYS_SELECT_H
+ # include <sys/select.h>
+ #endif
+-#if HAVE_SYS_SOCKET_H
++#ifdef HAVE_SYS_SOCKET_H
+ # include <sys/socket.h>
+ #endif
+ 
+@@ -30091,27 +29606,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_func_select_args="$ac_arg1,$ac_arg234,$ac_arg5"; break 3
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -30190,27 +29688,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   echo "$as_me: failed program was:" >&5
+@@ -30380,27 +29861,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_type_signal=int
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -30456,27 +29920,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_type_pid_t=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -30538,27 +29985,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -30594,17 +30024,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (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
+   echo "$as_me: failed program was:" >&5
+@@ -30736,27 +30159,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -30765,7 +30172,7 @@
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ ac_res=`eval echo '${'$as_ac_var'}'`
+@@ -30878,7 +30285,7 @@
+ /* Thanks to Paul Eggert for this test.  */
+ $ac_includes_default
+ #include <sys/wait.h>
+-#if HAVE_VFORK_H
++#ifdef HAVE_VFORK_H
+ # include <vfork.h>
+ #endif
+ /* On some sparc systems, changes by the child to local and incoming
+@@ -31148,45 +30555,29 @@
+ int
+ main ()
+ {
+-return $ac_func ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "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
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
++return $ac_func ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   eval "$as_ac_var=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -31195,7 +30586,7 @@
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ ac_res=`eval echo '${'$as_ac_var'}'`
+@@ -31269,27 +30660,11 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+   ac_cv_func__doprnt=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -31298,7 +30673,7 @@
+ 	ac_cv_func__doprnt=no
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_func__doprnt" >&5
+@@ -31316,258 +30691,6 @@
+ 
+ 
+ 
+-# Check for expat
+-# ===============
+-{ echo "$as_me:$LINENO: checking for XML_ParserCreate in -lexpat" >&5
+-echo $ECHO_N "checking for XML_ParserCreate in -lexpat... $ECHO_C" >&6; }
+-if test "${ac_cv_lib_expat_XML_ParserCreate+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lexpat  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char XML_ParserCreate ();
+-int
+-main ()
+-{
+-return XML_ParserCreate ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "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
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_lib_expat_XML_ParserCreate=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_expat_XML_ParserCreate=no
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ echo "$as_me:$LINENO: result: $ac_cv_lib_expat_XML_ParserCreate" >&5
+-echo "${ECHO_T}$ac_cv_lib_expat_XML_ParserCreate" >&6; }
+-if test $ac_cv_lib_expat_XML_ParserCreate = yes; then
+-  LIBEXPAT="-lexpat"
+-else
+-  { { echo "$as_me:$LINENO: error: cannot find expat library" >&5
+-echo "$as_me: error: cannot find expat library" >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+-
+-if test "${ac_cv_header_expat_h+set}" = set; then
+-  { echo "$as_me:$LINENO: checking for expat.h" >&5
+-echo $ECHO_N "checking for expat.h... $ECHO_C" >&6; }
+-if test "${ac_cv_header_expat_h+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-fi
+-{ echo "$as_me:$LINENO: result: $ac_cv_header_expat_h" >&5
+-echo "${ECHO_T}$ac_cv_header_expat_h" >&6; }
+-else
+-  # Is the header compilable?
+-{ echo "$as_me:$LINENO: checking expat.h usability" >&5
+-echo $ECHO_N "checking expat.h usability... $ECHO_C" >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-#include <expat.h>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-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
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_header_compiler=yes
+-else
+-  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
+-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6; }
+-
+-# Is the header present?
+-{ echo "$as_me:$LINENO: checking expat.h presence" >&5
+-echo $ECHO_N "checking expat.h presence... $ECHO_C" >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <expat.h>
+-_ACEOF
+-if { (ac_try="$ac_cpp conftest.$ac_ext"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-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
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
+-  ac_header_preproc=yes
+-else
+-  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
+-{ 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: )
+-    { echo "$as_me:$LINENO: WARNING: expat.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: expat.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: expat.h: proceeding with the compiler's result" >&5
+-echo "$as_me: WARNING: expat.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { echo "$as_me:$LINENO: WARNING: expat.h: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: expat.h: present but cannot be compiled" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: expat.h:     check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: expat.h:     check for missing prerequisite headers?" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: expat.h: see the Autoconf documentation" >&5
+-echo "$as_me: WARNING: expat.h: see the Autoconf documentation" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: expat.h:     section \"Present But Cannot Be Compiled\"" >&5
+-echo "$as_me: WARNING: expat.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: expat.h: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: expat.h: proceeding with the preprocessor's result" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: expat.h: in the future, the compiler will take precedence" >&5
+-echo "$as_me: WARNING: expat.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## -------------------------------------------------------------------------- ##
+-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-games ##
+-## -------------------------------------------------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ echo "$as_me:$LINENO: checking for expat.h" >&5
+-echo $ECHO_N "checking for expat.h... $ECHO_C" >&6; }
+-if test "${ac_cv_header_expat_h+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_cv_header_expat_h=$ac_header_preproc
+-fi
+-{ echo "$as_me:$LINENO: result: $ac_cv_header_expat_h" >&5
+-echo "${ECHO_T}$ac_cv_header_expat_h" >&6; }
+-
+-fi
+-if test $ac_cv_header_expat_h = yes; then
+-  :
+-else
+-  { { echo "$as_me:$LINENO: error: cannot find expat.h header" >&5
+-echo "$as_me: error: cannot find expat.h header" >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+-
+-
+-
+-
+ # Check for PF_LOCAL/PF_UNIX
+ # ==========================
+ # There should be an autoconf macro to check this???
+@@ -31673,27 +30796,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -31729,17 +30835,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (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
+   echo "$as_me: failed program was:" >&5
+@@ -31848,27 +30947,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -31904,17 +30986,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (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
+   echo "$as_me: failed program was:" >&5
+@@ -32021,27 +31096,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_header_sys_wait_h=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -32084,10 +31142,10 @@
+ #ifndef __cplusplus
+   /* Ultrix mips cc rejects this.  */
+   typedef int charset[2];
+-  const charset x;
++  const charset cs;
+   /* SunOS 4.1.1 cc rejects this.  */
+-  char const *const *ccp;
+-  char **p;
++  char const *const *pcpcc;
++  char **ppc;
+   /* NEC SVR4.0.2 mips cc rejects this.  */
+   struct point {int x, y;};
+   static struct point const zero = {0,0};
+@@ -32096,11 +31154,11 @@
+      an arm of an if-expression whose if-part is not a constant
+      expression */
+   const char *g = "string";
+-  ccp = &g + (g ? g-g : 0);
++  pcpcc = &g + (g ? g-g : 0);
+   /* HPUX 7.0 cc rejects these. */
+-  ++ccp;
+-  p = (char**) ccp;
+-  ccp = (char const *const *) p;
++  ++pcpcc;
++  ppc = (char**) pcpcc;
++  pcpcc = (char const *const *) ppc;
+   { /* SCO 3.2v4 cc rejects this.  */
+     char *t;
+     char const *s = 0 ? (char *) 0 : (char const *) 0;
+@@ -32127,7 +31185,7 @@
+     const int foo = 10;
+     if (!foo) return 0;
+   }
+-  return !x[0] && !zero.x;
++  return !cs[0] && !zero.x;
+ #endif
+ 
+   ;
+@@ -32147,27 +31205,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_c_const=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -32224,27 +31265,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_c_volatile=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -32304,27 +31328,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -32360,17 +31367,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (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
+   echo "$as_me: failed program was:" >&5
+@@ -32448,7 +31448,7 @@
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-#if STDC_HEADERS || HAVE_STDLIB_H
++#if defined STDC_HEADERS || defined HAVE_STDLIB_H
+ # include <stdlib.h>
+ #else
+ char *realloc ();
+@@ -32624,27 +31624,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_header_stdbool_h=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -32694,27 +31677,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_type__Bool=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -32777,27 +31743,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_c_inline=$ac_kw
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -32867,27 +31816,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_type_size_t=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -32947,27 +31879,10 @@
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_header_time=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -33274,7 +32189,7 @@
+ 
+ 
+ 
+-ac_config_files="$ac_config_files gnome-games.spec Makefile po/Makefile.in dependencies/Makefile dependencies/libggz/Makefile dependencies/libggz/security/Makefile dependencies/ggzdmod/Makefile dependencies/ggzcore/Makefile dependencies/ggzmod/Makefile dependencies/ggzmod-ggz/Makefile dependencies/ggz-gtk/Makefile dependencies/gnuchess/Makefile libgames-support/Makefile blackjack/Makefile blackjack/data/Makefile blackjack/help/Makefile blackjack/help/C/Makefile blackjack/pixmaps/Makefile blackjack/src/Makefile gnect/Makefile gnect/src/Makefile gnect/data/Makefile gnect/data/gnect-client.dsc gnect/data/gnect-server.dsc gnect/pixmaps/Makefile gnect/help/Makefile gnomine/Makefile gnomine/help/Makefile gnomine/help/C/Makefile same-gnome/Makefile same-gnome/help/Makefile mahjongg/Makefile mahjongg/help/Makefile mahjongg/help/C/Makefile gtali/Makefile gtali/pix/Makefile gtali/help/Makefile gtali/help/C/Makefile gtali/help/da/Makefile iagno/Makefile iagno/iagno-client.dsc iagno/iagno-server.dsc iagno/sounds/Makefile iagno/help/Makefile iagno/help/C/Makefile gnotravex/Makefile gnotravex/help/Makefile gnotravex/help/C/Makefile gnotravex/pixmaps/Makefile gnotski/Makefile gnotski/help/Makefile gnotski/help/C/Makefile glines/Makefile glines/help/Makefile gnometris/Makefile gnometris/pix/Makefile gnometris/sounds/Makefile gnometris/help/Makefile gnometris/help/C/Makefile gnobots2/Makefile gnobots2/help/Makefile gnobots2/help/C/Makefile gnobots2/help/da/Makefile gnobots2/help/es/Makefile gnobots2/help/it/Makefile gnibbles/Makefile gnibbles/gnibbles-client.dsc gnibbles/gnibbles-server.dsc gnibbles/help/Makefile gnibbles/help/C/Makefile gnibbles/pix/Makefile gnibbles/sounds/Makefile aisleriot/Makefile aisleriot/rules/Makefile aisleriot/help/Makefile aisleriot/help/C/Makefile aisleriot/help/fr/Makefile glchess/Makefile glchess/data/Makefile glchess/glade/Makefile glchess/help/Makefile glchess/src/Makefile glchess/src/lib/Makefile glchess/src/lib/defaults.py glchess/src/lib/chess/Makefile glchess/src/lib/gtkui/Makefile glchess/src/lib/network/Makefile glchess/src/lib/scene/Makefile glchess/src/lib/scene/cairo/Makefile glchess/src/lib/scene/opengl/Makefile glchess/src/lib/ui/Makefile glchess/textures/Makefile gnome-sudoku/Makefile gnome-sudoku/src/Makefile gnome-sudoku/src/lib/Makefile gnome-sudoku/src/lib/defaults.py gnome-sudoku/src/lib/gtk_goodies/Makefile gnome-sudoku/data/Makefile gnome-sudoku/images/Makefile gnome-sudoku/glade/Makefile gnome-sudoku/help/Makefile gnome-sudoku/help/C/Makefile tests/Makefile tests/libgames-support/Makefile"
++ac_config_files="$ac_config_files gnome-games.spec Makefile po/Makefile.in dependencies/Makefile dependencies/gnuchess/Makefile libgames-support/Makefile blackjack/Makefile blackjack/data/Makefile blackjack/help/Makefile blackjack/help/C/Makefile blackjack/pixmaps/Makefile blackjack/src/Makefile gnect/Makefile gnect/src/Makefile gnect/data/Makefile gnect/data/gnect-client.dsc gnect/data/gnect-server.dsc gnect/pixmaps/Makefile gnect/help/Makefile gnomine/Makefile gnomine/help/Makefile gnomine/help/C/Makefile same-gnome/Makefile same-gnome/help/Makefile mahjongg/Makefile mahjongg/help/Makefile mahjongg/help/C/Makefile gtali/Makefile gtali/pix/Makefile gtali/help/Makefile gtali/help/C/Makefile gtali/help/da/Makefile iagno/Makefile iagno/iagno-client.dsc iagno/iagno-server.dsc iagno/sounds/Makefile iagno/help/Makefile iagno/help/C/Makefile gnotravex/Makefile gnotravex/help/Makefile gnotravex/help/C/Makefile gnotravex/pixmaps/Makefile gnotski/Makefile gnotski/help/Makefile gnotski/help/C/Makefile glines/Makefile glines/help/Makefile gnometris/Makefile gnometris/pix/Makefile gnometris/sounds/Makefile gnometris/help/Makefile gnometris/help/C/Makefile gnobots2/Makefile gnobots2/help/Makefile gnobots2/help/C/Makefile gnobots2/help/da/Makefile gnobots2/help/es/Makefile gnobots2/help/it/Makefile gnibbles/Makefile gnibbles/gnibbles-client.dsc gnibbles/gnibbles-server.dsc gnibbles/help/Makefile gnibbles/help/C/Makefile gnibbles/pix/Makefile gnibbles/sounds/Makefile aisleriot/Makefile aisleriot/rules/Makefile aisleriot/help/Makefile aisleriot/help/C/Makefile aisleriot/help/fr/Makefile glchess/Makefile glchess/data/Makefile glchess/glade/Makefile glchess/help/Makefile glchess/src/Makefile glchess/src/lib/Makefile glchess/src/lib/defaults.py glchess/src/lib/chess/Makefile glchess/src/lib/gtkui/Makefile glchess/src/lib/network/Makefile glchess/src/lib/scene/Makefile glchess/src/lib/scene/cairo/Makefile glchess/src/lib/scene/opengl/Makefile glchess/src/lib/ui/Makefile glchess/textures/Makefile gnome-sudoku/Makefile gnome-sudoku/src/Makefile gnome-sudoku/src/lib/Makefile gnome-sudoku/src/lib/defaults.py gnome-sudoku/src/lib/gtk_goodies/Makefile gnome-sudoku/data/Makefile gnome-sudoku/images/Makefile gnome-sudoku/glade/Makefile gnome-sudoku/help/Makefile gnome-sudoku/help/C/Makefile tests/Makefile tests/libgames-support/Makefile"
+ 
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+@@ -33453,6 +32368,27 @@
+ Usually this means the macro was only invoked conditionally." >&2;}
+    { (exit 1); exit 1; }; }
+ fi
++if test -z "${GGZ_CLIENT_TRUE}" && test -z "${GGZ_CLIENT_FALSE}"; then
++  { { echo "$as_me:$LINENO: error: conditional \"GGZ_CLIENT\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++echo "$as_me: error: conditional \"GGZ_CLIENT\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++if test -z "${GGZ_SERVER_TRUE}" && test -z "${GGZ_SERVER_FALSE}"; then
++  { { echo "$as_me:$LINENO: error: conditional \"GGZ_SERVER\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++echo "$as_me: error: conditional \"GGZ_SERVER\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++if test -z "${GGZ_GTK_TRUE}" && test -z "${GGZ_GTK_FALSE}"; then
++  { { echo "$as_me:$LINENO: error: conditional \"GGZ_GTK\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++echo "$as_me: error: conditional \"GGZ_GTK\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++   { (exit 1); exit 1; }; }
++fi
+ if test -z "${GGZ_SERVER_TRUE}" && test -z "${GGZ_SERVER_FALSE}"; then
+   { { echo "$as_me:$LINENO: error: conditional \"GGZ_SERVER\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+@@ -33488,13 +32424,6 @@
+ Usually this means the macro was only invoked conditionally." >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+-if test -z "${GGZ_GTK_TRUE}" && test -z "${GGZ_GTK_FALSE}"; then
+-  { { echo "$as_me:$LINENO: error: conditional \"GGZ_GTK\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&5
+-echo "$as_me: error: conditional \"GGZ_GTK\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+ if test -z "${INSTALL_GGZ_GTK_TRUE}" && test -z "${INSTALL_GGZ_GTK_FALSE}"; then
+   { { echo "$as_me:$LINENO: error: conditional \"INSTALL_GGZ_GTK\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+@@ -33502,13 +32431,6 @@
+ Usually this means the macro was only invoked conditionally." >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+-if test -z "${GGZ_CLIENT_TRUE}" && test -z "${GGZ_CLIENT_FALSE}"; then
+-  { { echo "$as_me:$LINENO: error: conditional \"GGZ_CLIENT\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&5
+-echo "$as_me: error: conditional \"GGZ_CLIENT\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+ if test -z "${PLATFORM_WIN32_TRUE}" && test -z "${PLATFORM_WIN32_FALSE}"; then
+   { { echo "$as_me:$LINENO: error: conditional \"PLATFORM_WIN32\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+@@ -33561,7 +32483,8 @@
+ ## M4sh Initialization.  ##
+ ## --------------------- ##
+ 
+-# Be Bourne compatible
++# Be more Bourne compatible
++DUALCASE=1; export DUALCASE # for MKS sh
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+   emulate sh
+   NULLCMD=:
+@@ -33570,10 +32493,13 @@
+   alias -g '${1+"$@"}'='"$@"'
+   setopt NO_GLOB_SUBST
+ else
+-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
++  case `(set -o) 2>/dev/null` in
++  *posix*) set -o posix ;;
++esac
++
+ fi
+-BIN_SH=xpg4; export BIN_SH # for Tru64
+-DUALCASE=1; export DUALCASE # for MKS sh
++
++
+ 
+ 
+ # PATH needs CR
+@@ -33797,19 +32723,28 @@
+   as_mkdir_p=false
+ fi
+ 
+-# Find out whether ``test -x'' works.  Don't use a zero-byte file, as
+-# systems may use methods other than mode bits to determine executability.
+-cat >conf$$.file <<_ASEOF
+-#! /bin/sh
+-exit 0
+-_ASEOF
+-chmod +x conf$$.file
+-if test -x conf$$.file >/dev/null 2>&1; then
+-  as_executable_p="test -x"
++if test -x / >/dev/null 2>&1; then
++  as_test_x='test -x'
+ else
+-  as_executable_p=:
++  if ls -dL / >/dev/null 2>&1; then
++    as_ls_L_option=L
++  else
++    as_ls_L_option=
++  fi
++  as_test_x='
++    eval sh -c '\''
++      if test -d "$1"; then
++        test -d "$1/.";
++      else
++	case $1 in
++        -*)set "./$1";;
++	esac;
++	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
++	???[sx]*):;;*)false;;esac;fi
++    '\'' sh
++  '
+ fi
+-rm -f conf$$.file
++as_executable_p=$as_test_x
+ 
+ # Sed expression to map a string onto a valid CPP name.
+ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+@@ -33825,7 +32760,7 @@
+ # values after options handling.
+ ac_log="
+ This file was extended by gnome-games $as_me 2.18.0.1, which was
+-generated by GNU Autoconf 2.60.  Invocation command line was
++generated by GNU Autoconf 2.61.  Invocation command line was
+ 
+   CONFIG_FILES    = $CONFIG_FILES
+   CONFIG_HEADERS  = $CONFIG_HEADERS
+@@ -33854,7 +32789,7 @@
+ Usage: $0 [OPTIONS] [FILE]...
+ 
+   -h, --help       print this help, then exit
+-  -V, --version    print version number, then exit
++  -V, --version    print version number and configuration settings, then exit
+   -q, --quiet      do not print progress messages
+   -d, --debug      don't remove temporary files
+       --recheck    update $as_me by reconfiguring in the same conditions
+@@ -33878,7 +32813,7 @@
+ cat >>$CONFIG_STATUS <<_ACEOF
+ ac_cs_version="\\
+ gnome-games config.status 2.18.0.1
+-configured by $0, generated by GNU Autoconf 2.60,
++configured by $0, generated by GNU Autoconf 2.61,
+   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+ 
+ Copyright (C) 2006 Free Software Foundation, Inc.
+@@ -34004,13 +32939,6 @@
+     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+     "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
+     "dependencies/Makefile") CONFIG_FILES="$CONFIG_FILES dependencies/Makefile" ;;
+-    "dependencies/libggz/Makefile") CONFIG_FILES="$CONFIG_FILES dependencies/libggz/Makefile" ;;
+-    "dependencies/libggz/security/Makefile") CONFIG_FILES="$CONFIG_FILES dependencies/libggz/security/Makefile" ;;
+-    "dependencies/ggzdmod/Makefile") CONFIG_FILES="$CONFIG_FILES dependencies/ggzdmod/Makefile" ;;
+-    "dependencies/ggzcore/Makefile") CONFIG_FILES="$CONFIG_FILES dependencies/ggzcore/Makefile" ;;
+-    "dependencies/ggzmod/Makefile") CONFIG_FILES="$CONFIG_FILES dependencies/ggzmod/Makefile" ;;
+-    "dependencies/ggzmod-ggz/Makefile") CONFIG_FILES="$CONFIG_FILES dependencies/ggzmod-ggz/Makefile" ;;
+-    "dependencies/ggz-gtk/Makefile") CONFIG_FILES="$CONFIG_FILES dependencies/ggz-gtk/Makefile" ;;
+     "dependencies/gnuchess/Makefile") CONFIG_FILES="$CONFIG_FILES dependencies/gnuchess/Makefile" ;;
+     "libgames-support/Makefile") CONFIG_FILES="$CONFIG_FILES libgames-support/Makefile" ;;
+     "blackjack/Makefile") CONFIG_FILES="$CONFIG_FILES blackjack/Makefile" ;;
+@@ -34383,25 +33311,25 @@
+ CAIRO_LIBS!$CAIRO_LIBS$ac_delim
+ GLADE_CFLAGS!$GLADE_CFLAGS$ac_delim
+ GLADE_LIBS!$GLADE_LIBS$ac_delim
++ggzcore_libraries!$ggzcore_libraries$ac_delim
++ggzcore_includes!$ggzcore_includes$ac_delim
++GGZCORE_INCLUDES!$GGZCORE_INCLUDES$ac_delim
++GGZCORE_LDFLAGS!$GGZCORE_LDFLAGS$ac_delim
++LIB_GGZCORE!$LIB_GGZCORE$ac_delim
+ libggz_libraries!$libggz_libraries$ac_delim
+ libggz_includes!$libggz_includes$ac_delim
+ LIBGGZ_INCLUDES!$LIBGGZ_INCLUDES$ac_delim
+ LIBGGZ_LDFLAGS!$LIBGGZ_LDFLAGS$ac_delim
+ LIB_GGZ!$LIB_GGZ$ac_delim
+-ggzdmod_libraries!$ggzdmod_libraries$ac_delim
+-ggzdmod_includes!$ggzdmod_includes$ac_delim
+-GGZDMOD_INCLUDES!$GGZDMOD_INCLUDES$ac_delim
+-GGZDMOD_LDFLAGS!$GGZDMOD_LDFLAGS$ac_delim
+-LIB_GGZDMOD!$LIB_GGZDMOD$ac_delim
+-GGZ_SERVER_TRUE!$GGZ_SERVER_TRUE$ac_delim
+-GGZ_SERVER_FALSE!$GGZ_SERVER_FALSE$ac_delim
+-LIB_ASYNC!$LIB_ASYNC$ac_delim
+-LDADD!$LDADD$ac_delim
+-LIB_GCRYPT!$LIB_GCRYPT$ac_delim
+-GGZTLS_INCLUDES!$GGZTLS_INCLUDES$ac_delim
+-GGZTLS_LDFLAGS!$GGZTLS_LDFLAGS$ac_delim
+-LIB_GGZTLS!$LIB_GGZTLS$ac_delim
+-INSTALL_LIBGGZ_TRUE!$INSTALL_LIBGGZ_TRUE$ac_delim
++ggzmod_libraries!$ggzmod_libraries$ac_delim
++ggzmod_includes!$ggzmod_includes$ac_delim
++GGZMOD_INCLUDES!$GGZMOD_INCLUDES$ac_delim
++GGZMOD_LDFLAGS!$GGZMOD_LDFLAGS$ac_delim
++LIB_GGZMOD!$LIB_GGZMOD$ac_delim
++GGZ_CONFIG!$GGZ_CONFIG$ac_delim
++ggzexecmoddir!$ggzexecmoddir$ac_delim
++ggzdatadir!$ggzdatadir$ac_delim
++ggz_config!$ggz_config$ac_delim
+ _ACEOF
+ 
+   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+@@ -34443,28 +33371,40 @@
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+   cat >conf$$subs.sed <<_ACEOF
++ggzmoduleconfdir!$ggzmoduleconfdir$ac_delim
++packagesrcdir!$packagesrcdir$ac_delim
++ggz_gtk_libraries!$ggz_gtk_libraries$ac_delim
++ggz_gtk_includes!$ggz_gtk_includes$ac_delim
++GGZ_GTK_INCLUDES!$GGZ_GTK_INCLUDES$ac_delim
++GGZ_GTK_LDFLAGS!$GGZ_GTK_LDFLAGS$ac_delim
++LIB_GGZ_GTK!$LIB_GGZ_GTK$ac_delim
++GGZ_CLIENT_TRUE!$GGZ_CLIENT_TRUE$ac_delim
++GGZ_CLIENT_FALSE!$GGZ_CLIENT_FALSE$ac_delim
++GGZ_SERVER_TRUE!$GGZ_SERVER_TRUE$ac_delim
++GGZ_SERVER_FALSE!$GGZ_SERVER_FALSE$ac_delim
++GGZ_GTK_TRUE!$GGZ_GTK_TRUE$ac_delim
++GGZ_GTK_FALSE!$GGZ_GTK_FALSE$ac_delim
++ggzdmod_libraries!$ggzdmod_libraries$ac_delim
++ggzdmod_includes!$ggzdmod_includes$ac_delim
++GGZDMOD_INCLUDES!$GGZDMOD_INCLUDES$ac_delim
++GGZDMOD_LDFLAGS!$GGZDMOD_LDFLAGS$ac_delim
++LIB_GGZDMOD!$LIB_GGZDMOD$ac_delim
++LIB_ASYNC!$LIB_ASYNC$ac_delim
++LDADD!$LDADD$ac_delim
++LIB_GCRYPT!$LIB_GCRYPT$ac_delim
++GGZTLS_INCLUDES!$GGZTLS_INCLUDES$ac_delim
++GGZTLS_LDFLAGS!$GGZTLS_LDFLAGS$ac_delim
++LIB_GGZTLS!$LIB_GGZTLS$ac_delim
++INSTALL_LIBGGZ_TRUE!$INSTALL_LIBGGZ_TRUE$ac_delim
+ INSTALL_LIBGGZ_FALSE!$INSTALL_LIBGGZ_FALSE$ac_delim
+ INSTALL_GGZDMOD_TRUE!$INSTALL_GGZDMOD_TRUE$ac_delim
+ INSTALL_GGZDMOD_FALSE!$INSTALL_GGZDMOD_FALSE$ac_delim
+-GGZMOD_INCLUDES!$GGZMOD_INCLUDES$ac_delim
+-GGZMOD_LDFLAGS!$GGZMOD_LDFLAGS$ac_delim
+-LIB_GGZMOD!$LIB_GGZMOD$ac_delim
+ INSTALL_GGZMOD_TRUE!$INSTALL_GGZMOD_TRUE$ac_delim
+ INSTALL_GGZMOD_FALSE!$INSTALL_GGZMOD_FALSE$ac_delim
+-GGZCORE_INCLUDES!$GGZCORE_INCLUDES$ac_delim
+-GGZCORE_LDFLAGS!$GGZCORE_LDFLAGS$ac_delim
+-LIB_GGZCORE!$LIB_GGZCORE$ac_delim
+ INSTALL_GGZCORE_TRUE!$INSTALL_GGZCORE_TRUE$ac_delim
+ INSTALL_GGZCORE_FALSE!$INSTALL_GGZCORE_FALSE$ac_delim
+-GGZ_GTK_INCLUDES!$GGZ_GTK_INCLUDES$ac_delim
+-GGZ_GTK_LDFLAGS!$GGZ_GTK_LDFLAGS$ac_delim
+-LIB_GGZ_GTK!$LIB_GGZ_GTK$ac_delim
+-GGZ_GTK_TRUE!$GGZ_GTK_TRUE$ac_delim
+-GGZ_GTK_FALSE!$GGZ_GTK_FALSE$ac_delim
+ INSTALL_GGZ_GTK_TRUE!$INSTALL_GGZ_GTK_TRUE$ac_delim
+ INSTALL_GGZ_GTK_FALSE!$INSTALL_GGZ_GTK_FALSE$ac_delim
+-GGZ_CLIENT_TRUE!$GGZ_CLIENT_TRUE$ac_delim
+-GGZ_CLIENT_FALSE!$GGZ_CLIENT_FALSE$ac_delim
+ GNOME_GAMES_CXXFLAGS!$GNOME_GAMES_CXXFLAGS$ac_delim
+ ESD_CFLAGS!$ESD_CFLAGS$ac_delim
+ ESD_LIBS!$ESD_LIBS$ac_delim
+@@ -34483,7 +33423,6 @@
+ PO_IN_DATADIR_FALSE!$PO_IN_DATADIR_FALSE$ac_delim
+ POFILES!$POFILES$ac_delim
+ POSUB!$POSUB$ac_delim
+-LIBEXPAT!$LIBEXPAT$ac_delim
+ LIBOBJS!$LIBOBJS$ac_delim
+ PLATFORM_WIN32_TRUE!$PLATFORM_WIN32_TRUE$ac_delim
+ PLATFORM_WIN32_FALSE!$PLATFORM_WIN32_FALSE$ac_delim
+@@ -34504,7 +33443,7 @@
+ LTLIBOBJS!$LTLIBOBJS$ac_delim
+ _ACEOF
+ 
+-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 59; then
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 70; then
+     break
+   elif $ac_last_try; then
+     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

Added: desktop/experimental/gnome-games/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-games/debian/patches/series?rev=9565&op=file
==============================================================================
--- desktop/experimental/gnome-games/debian/patches/series (added)
+++ desktop/experimental/gnome-games/debian/patches/series Sat Apr  7 16:25:01 2007
@@ -1,0 +1,4 @@
+01_ggz.patch
+02_desktop-path.patch
+03_dont_build_ggz.patch
+99_reautoconf.patch

Added: desktop/experimental/gnome-games/debian/pixmaps/glchess.xpm
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-games/debian/pixmaps/glchess.xpm?rev=9565&op=file
==============================================================================
--- desktop/experimental/gnome-games/debian/pixmaps/glchess.xpm (added)
+++ desktop/experimental/gnome-games/debian/pixmaps/glchess.xpm Sat Apr  7 16:25:01 2007
@@ -1,0 +1,116 @@
+/* XPM */
+static char *glchess[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 78 1",
+"  c #000000",
+". c #0C0C0C",
+"X c #121212",
+"o c #1B1B1B",
+"O c #2C2C2C",
+"+ c #2F3030",
+"@ c #333333",
+"# c #353B3D",
+"$ c #3C3D3C",
+"% c #3F403F",
+"& c #3D4344",
+"* c #424545",
+"= c #414748",
+"- c #434849",
+"; c #4C4E4E",
+": c #4B4F50",
+"> c #4C5051",
+", c #535656",
+"< c #525758",
+"1 c #54595A",
+"2 c #595C5C",
+"3 c #5A5F60",
+"4 c #5E6161",
+"5 c #66655E",
+"6 c #666766",
+"7 c #676B6B",
+"8 c #696D6D",
+"9 c #6B706E",
+"0 c #6D7271",
+"q c #71726E",
+"w c #747574",
+"e c #757872",
+"r c #797A76",
+"t c #7B7E7A",
+"y c #7E827E",
+"u c #7D8280",
+"i c #827C76",
+"p c #858683",
+"a c #878983",
+"s c #8A8B86",
+"d c #8C8E89",
+"f c #8E918E",
+"g c #91928D",
+"h c #949691",
+"j c #969894",
+"k c #999B96",
+"l c #9C9E9A",
+"z c #A0A29D",
+"x c #A4A6A3",
+"c c #A6A9A5",
+"v c #A9AAA7",
+"b c #ABADA9",
+"n c #AEB0AC",
+"m c #B1B3AF",
+"M c #B4B5B2",
+"N c #B9BBB6",
+"B c #BBBDB8",
+"V c #BFC0BC",
+"C c #C1C2BF",
+"Z c #C4C6C2",
+"A c #C6C8C4",
+"S c #CACDC7",
+"D c #CDCECB",
+"F c #CFD1CC",
+"G c #D2D5CE",
+"H c #D5D6D3",
+"J c #D6D9D2",
+"K c #D9DCD5",
+"L c #DCDFDA",
+"P c #DEE1DB",
+"I c #E1E3DE",
+"U c #E4E6E2",
+"Y c #E7E8E4",
+"T c #E9EAE7",
+"R c #EDEEEB",
+"E c #F2F2F0",
+"W c gray100",
+"Q c None",
+/* pixels */
+"QQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQ",
+"QQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQ",
+"QQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQ",
+"QQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQ",
+"QQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQ",
+"QQQQQQQQQQQQQQQQQQrskkkgtQQQQQQQ",
+"QQQQQQQQQQQQQQQQQ8gMKLKClsQQQQQQ",
+"QQQQQQQQQQQQQQQQQaMUUKJLZjQQQQQQ",
+"QQQQQQQQQQQQQQQQQkKTIKGJLnqQQQQQ",
+"QQQQQQQQQQQQQQQQQkIUIKGGLmqQQQQQ",
+"QQQQQQQQQQQQQQQQQkIIIJGGLmqQQQQQ",
+"QQQQQQQQQQQQQQQQQgCTIJGKGz5QQQQQ",
+"QQQQQQQQQQQQQQQQQelAIIIGvaQQQQQQ",
+"QQQQQQQQQQQQQQQQQQahbBmkaQQQQQQQ",
+"QQQQQQQQQQQQQQQQQQQelNcaQQQQQQQQ",
+"QQQQQQQQQQQQQQQQQQQ;dmjeQQQQQQQQ",
+"QQQQOOOOOOOOOOOO+OO$kUN,O++ at QQQQ",
+"QQQQ+8xcxcxcxxx7;;;2VPF9:;%OQQQQ",
+"QQQQ at cRTUUIIPPPy&->gUPPb2>,+QQQQ",
+"QQQ 1CTUPPPPKKJy->yHYKJPj21%.QQQ",
+"QQQXwPTYUPPPKKKy>eSTYKGPKg7-oQQQ",
+"QQQ at 4t000000009fjnTYYKGFLZlwOQQQ",
+"QQQ%<&###&##&##xVATYUKGHHKmM%QQQ",
+"QQO-2-&-&-&-&&&cBVTTYKGHKHmH,oQQ",
+"QQ at 22:>>:>::::>bScAPYULLSbCUpOQQ",
+"  @331<11<<<1>>nPZbvbvbbbZUEbO  ",
+" .-w09888878777BYUUHFDHHURREF1  ",
+" o$;>>::;>>;>>;6wwwwwwrrwrrwq-X ",
+" ooX............             oo ",
+"QQQ                          QQQ",
+"QQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQ",
+"QQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQ"
+};

Added: desktop/experimental/gnome-games/debian/pixmaps/gnome-sudoku.xpm
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-games/debian/pixmaps/gnome-sudoku.xpm?rev=9565&op=file
==============================================================================
--- desktop/experimental/gnome-games/debian/pixmaps/gnome-sudoku.xpm (added)
+++ desktop/experimental/gnome-games/debian/pixmaps/gnome-sudoku.xpm Sat Apr  7 16:25:01 2007
@@ -1,0 +1,270 @@
+/* XPM */
+static char *gnome-sudoku[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 232 2",
+"   c black",
+".  c #0B1505",
+"X  c #2E2B19",
+"o  c #282A22",
+"O  c #7F6633",
+"+  c #4D5257",
+"@  c #565A52",
+"#  c #5B6166",
+"$  c #63686E",
+"%  c #6D6F6A",
+"&  c #71746E",
+"*  c #7A786C",
+"=  c #777770",
+"-  c #72797F",
+";  c #7A7F79",
+":  c #557EB1",
+">  c #667D9B",
+",  c #747B82",
+"<  c #7C807B",
+"1  c #7C937D",
+"2  c #7B838A",
+"3  c #738597",
+"4  c #6784A8",
+"5  c #688CB9",
+"6  c #6D90BC",
+"7  c #758DAA",
+"8  c #7592B6",
+"9  c #7493BB",
+"0  c #7996BB",
+"q  c #7C9ABF",
+"w  c #7596C0",
+"e  c #7798C1",
+"r  c #7C9AC1",
+"t  c #A32C04",
+"y  c #BF231C",
+"u  c #8F5100",
+"i  c #8D5C04",
+"p  c #95470B",
+"a  c #945300",
+"s  c #905E00",
+"d  c #8E6400",
+"f  c #97660B",
+"g  c #826B2D",
+"h  c #8B7434",
+"j  c #8E733B",
+"k  c #AE4E07",
+"l  c #AC5A0A",
+"z  c #A16C16",
+"x  c #A5741D",
+"c  c #A37D69",
+"v  c #E22C21",
+"b  c #FA4A4D",
+"n  c #E1724D",
+"m  c #9F8121",
+"M  c #97813B",
+"N  c #B18F0B",
+"B  c #B6940B",
+"V  c #BB9A06",
+"C  c #A98A35",
+"Z  c #AE8E3F",
+"A  c #9C8652",
+"S  c #82837E",
+"D  c #918668",
+"F  c #948D75",
+"G  c #A0894D",
+"H  c #A48759",
+"J  c #A28C51",
+"K  c #A08C59",
+"L  c #AD9241",
+"P  c #A79155",
+"I  c #B5955F",
+"U  c #B49A57",
+"Y  c #B99F60",
+"T  c #B9A05F",
+"R  c #BCA160",
+"E  c #B0A07D",
+"W  c #C1A101",
+"Q  c #CDB41B",
+"!  c #D4B700",
+"~  c #D5B900",
+"^  c #D9BE00",
+"/  c #D19B68",
+"(  c #C1AC5E",
+")  c #C1AA7A",
+"_  c #C1B562",
+"`  c #D0BB66",
+"'  c #D2B969",
+"]  c #D5BF70",
+"[  c #DCC200",
+"{  c #E7CF05",
+"}  c #E8D007",
+"|  c #EBD30C",
+" . c #EDD611",
+".. c #EEDC3A",
+"X. c #F1DD31",
+"o. c #F2DF3B",
+"O. c #D6C071",
+"+. c #DCD376",
+"@. c #F2E043",
+"#. c #F5E76E",
+"$. c #F5E874",
+"%. c #F6E97B",
+"&. c #858682",
+"*. c #878A84",
+"=. c #898B86",
+"-. c #8C8E8A",
+";. c #838C95",
+":. c #8E918C",
+">. c #8B949D",
+",. c #939286",
+"<. c #91928D",
+"1. c #9B9380",
+"2. c #9D9788",
+"3. c #949591",
+"4. c #979995",
+"5. c #999A95",
+"6. c #9D9E9A",
+"7. c #838FA5",
+"8. c #8794A4",
+"9. c #8997A0",
+"0. c #829BBB",
+"q. c #889DB4",
+"w. c #919AA4",
+"e. c #9EA09C",
+"r. c #87A0BF",
+"t. c #88A0BD",
+"y. c #9AA4AE",
+"u. c #93A6BE",
+"i. c #9CA6B1",
+"p. c #9CABBC",
+"a. c #A49E8B",
+"s. c #A89F86",
+"d. c #BC898C",
+"f. c #A2A39F",
+"g. c #B0A489",
+"h. c #B4A98D",
+"j. c #BCB196",
+"k. c #A4A5A2",
+"l. c #A4A7A8",
+"z. c #A7A9A5",
+"x. c #A4A9AC",
+"c. c #A8A9A6",
+"v. c #ABACA9",
+"b. c #A2ABB5",
+"n. c #A3AEBB",
+"m. c #AAAEB0",
+"M. c #ACB0B0",
+"N. c #B3B5B2",
+"B. c #B7B8B5",
+"V. c #B9BAB6",
+"C. c #BCBDBA",
+"Z. c #819EC3",
+"A. c #86A2C6",
+"S. c #86A4CA",
+"D. c #89A4C7",
+"F. c #89A5C9",
+"G. c #8EA9CB",
+"H. c #93A9C6",
+"J. c #93ADCC",
+"K. c #9FAFC1",
+"L. c #97B0CF",
+"P. c #99B1CF",
+"I. c #96B0D1",
+"U. c #9BB4D2",
+"Y. c #A3B1C3",
+"T. c #A3B6CE",
+"R. c #AAB5C2",
+"E. c #AEB9C5",
+"W. c #AEBBC8",
+"Q. c #A1B7D2",
+"!. c #A5BBD5",
+"~. c #A6BDD9",
+"^. c #AABDD4",
+"/. c #A9BED8",
+"(. c #B0BBC6",
+"). c #B3BEC9",
+"_. c #B0BED0",
+"`. c #AFC0D5",
+"'. c #ADC1DA",
+"]. c #B6C1CD",
+"[. c #BDC2C6",
+"{. c #B9C3CE",
+"}. c #B2C2D5",
+"|. c #B3C5DB",
+" X c #B7C9DE",
+".X c #B9C5D4",
+"XX c #BDC9D6",
+"oX c #BAC9DC",
+"OX c #BBCCE0",
+"+X c #C6B9A9",
+"@X c #CBBCA0",
+"#X c #E69C9B",
+"$X c #F1A088",
+"%X c #D7C880",
+"&X c #DEDA91",
+"*X c #C6C0A0",
+"=X c #C1C1BE",
+"-X c #EBDF8C",
+";X c #EFE084",
+":X c #EFE28E",
+">X c #F0E28A",
+",X c #C3C4C2",
+"<X c #C7C7C8",
+"1X c #C7C8CA",
+"2X c #C8C9C7",
+"3X c #CBCCCC",
+"4X c #C1CEDC",
+"5X c #CBCED1",
+"6X c #C5D1DF",
+"7X c #CDD0D4",
+"8X c #C9D1DB",
+"9X c #D0D0CD",
+"0X c #DFD5C5",
+"qX c #D3D4D4",
+"wX c #D5D7D9",
+"eX c #D6D8DB",
+"rX c #D8D8D7",
+"tX c #DCDCDC",
+"yX c #C5D3E2",
+"uX c #CBD6E2",
+"iX c #CBD8E6",
+"pX c #CEDBE9",
+"aX c #D4DAE0",
+"sX c #D1DDEA",
+"dX c #DBDFE4",
+"fX c #E4E4E4",
+"gX c #E6EAEE",
+"hX c #EBEBEA",
+"jX c #F3F3F3",
+"kX c #FAFDF7",
+"lX c #FEFEFE",
+"zX c None",
+/* pixels */
+"zXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzX",
+"zXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzX",
+"zXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzX",
+"zXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzX",
+"zXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzX",
+"zXzXzXzXzX&.:.6.e.f.f.f.z.f.z.z.z.f.f.e.6.e.e.f.6.<.&.zXzXzXzXzX",
+"zXzXzXzXzX=.N.tXfXfXfXhXhXhXhXhXhXhXhXhXhXhXhXfXfXV.-.zXzXzXzXzX",
+"zXzXzXzXzX4.9X!.A.D.S.A.D.D.D.S.F.D.F.F.F.D.A.A.!.wX5.zXzXzXzXzX",
+"zXzXzXzXX f.eXr U.'.'.|.~.I.|.|.OX'.U./.OXOXOX'.A.eXc.  zXzXzXzX",
+"zXzXzXzX&.C.uXA.OXW.;.oX'.S.OXn.i.pXJ.~.pXpXiXoXF.yX=XS zXzXzXzX",
+"zXzXzXzX:.9XoXF.yXn.;.].'.G.pXn.w.iXJ.U.pXpXiXiXJ.|.9X:.zXzXzXzX",
+"i z x f 2.tX'.G.pXW.>.].!.P..X$ , ].I.U.sXpXpXiXU.Q.tXc.. zXzXzX",
+"l n $X/ I @XH.S.I.G.D.L.e 9 H.0.A.J.9 w U.J.L.L.J.H.fXB.& zXzXzX",
+"k v b #X+X) A ,.H.I.I.I.w w J.q 0.J.e 6 J.J.J.J.Q.Z.dX,X:.zXzXzX",
+"a t y d. at X;X:X' T j.5XpXG.U.pXy.- {.Q.G.uXuXuXuXyXr 8XtX6.zXzXzX",
+"s a p c (  . at .%.:X' T h.q.!.iXE., b.!.S.4XyXyXuXOXS._.fXv.* zXzX",
+"zXu j H Z W [ | @.$.:X] P s.N.y.>.W.'.A.yX6X6XyXoXU.H.fX,X*.zXzX",
+"zXzX,.2X0XD m V ^ | o.$.:X] Y F 7 0 5 : 6 9 9 9 9 I.q tX9X<.zXzX",
+"zX@ f.rXgXq n.E C V ! } X.#.:X` P m.P.9 W.Y.9.p.`.`.q 7XwXc.o zX",
+"zX& M.fXuXA.`.yX[.g.C B ! { ..-X+.U M.q |.2 >., ].}.D.].tXN.% zX",
+"zXS B.hX.XA.|.yXyXXX[.s.j N Q +.&XR A 3 ].2 ;.+ b..XH.Y.tXC.-.zX",
+"zX3.2XhXT.F.6X4XXX.X}.Y.> 1.G L L M g O c.i.;.# i.4XI.H.9X3X4.zX",
+"zX4.rXfXH.J.4X4X4X.X].p.> R.b.c.x.f.a.* 5.;.- , (.XXQ.q.3XqXf.zX",
+"< f.tXeX0.J.^.!.^.^.!.Q.H.^.^.^.^.`.'.J.'.}.|.oX X.X!.0 [.9Xv.; ",
+"&.N.tXeX0.0 0 0 0 0 0 0 9 8 9 9 8 8 8 8 0 8 8 8 8 8 8 8 ,X9X+X*.",
+"=.C.tXtXeXeXeXwXwXqXqXqX7X5X5X5X5X5X5X5X5X3X3X3X3X5X3X5X5XrX,X;.",
+":.z.C.C.=X,X,X=X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,XB.3.",
+"-.4.f.c.c.c.c.v.c.c.z.z.z.z.k.k.f.k.f.k.k.k.k.c.z.z.c.c.v.l.6.6.",
+"zXzXlXlXlXkXjXfXfXtXeXwX3X3X<X3X<X<X1X3X9XwXeXtXfXhXjXlXlXlXzXzX",
+"zXzXzXzXzXlXkXjXhXhXhXfXfXfXfXfXfXfXfXfXfXhXhXhXjXjXlXlXzXzXzXzX",
+"zXzXzXzXzXzXzXzXzXzXzXzXzXzXlXlXlXlXlXzXzXzXzXzXzXzXzXzXzXzXzXzX",
+"zXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzX"
+};

Added: desktop/experimental/gnome-games/debian/pyversions
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-games/debian/pyversions?rev=9565&op=file
==============================================================================
--- desktop/experimental/gnome-games/debian/pyversions (added)
+++ desktop/experimental/gnome-games/debian/pyversions Sat Apr  7 16:25:01 2007
@@ -1,0 +1,1 @@
+2.4-

Modified: desktop/experimental/gnome-games/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-games/debian/rules?rev=9565&op=diff
==============================================================================
--- desktop/experimental/gnome-games/debian/rules (original)
+++ desktop/experimental/gnome-games/debian/rules Sat Apr  7 16:25:01 2007
@@ -8,7 +8,10 @@
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
-DEB_CONFIGURE_EXTRA_FLAGS := --bindir=\$${prefix}/games
+DEB_CONFIGURE_EXTRA_FLAGS := --bindir=\$${prefix}/games \
+		--disable-gnuchess --with-tls=GnuTLS \
+		--with-ggzconfig=/usr/bin \
+		--disable-scrollkeeper
 DEB_DH_FIXPERMS_ARGS := -X/usr/games
 DEB_DH_MAKESHLIBS_ARGS_gnome-games := --no-act
 DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,-O1 -Wl,--as-needed"
@@ -17,4 +20,7 @@
 	chmod u+w debian/gnome-games/usr/games/*
 
 binary-post-install/gnome-games-data::
-	dh_python -pgnome-games-data
+	dh_pysupport -pgnome-games-data
+
+binary-post-install/gnome-games::
+	dh_pysupport -pgnome-games




More information about the pkg-gnome-commits mailing list