[SCM] Civilization turn-based strategy game branch, master, updated. debian/2.1.9-1-4-g436e504
Clint Adams
schizo at debian.org
Wed Nov 4 17:06:29 UTC 2009
The following commit has been merged in the master branch:
commit 63ac6af69dc5d8832cc5b162d6a2d0aa1689f3f3
Author: Clint Adams <schizo at debian.org>
Date: Wed Feb 18 20:51:30 2009 -0500
2.1.8 without ggz
diff --git a/debian/changelog b/debian/changelog
index e70d828..922d8c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+freeciv (2.1.8-1) unstable; urgency=low
+
+ * New upstream release. closes: #495740.
+ * Disable GGZ support (can be re-enabled when ggz 1.0 is available).
+ * Change maintainer to Debian Games Team.
+
+ -- Clint Adams <schizo at debian.org> Sat, 29 Nov 2008 22:25:59 -0500
+
freeciv (2.1.5-3) unstable; urgency=low
* Change maintainer to Debian Games Team.
diff --git a/debian/freeciv-server.install b/debian/freeciv-server.install
index 2e1557d..5697e36 100644
--- a/debian/freeciv-server.install
+++ b/debian/freeciv-server.install
@@ -1,4 +1,2 @@
debian/tmp/usr/games/civserver
debian/tmp/usr/share/man/man6/civserver.6
-debian/tmp/etc/ggzd/rooms/civserver.room
-debian/tmp/etc/ggzd/games/civserver.dsc
diff --git a/debian/patches/99_build_without_ggzd.diff b/debian/patches/99_build_without_ggzd.diff
index fb14118..638bd15 100644
--- a/debian/patches/99_build_without_ggzd.diff
+++ b/debian/patches/99_build_without_ggzd.diff
@@ -1,33734 +1,3 @@
-diff -Nuar freeciv-2.1.5.orig/aclocal.m4 freeciv-2.1.5/aclocal.m4
---- freeciv-2.1.5.orig/aclocal.m4 2008-06-16 09:56:23.000000000 +0200
-+++ freeciv-2.1.5/aclocal.m4 2008-06-26 19:56:57.000000000 +0200
-@@ -1,7 +1,7 @@
--# aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*-
-+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
-
--# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
--# Free Software Foundation, Inc.
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-+# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -11,385 +11,57 @@
- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- # PARTICULAR PURPOSE.
-
--# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*-
--
--# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
--
--AC_PREREQ([2.52])
--
--# serial 6
--
--# When config.status generates a header, we must update the stamp-h file.
--# This file resides in the same directory as the config header
--# that is generated. We must strip everything past the first ":",
--# and everything past the last "/".
--
--# _AM_DIRNAME(PATH)
--# -----------------
--# Like AS_DIRNAME, only do it during macro expansion
--AC_DEFUN([_AM_DIRNAME],
-- [m4_if(regexp([$1], [^.*[^/]//*[^/][^/]*/*$]), -1,
-- m4_if(regexp([$1], [^//\([^/]\|$\)]), -1,
-- m4_if(regexp([$1], [^/.*]), -1,
-- [.],
-- patsubst([$1], [^\(/\).*], [\1])),
-- patsubst([$1], [^\(//\)\([^/].*\|$\)], [\1])),
-- patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl
--])# _AM_DIRNAME
--
--
--# The stamp files are numbered to have different names.
--# We could number them on a directory basis, but that's additional
--# complications, let's have a unique counter.
--m4_define([_AM_STAMP_Count], [0])
--
--
--# _AM_STAMP(HEADER)
--# -----------------
--# The name of the stamp file for HEADER.
--AC_DEFUN([_AM_STAMP],
--[m4_define([_AM_STAMP_Count], m4_incr(_AM_STAMP_Count))dnl
--AS_ESCAPE(_AM_DIRNAME(patsubst([$1],
-- [:.*])))/stamp-h[]_AM_STAMP_Count])
--
--
--# _AM_CONFIG_HEADER(HEADER[:SOURCES], COMMANDS, INIT-COMMANDS)
--# ------------------------------------------------------------
--# We used to try to get a real timestamp in stamp-h. But the fear is that
--# that will cause unnecessary cvs conflicts.
--AC_DEFUN([_AM_CONFIG_HEADER],
--[# Add the stamp file to the list of files AC keeps track of,
--# along with our hook.
--AC_CONFIG_HEADERS([$1],
-- [# update the timestamp
--echo 'timestamp for $1' >"_AM_STAMP([$1])"
--$2],
-- [$3])
--])# _AM_CONFIG_HEADER
--
--
--# AM_CONFIG_HEADER(HEADER[:SOURCES]..., COMMANDS, INIT-COMMANDS)
--# --------------------------------------------------------------
--AC_DEFUN([AM_CONFIG_HEADER],
--[AC_FOREACH([_AM_File], [$1], [_AM_CONFIG_HEADER(_AM_File, [$2], [$3])])
--])# AM_CONFIG_HEADER
--
--# Do all the work for Automake. -*- Autoconf -*-
--
--# This macro actually does too much some checks are only needed if
--# your package does certain things. But this isn't really a big deal.
--
--# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
--# Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
--
--# serial 8
--
--# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
--# written in clear, in which case automake, when reading aclocal.m4,
--# will think it sees a *use*, and therefore will trigger all it's
--# C support machinery. Also note that it means that autoscan, seeing
--# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
--
--
--AC_PREREQ([2.52])
--
--# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow
--# the ones we care about.
--m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
--
--# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
--# AM_INIT_AUTOMAKE([OPTIONS])
--# -----------------------------------------------
--# The call with PACKAGE and VERSION arguments is the old style
--# call (pre autoconf-2.50), which is being phased out. PACKAGE
--# and VERSION should now be passed to AC_INIT and removed from
--# the call to AM_INIT_AUTOMAKE.
--# We support both call styles for the transition. After
--# the next Automake release, Autoconf can make the AC_INIT
--# arguments mandatory, and then we can depend on a new Autoconf
--# release and drop the old call support.
--AC_DEFUN([AM_INIT_AUTOMAKE],
--[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-- AC_REQUIRE([AC_PROG_INSTALL])dnl
--# test to see if srcdir already configured
--if test "`cd $srcdir && pwd`" != "`pwd`" &&
-- test -f $srcdir/config.status; then
-- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
--fi
--
--# Define the identity of the package.
--dnl Distinguish between old-style and new-style calls.
--m4_ifval([$2],
--[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
-- AC_SUBST([PACKAGE], [$1])dnl
-- AC_SUBST([VERSION], [$2])],
--[_AM_SET_OPTIONS([$1])dnl
-- AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME])dnl
-- AC_SUBST([VERSION], [AC_PACKAGE_VERSION])])dnl
--
--_AM_IF_OPTION([no-define],,
--[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
--
--# Some tools Automake needs.
--AC_REQUIRE([AM_SANITY_CHECK])dnl
--AC_REQUIRE([AC_ARG_PROGRAM])dnl
--AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
--AM_MISSING_PROG(AUTOCONF, autoconf)
--AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
--AM_MISSING_PROG(AUTOHEADER, autoheader)
--AM_MISSING_PROG(MAKEINFO, makeinfo)
--AM_MISSING_PROG(AMTAR, tar)
--AM_PROG_INSTALL_SH
--AM_PROG_INSTALL_STRIP
--# We need awk for the "check" target. The system "awk" is bad on
--# some platforms.
--AC_REQUIRE([AC_PROG_AWK])dnl
--AC_REQUIRE([AC_PROG_MAKE_SET])dnl
--
--_AM_IF_OPTION([no-dependencies],,
--[AC_PROVIDE_IFELSE([AC_PROG_][CC],
-- [_AM_DEPENDENCIES(CC)],
-- [define([AC_PROG_][CC],
-- defn([AC_PROG_][CC])[_AM_DEPENDENCIES(CC)])])dnl
--AC_PROVIDE_IFELSE([AC_PROG_][CXX],
-- [_AM_DEPENDENCIES(CXX)],
-- [define([AC_PROG_][CXX],
-- defn([AC_PROG_][CXX])[_AM_DEPENDENCIES(CXX)])])dnl
--])
--])
--
--# Copyright 2002 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
-+m4_ifndef([AC_AUTOCONF_VERSION],
-+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-+m4_if(AC_AUTOCONF_VERSION, [2.61],,
-+[m4_warning([this file was generated for autoconf 2.61.
-+You have another version of autoconf. It may work, but is not guaranteed to.
-+If you have problems, you may need to regenerate the build system entirely.
-+To do so, use the procedure documented by the package, typically `autoreconf'.])])
-
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
- # AM_AUTOMAKE_VERSION(VERSION)
- # ----------------------------
- # Automake X.Y traces this macro to ensure aclocal.m4 has been
- # generated from the m4 files accompanying Automake X.Y.
--AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.6"])
-+# (This private macro should not be called outside this file.)
-+AC_DEFUN([AM_AUTOMAKE_VERSION],
-+[am__api_version='1.10'
-+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
-+dnl require some minimum version. Point them to the right macro.
-+m4_if([$1], [1.10.1], [],
-+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
-+])
-+
-+# _AM_AUTOCONF_VERSION(VERSION)
-+# -----------------------------
-+# aclocal traces this macro to find the Autoconf version.
-+# This is a private macro too. Using m4_define simplifies
-+# the logic in aclocal, which can simply ignore this definition.
-+m4_define([_AM_AUTOCONF_VERSION], [])
-
- # AM_SET_CURRENT_AUTOMAKE_VERSION
- # -------------------------------
--# Call AM_AUTOMAKE_VERSION so it can be traced.
-+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
- # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-- [AM_AUTOMAKE_VERSION([1.6.3])])
--
--# Helper functions for option handling. -*- Autoconf -*-
--
--# Copyright 2001, 2002 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
--
--# serial 2
--
--# _AM_MANGLE_OPTION(NAME)
--# -----------------------
--AC_DEFUN([_AM_MANGLE_OPTION],
--[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
--
--# _AM_SET_OPTION(NAME)
--# ------------------------------
--# Set option NAME. Presently that only means defining a flag for this option.
--AC_DEFUN([_AM_SET_OPTION],
--[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
--
--# _AM_SET_OPTIONS(OPTIONS)
--# ----------------------------------
--# OPTIONS is a space-separated list of Automake options.
--AC_DEFUN([_AM_SET_OPTIONS],
--[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-+[AM_AUTOMAKE_VERSION([1.10.1])dnl
-+m4_ifndef([AC_AUTOCONF_VERSION],
-+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-+_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
-
--# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
--# -------------------------------------------
--# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
--AC_DEFUN([_AM_IF_OPTION],
--[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-+# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-
-+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
- #
--# Check to make sure that the build environment is sane.
--#
--
--# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
--
--# serial 3
--
--# AM_SANITY_CHECK
--# ---------------
--AC_DEFUN([AM_SANITY_CHECK],
--[AC_MSG_CHECKING([whether build environment is sane])
--# Just in case
--sleep 1
--echo timestamp > conftest.file
--# Do `set' in a subshell so we don't clobber the current shell's
--# arguments. Must try -L first in case configure is actually a
--# symlink; some systems play weird games with the mod time of symlinks
--# (eg FreeBSD returns the mod time of the symlink's containing
--# directory).
--if (
-- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-- if test "$[*]" = "X"; then
-- # -L didn't work.
-- set X `ls -t $srcdir/configure conftest.file`
-- fi
-- rm -f conftest.file
-- if test "$[*]" != "X $srcdir/configure conftest.file" \
-- && test "$[*]" != "X conftest.file $srcdir/configure"; then
--
-- # If neither matched, then we have a broken ls. This can happen
-- # if, for instance, CONFIG_SHELL is bash and it inherits a
-- # broken ls alias from the environment. This has actually
-- # happened. Such a system could not be considered "sane".
-- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
--alias in your environment])
-- fi
--
-- test "$[2]" = conftest.file
-- )
--then
-- # Ok.
-- :
--else
-- AC_MSG_ERROR([newly created file is older than distributed files!
--Check your system clock])
--fi
--AC_MSG_RESULT(yes)])
--
--# -*- Autoconf -*-
--
--
--# Copyright 1997, 1999, 2000, 2001 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
--
--# serial 3
--
--# AM_MISSING_PROG(NAME, PROGRAM)
--# ------------------------------
--AC_DEFUN([AM_MISSING_PROG],
--[AC_REQUIRE([AM_MISSING_HAS_RUN])
--$1=${$1-"${am_missing_run}$2"}
--AC_SUBST($1)])
--
--
--# AM_MISSING_HAS_RUN
--# ------------------
--# Define MISSING if not defined so far and test if it supports --run.
--# If it does, set am_missing_run to use it, otherwise, to nothing.
--AC_DEFUN([AM_MISSING_HAS_RUN],
--[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
--test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
--# Use eval to expand $SHELL
--if eval "$MISSING --run true"; then
-- am_missing_run="$MISSING --run "
--else
-- am_missing_run=
-- AC_MSG_WARN([`missing' script is too old or missing])
--fi
--])
--
--# AM_AUX_DIR_EXPAND
--
--# Copyright 2001 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
- # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
- # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
-@@ -429,105 +101,62 @@
- # absolute PATH. The drawback is that using absolute paths prevent a
- # configured tree to be moved without reconfiguration.
-
--# Rely on autoconf to set up CDPATH properly.
--AC_PREREQ([2.50])
--
--AC_DEFUN([AM_AUX_DIR_EXPAND], [
-+AC_DEFUN([AM_AUX_DIR_EXPAND],
-+[dnl Rely on autoconf to set up CDPATH properly.
-+AC_PREREQ([2.50])dnl
- # expand $ac_aux_dir to an absolute path
- am_aux_dir=`cd $ac_aux_dir && pwd`
- ])
-
--# AM_PROG_INSTALL_SH
--# ------------------
--# Define $install_sh.
--
--# Copyright 2001 Free Software Foundation, Inc.
-+# AM_CONDITIONAL -*- Autoconf -*-
-
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
-+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# serial 8
-
--AC_DEFUN([AM_PROG_INSTALL_SH],
--[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
--install_sh=${install_sh-"$am_aux_dir/install-sh"}
--AC_SUBST(install_sh)])
-+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-+# -------------------------------------
-+# Define a conditional.
-+AC_DEFUN([AM_CONDITIONAL],
-+[AC_PREREQ(2.52)dnl
-+ ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
-+ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-+AC_SUBST([$1_TRUE])dnl
-+AC_SUBST([$1_FALSE])dnl
-+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
-+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
-+if $2; then
-+ $1_TRUE=
-+ $1_FALSE='#'
-+else
-+ $1_TRUE='#'
-+ $1_FALSE=
-+fi
-+AC_CONFIG_COMMANDS_PRE(
-+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-+ AC_MSG_ERROR([[conditional "$1" was never defined.
-+Usually this means the macro was only invoked conditionally.]])
-+fi])])
-
--# AM_PROG_INSTALL_STRIP
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
--# Copyright 2001 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
--
--# One issue with vendor `install' (even GNU) is that you can't
--# specify the program used to strip binaries. This is especially
--# annoying in cross-compiling environments, where the build's strip
--# is unlikely to handle the host's binaries.
--# Fortunately install-sh will honor a STRIPPROG variable, so we
--# always use install-sh in `make install-strip', and initialize
--# STRIPPROG with the value of the STRIP variable (set by the user).
--AC_DEFUN([AM_PROG_INSTALL_STRIP],
--[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
--# Installed binaries are usually stripped using `strip' when the user
--# run `make install-strip'. However `strip' might not be the right
--# tool to use in cross-compilation environments, therefore Automake
--# will honor the `STRIP' environment variable to overrule this program.
--dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
--if test "$cross_compiling" != no; then
-- AC_CHECK_TOOL([STRIP], [strip], :)
--fi
--INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
--AC_SUBST([INSTALL_STRIP_PROGRAM])])
--
--# serial 4 -*- Autoconf -*-
--
--# Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
--
--
--# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
--# written in clear, in which case automake, when reading aclocal.m4,
--# will think it sees a *use*, and therefore will trigger all it's
--# C support machinery. Also note that it means that autoscan, seeing
--# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-+# serial 9
-
-+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-+# written in clear, in which case automake, when reading aclocal.m4,
-+# will think it sees a *use*, and therefore will trigger all it's
-+# C support machinery. Also note that it means that autoscan, seeing
-+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
- # _AM_DEPENDENCIES(NAME)
-@@ -549,6 +178,7 @@
- ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
- [$1], CXX, [depcc="$CXX" am_compiler_list=],
- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-+ [$1], UPC, [depcc="$UPC" am_compiler_list=],
- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
- [depcc="$$1" am_compiler_list=])
-
-@@ -565,18 +195,34 @@
- # using a relative directory.
- cp "$am_depcomp" conftest.dir
- cd conftest.dir
-+ # We will build objects and dependencies in a subdirectory because
-+ # it helps to detect inapplicable dependency modes. For instance
-+ # both Tru64's cc and ICC support -MD to output dependencies as a
-+ # side effect of compilation, but ICC will put the dependencies in
-+ # the current directory while Tru64 will put them in the object
-+ # directory.
-+ mkdir sub
-
- am_cv_$1_dependencies_compiler_type=none
- if test "$am_compiler_list" = ""; then
- am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
- fi
- for depmode in $am_compiler_list; do
-+ # Setup a source with many dependencies, because some compilers
-+ # like to wrap large dependency lists on column 80 (with \), and
-+ # we should not choose a depcomp mode which is confused by this.
-+ #
- # We need to recreate these files for each test, as the compiler may
- # overwrite some of them when testing with obscure command lines.
- # This happens at least with the AIX C compiler.
-- echo '#include "conftest.h"' > conftest.c
-- echo 'int i;' > conftest.h
-- echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
-+ : > sub/conftest.c
-+ for i in 1 2 3 4 5 6; do
-+ echo '#include "conftst'$i'.h"' >> sub/conftest.c
-+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-+ # Solaris 8's {/usr,}/bin/sh.
-+ touch sub/conftst$i.h
-+ done
-+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
- case $depmode in
- nosideeffect)
-@@ -594,13 +240,26 @@
- # mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this.
- if depmode=$depmode \
-- source=conftest.c object=conftest.o \
-- depfile=conftest.Po tmpdepfile=conftest.TPo \
-- $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
-- grep conftest.h conftest.Po > /dev/null 2>&1 &&
-+ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-+ >/dev/null 2>conftest.err &&
-+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-- am_cv_$1_dependencies_compiler_type=$depmode
-- break
-+ # icc doesn't choke on unknown options, it will just issue warnings
-+ # or remarks (even with -Werror). So we grep stderr for any message
-+ # that says an option was ignored or not supported.
-+ # When given -MP, icc 7.0 and 7.1 complain thusly:
-+ # icc: Command line warning: ignoring option '-M'; no argument required
-+ # The diagnosis changed in icc 8.0:
-+ # icc: Command line remark: option '-MP' not supported
-+ if (grep 'ignoring option' conftest.err ||
-+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-+ am_cv_$1_dependencies_compiler_type=$depmode
-+ break
-+ fi
- fi
- done
-
-@@ -611,6 +270,9 @@
- fi
- ])
- AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-+AM_CONDITIONAL([am__fastdep$1], [
-+ test "x$enable_dependency_tracking" != xno \
-+ && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
- ])
-
-
-@@ -619,16 +281,8 @@
- # Choose a directory name for dependency files.
- # This macro is AC_REQUIREd in _AM_DEPENDENCIES
- AC_DEFUN([AM_SET_DEPDIR],
--[rm -f .deps 2>/dev/null
--mkdir .deps 2>/dev/null
--if test -d .deps; then
-- DEPDIR=.deps
--else
-- # MS-DOS does not allow filenames that begin with a dot.
-- DEPDIR=_deps
--fi
--rmdir .deps 2>/dev/null
--AC_SUBST([DEPDIR])
-+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
- ])
-
-
-@@ -636,36 +290,27 @@
- # ------------
- AC_DEFUN([AM_DEP_TRACK],
- [AC_ARG_ENABLE(dependency-tracking,
--[ --disable-dependency-tracking Speeds up one-time builds
-- --enable-dependency-tracking Do not reject slow dependency extractors])
-+[ --disable-dependency-tracking speeds up one-time build
-+ --enable-dependency-tracking do not reject slow dependency extractors])
- if test "x$enable_dependency_tracking" != xno; then
- am_depcomp="$ac_aux_dir/depcomp"
- AMDEPBACKSLASH='\'
- fi
- AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
--AC_SUBST([AMDEPBACKSLASH])
-+AC_SUBST([AMDEPBACKSLASH])dnl
-+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
- ])
-
--# Generate code to set up dependency tracking. -*- Autoconf -*-
--
--# Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
-+# Generate code to set up dependency tracking. -*- Autoconf -*-
-
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
--#serial 2
-+#serial 3
-
- # _AM_OUTPUT_DEPENDENCY_COMMANDS
- # ------------------------------
-@@ -678,33 +323,28 @@
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
-- # So let's grep whole file.
-- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-+ # Grep'ing the whole file is not good either: AIX grep has a line
-+ # limit of 2048, but all sed's we know have understand at least 4000.
-+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
- dirpart=`AS_DIRNAME("$mf")`
- else
- continue
- fi
-- grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue
-- # Extract the definition of DEP_FILES from the Makefile without
-- # running `make'.
-- DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
-+ # Extract the definition of DEPDIR, am__include, and am__quote
-+ # from the Makefile without running `make'.
-+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
-+ am__include=`sed -n 's/^am__include = //p' < "$mf"`
-+ test -z "am__include" && continue
-+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # When using ansi2knr, U may be empty or an underscore; expand it
-- U=`sed -n -e '/^U = / s///p' < "$mf"`
-- test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
-- # We invoke sed twice because it is the simplest approach to
-- # changing $(DEPDIR) to its actual value in the expansion.
-- for file in `sed -n -e '
-- /^DEP_FILES = .*\\\\$/ {
-- s/^DEP_FILES = //
-- :loop
-- s/\\\\$//
-- p
-- n
-- /\\\\$/ b loop
-- p
-- }
-- /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
-+ U=`sed -n 's/^U = //p' < "$mf"`
-+ # Find all dependency output files, they are included files with
-+ # $(DEPDIR) in their names. We invoke sed twice because it is the
-+ # simplest approach to changing $(DEPDIR) to its actual value in the
-+ # expansion.
-+ for file in `sed -n "
-+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
-@@ -730,33 +370,227 @@
- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
- ])
-
--# Copyright 2001 Free Software Foundation, Inc. -*- Autoconf -*-
-+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 8
-+
-+# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
-+AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
-
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
-+# Do all the work for Automake. -*- Autoconf -*-
-
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-+# 2005, 2006, 2008 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 13
-+
-+# This macro actually does too much. Some checks are only needed if
-+# your package does certain things. But this isn't really a big deal.
-+
-+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-+# AM_INIT_AUTOMAKE([OPTIONS])
-+# -----------------------------------------------
-+# The call with PACKAGE and VERSION arguments is the old style
-+# call (pre autoconf-2.50), which is being phased out. PACKAGE
-+# and VERSION should now be passed to AC_INIT and removed from
-+# the call to AM_INIT_AUTOMAKE.
-+# We support both call styles for the transition. After
-+# the next Automake release, Autoconf can make the AC_INIT
-+# arguments mandatory, and then we can depend on a new Autoconf
-+# release and drop the old call support.
-+AC_DEFUN([AM_INIT_AUTOMAKE],
-+[AC_PREREQ([2.60])dnl
-+dnl Autoconf wants to disallow AM_ names. We explicitly allow
-+dnl the ones we care about.
-+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-+AC_REQUIRE([AC_PROG_INSTALL])dnl
-+if test "`cd $srcdir && pwd`" != "`pwd`"; then
-+ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-+ # is not polluted with repeated "-I."
-+ AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
-+ # test to see if srcdir already configured
-+ if test -f $srcdir/config.status; then
-+ AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-+ fi
-+fi
-+
-+# test whether we have cygpath
-+if test -z "$CYGPATH_W"; then
-+ if (cygpath --version) >/dev/null 2>/dev/null; then
-+ CYGPATH_W='cygpath -w'
-+ else
-+ CYGPATH_W=echo
-+ fi
-+fi
-+AC_SUBST([CYGPATH_W])
-+
-+# Define the identity of the package.
-+dnl Distinguish between old-style and new-style calls.
-+m4_ifval([$2],
-+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
-+ AC_SUBST([PACKAGE], [$1])dnl
-+ AC_SUBST([VERSION], [$2])],
-+[_AM_SET_OPTIONS([$1])dnl
-+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
-+ [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
-+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
-+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-+
-+_AM_IF_OPTION([no-define],,
-+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-+
-+# Some tools Automake needs.
-+AC_REQUIRE([AM_SANITY_CHECK])dnl
-+AC_REQUIRE([AC_ARG_PROGRAM])dnl
-+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-+AM_MISSING_PROG(AUTOCONF, autoconf)
-+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-+AM_MISSING_PROG(AUTOHEADER, autoheader)
-+AM_MISSING_PROG(MAKEINFO, makeinfo)
-+AM_PROG_INSTALL_SH
-+AM_PROG_INSTALL_STRIP
-+AC_REQUIRE([AM_PROG_MKDIR_P])dnl
-+# We need awk for the "check" target. The system "awk" is bad on
-+# some platforms.
-+AC_REQUIRE([AC_PROG_AWK])dnl
-+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-+AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
-+ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-+ [_AM_PROG_TAR([v7])])])
-+_AM_IF_OPTION([no-dependencies],,
-+[AC_PROVIDE_IFELSE([AC_PROG_CC],
-+ [_AM_DEPENDENCIES(CC)],
-+ [define([AC_PROG_CC],
-+ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-+AC_PROVIDE_IFELSE([AC_PROG_CXX],
-+ [_AM_DEPENDENCIES(CXX)],
-+ [define([AC_PROG_CXX],
-+ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-+ [_AM_DEPENDENCIES(OBJC)],
-+ [define([AC_PROG_OBJC],
-+ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
-+])
-+])
-+
-+
-+# When config.status generates a header, we must update the stamp-h file.
-+# This file resides in the same directory as the config header
-+# that is generated. The stamp files are numbered to have different names.
-+
-+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-+# loop where config.status creates the headers, so we can generate
-+# our stamp files there.
-+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-+[# Compute $1's index in $config_headers.
-+_am_arg=$1
-+_am_stamp_count=1
-+for _am_header in $config_headers :; do
-+ case $_am_header in
-+ $_am_arg | $_am_arg:* )
-+ break ;;
-+ * )
-+ _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-+ esac
-+done
-+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-+
-+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# AM_PROG_INSTALL_SH
-+# ------------------
-+# Define $install_sh.
-+AC_DEFUN([AM_PROG_INSTALL_SH],
-+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
-+AC_SUBST(install_sh)])
-+
-+# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
- # serial 2
-
-+# Check whether the underlying file-system supports filenames
-+# with a leading dot. For instance MS-DOS doesn't.
-+AC_DEFUN([AM_SET_LEADING_DOT],
-+[rm -rf .tst 2>/dev/null
-+mkdir .tst 2>/dev/null
-+if test -d .tst; then
-+ am__leading_dot=.
-+else
-+ am__leading_dot=_
-+fi
-+rmdir .tst 2>/dev/null
-+AC_SUBST([am__leading_dot])])
-+
-+# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
-+# From Jim Meyering
-+
-+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 4
-+
-+AC_DEFUN([AM_MAINTAINER_MODE],
-+[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-+ dnl maintainer-mode is disabled by default
-+ AC_ARG_ENABLE(maintainer-mode,
-+[ --enable-maintainer-mode enable make rules and dependencies not useful
-+ (and sometimes confusing) to the casual installer],
-+ USE_MAINTAINER_MODE=$enableval,
-+ USE_MAINTAINER_MODE=no)
-+ AC_MSG_RESULT([$USE_MAINTAINER_MODE])
-+ AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
-+ MAINT=$MAINTAINER_MODE_TRUE
-+ AC_SUBST(MAINT)dnl
-+]
-+)
-+
-+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
-+
-+# Check to see how 'make' treats includes. -*- Autoconf -*-
-+
-+# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 3
-+
- # AM_MAKE_INCLUDE()
- # -----------------
- # Check to see how make treats includes.
- AC_DEFUN([AM_MAKE_INCLUDE],
- [am_make=${MAKE-make}
- cat > confinc << 'END'
--doit:
-+am__doit:
- @echo done
-+.PHONY: am__doit
- END
- # If we don't find an include directive, just comment out the code.
- AC_MSG_CHECKING([for style of include used by $am_make])
-@@ -770,7 +604,7 @@
- # In particular we don't look at `^make:' because GNU make might
- # be invoked under some other name (usually "gmake"), in which
- # case it prints its new name instead of `make'.
--if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then
-+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
- am__include=include
- am__quote=
- _am_result=GNU
-@@ -784,3816 +618,318 @@
- _am_result=BSD
- fi
- fi
--AC_SUBST(am__include)
--AC_SUBST(am__quote)
--AC_MSG_RESULT($_am_result)
-+AC_SUBST([am__include])
-+AC_SUBST([am__quote])
-+AC_MSG_RESULT([$_am_result])
- rm -f confinc confmf
- ])
-
--# AM_CONDITIONAL -*- Autoconf -*-
-+# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-
--# Copyright 1997, 2000, 2001 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
- # serial 5
-
--AC_PREREQ(2.52)
-+# AM_MISSING_PROG(NAME, PROGRAM)
-+# ------------------------------
-+AC_DEFUN([AM_MISSING_PROG],
-+[AC_REQUIRE([AM_MISSING_HAS_RUN])
-+$1=${$1-"${am_missing_run}$2"}
-+AC_SUBST($1)])
-+
-
--# AM_CONDITIONAL(NAME, SHELL-CONDITION)
--# -------------------------------------
--# Define a conditional.
--AC_DEFUN([AM_CONDITIONAL],
--[ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
-- [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
--AC_SUBST([$1_TRUE])
--AC_SUBST([$1_FALSE])
--if $2; then
-- $1_TRUE=
-- $1_FALSE='#'
-+# AM_MISSING_HAS_RUN
-+# ------------------
-+# Define MISSING if not defined so far and test if it supports --run.
-+# If it does, set am_missing_run to use it, otherwise, to nothing.
-+AC_DEFUN([AM_MISSING_HAS_RUN],
-+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-+AC_REQUIRE_AUX_FILE([missing])dnl
-+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-+# Use eval to expand $SHELL
-+if eval "$MISSING --run true"; then
-+ am_missing_run="$MISSING --run "
- else
-- $1_TRUE='#'
-- $1_FALSE=
-+ am_missing_run=
-+ AC_MSG_WARN([`missing' script is too old or missing])
- fi
--AC_CONFIG_COMMANDS_PRE(
--[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-- AC_MSG_ERROR([conditional \"$1\" was never defined.
--Usually this means the macro was only invoked conditionally.])
--fi])])
-+])
-
--# Add --enable-maintainer-mode option to configure.
--# From Jim Meyering
-+# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
--# Copyright 1996, 1998, 2000, 2001 Free Software Foundation, Inc.
-+# AM_PROG_MKDIR_P
-+# ---------------
-+# Check for `mkdir -p'.
-+AC_DEFUN([AM_PROG_MKDIR_P],
-+[AC_PREREQ([2.60])dnl
-+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-+dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
-+dnl while keeping a definition of mkdir_p for backward compatibility.
-+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-+dnl Makefile.ins that do not define MKDIR_P, so we do our own
-+dnl adjustment using top_builddir (which is defined more often than
-+dnl MKDIR_P).
-+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-+case $mkdir_p in
-+ [[\\/$]]* | ?:[[\\/]]*) ;;
-+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-+esac
-+])
-
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
-+# Helper functions for option handling. -*- Autoconf -*-
-
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
--# serial 1
-+# serial 3
-
--AC_DEFUN([AM_MAINTAINER_MODE],
--[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-- dnl maintainer-mode is disabled by default
-- AC_ARG_ENABLE(maintainer-mode,
--[ --enable-maintainer-mode enable make rules and dependencies not useful
-- (and sometimes confusing) to the casual installer],
-- USE_MAINTAINER_MODE=$enableval,
-- USE_MAINTAINER_MODE=no)
-- AC_MSG_RESULT([$USE_MAINTAINER_MODE])
-- AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
-- MAINT=$MAINTAINER_MODE_TRUE
-- AC_SUBST(MAINT)dnl
--]
--)
-+# _AM_MANGLE_OPTION(NAME)
-+# -----------------------
-+AC_DEFUN([_AM_MANGLE_OPTION],
-+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-
--# Do checks for Freeciv authentication support
--#
--# Called without any parameters.
-+# _AM_SET_OPTION(NAME)
-+# ------------------------------
-+# Set option NAME. Presently that only means defining a flag for this option.
-+AC_DEFUN([_AM_SET_OPTION],
-+[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
-
--AC_DEFUN([FC_CHECK_AUTH],
--[
-- dnl no=do not compile in authentication, yes=compile in auth, *=error
-- AC_ARG_ENABLE([auth],
-- [ --enable-auth[[=no/yes/try]] compile in authentication [[default=no]]],
-- [case "${enableval}" in
-- yes) auth=true
-- must_auth=true ;;
-- no) auth=false ;;
-- try) auth=true ;;
-- *) AC_MSG_ERROR([bad value ${enableval} for --enable-auth]) ;;
-- esac], [auth=false])
--
-- AC_ARG_WITH(mysql-prefix,[ --with-mysql-prefix=PFX Prefix where MySQL is installed (optional)],
-- mysql_prefix="$withval", mysql_prefix="")
--
-- if test x$auth = xtrue; then
--
-- if test x$mysql_prefix = x; then
-- AC_CHECK_HEADER(mysql/mysql.h, ,
-- [AC_MSG_WARN([couldn't find mysql header: disabling auth]);
-- auth=false])
--
-- dnl we need to set -L correctly, we will check once in standard locations
-- dnl then we will check with other LDFLAGS. if none of these work, we fail.
--
-- AC_CHECK_LIB(mysqlclient, mysql_query,
-- [AUTH_LIBS="-lmysqlclient $AUTH_LIBS"],
-- [AC_MSG_WARN([couldn't find mysql libs in normal locations]);
-- auth=false])
--
-- if test x$auth = x$true ; then
-- fc_preauth_LDFLAGS="$LDFLAGS"
-- fc_mysql_lib_loc="-L/usr/lib/mysql -L/usr/local/lib/mysql"
--
-- for __ldpath in $fc_mysql_lib_loc; do
-- unset ac_cv_lib_mysqlclient_mysql_query
-- LDFLAGS="$LDFLAGS $__ldpath"
-- auth=true
--
-- AC_CHECK_LIB(mysqlclient, mysql_query,
-- [AUTH_LIBS="-lmysqlclient $AUTH_LIBS";
-- AC_MSG_WARN([had to add $__ldpath to LDFLAGS])],
-- [AC_MSG_WARN([couldn't find mysql libs in $__ldpath]);
-- auth=false])
--
-- if test x$auth = xtrue; then
-- break
-- else
-- LDFLAGS="$fc_preauth_LDFLAGS"
-- fi
-- done
-- fi
-- else
-- AUTH_CFLAGS="-I$mysql_prefix/include $AUTH_CFLAGS"
-- AUTH_LIBS="-L$mysql_prefix/lib/mysql -lmysqlclient $AUTH_LIBS"
-- auth_saved_cflags="$CFLAGS"
-- auth_saved_cppflags="$CPPFLAGS"
-- auth_saved_libs="$LIBS"
-- CFLAGS="$CFLAGS $AUTH_CFLAGS"
-- CPPFLAGS="$CPPFLAGS $AUTH_CFLAGS"
-- LIBS="$LIBS $AUTH_LIBS"
-- AC_CHECK_HEADER(mysql/mysql.h, ,
-- [AC_MSG_WARN([couldn't find mysql header in $mysql_prefix/include]);
-- auth=false])
-- if test x$auth = xtrue; then
-- AC_CHECK_LIB(mysqlclient, mysql_query, ,
-- [AC_MSG_WARN([couldn't find mysql libs in $mysql_prefix/lib/mysql]);
-- auth=false])
-- fi
-- CFLAGS="$auth_saved_cflags"
-- CPPFLAGS="$auth_saved_cppflags"
-- LIBS="$auth_saved_libs"
-- fi
-+# _AM_SET_OPTIONS(OPTIONS)
-+# ----------------------------------
-+# OPTIONS is a space-separated list of Automake options.
-+AC_DEFUN([_AM_SET_OPTIONS],
-+[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-
-- if test x$auth = xfalse; then
-- if test x$must_auth = xtrue; then
-- AC_MSG_ERROR([can't find mysql: cannot build authentication support])
-- else
-- AC_MSG_WARN([can't find mysql -- disabling authentication])
-- fi
-- fi
-+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-+# -------------------------------------------
-+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-+AC_DEFUN([_AM_IF_OPTION],
-+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-
-- AC_SUBST(LDFLAGS)
-- AC_SUBST(AUTH_CFLAGS)
-- AC_SUBST(AUTH_LIBS)
-- fi
-+# Check to make sure that the build environment is sane. -*- Autoconf -*-
-
--
-- if test x$auth = xtrue; then
-- AC_DEFINE(HAVE_AUTH, 1, [compile with authentication])
-- fi
--
--])
--
--#serial AM2
--dnl From Bruno Haible.
--
--AC_DEFUN([AM_ICONV],
--[
-- dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
-- dnl those with the standalone portable GNU libiconv installed).
--
-- AC_ARG_WITH([libiconv-prefix],
--[ --with-libiconv-prefix=DIR search for libiconv in DIR/include and DIR/lib], [
-- for dir in `echo "$withval" | tr : ' '`; do
-- if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi
-- if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi
-- done
-- ])
--
-- AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
-- am_cv_func_iconv="no, consider installing GNU libiconv"
-- am_cv_lib_iconv=no
-- AC_TRY_LINK([#include <stdlib.h>
--#include <iconv.h>],
-- [iconv_t cd = iconv_open("","");
-- iconv(cd,NULL,NULL,NULL,NULL);
-- iconv_close(cd);],
-- am_cv_func_iconv=yes)
-- if test "$am_cv_func_iconv" != yes; then
-- am_save_LIBS="$LIBS"
-- LIBS="$LIBS -liconv"
-- AC_TRY_LINK([#include <stdlib.h>
--#include <iconv.h>],
-- [iconv_t cd = iconv_open("","");
-- iconv(cd,NULL,NULL,NULL,NULL);
-- iconv_close(cd);],
-- am_cv_lib_iconv=yes
-- am_cv_func_iconv=yes)
-- LIBS="$am_save_LIBS"
-- fi
-- ])
-- if test "$am_cv_func_iconv" = yes; then
-- AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
-- AC_MSG_CHECKING([for iconv declaration])
-- AC_CACHE_VAL(am_cv_proto_iconv, [
-- AC_TRY_COMPILE([
--#include <stdlib.h>
--#include <iconv.h>
--extern
--#ifdef __cplusplus
--"C"
--#endif
--#if defined(__STDC__) || defined(__cplusplus)
--size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
--#else
--size_t iconv();
--#endif
--], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
-- am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
-- am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
-- AC_MSG_RESULT([$]{ac_t:-
-- }[$]am_cv_proto_iconv)
-- AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
-- [Define as const if the declaration of iconv() needs const.])
-- fi
-- LIBICONV=
-- if test "$am_cv_lib_iconv" = yes; then
-- LIBICONV="-liconv"
-- fi
-- AC_SUBST(LIBICONV)
--])
--
--#serial AM1
--dnl From Bruno Haible.
--
--AC_DEFUN([AM_LANGINFO_CODESET],
--[
-- AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
-- [AC_TRY_LINK([#include <langinfo.h>],
-- [char* cs = nl_langinfo(CODESET);],
-- am_cv_langinfo_codeset=yes,
-- am_cv_langinfo_codeset=no)
-- ])
-- if test $am_cv_langinfo_codeset = yes; then
-- AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
-- [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
-- fi
--])
--
--AC_DEFUN([AM_LIBCHARSET],
--[
-- AC_CACHE_CHECK([for libcharset], am_cv_libcharset,
-- [lc_save_LIBS="$LIBS"
-- LIBS="$LIBS $LIBICONV"
-- AC_TRY_LINK([#include <libcharset.h>],
-- [locale_charset()],
-- am_cv_libcharset=yes,
-- am_cv_libcharset=no)
-- LIBS="$lc_save_LIBS"
-- ])
-- if test $am_cv_libcharset = yes; then
-- AC_DEFINE(HAVE_LIBCHARSET, 1,
-- [Define if you have <libcharset.h> and locale_charset().])
-- fi
--])
--
--# Macro to add for using GNU gettext.
--# Ulrich Drepper <drepper at cygnus.com>, 1995.
-+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-+# Free Software Foundation, Inc.
- #
--# This file can be copied and used freely without restrictions. It can
--# be used in projects which are not available under the GNU General Public
--# License or the GNU Library General Public License but which still want
--# to provide support for the GNU gettext functionality.
--# Please note that the actual code of the GNU gettext library is covered
--# by the GNU Library General Public License, and the rest of the GNU
--# gettext package package is covered by the GNU General Public License.
--# They are *not* in the public domain.
--
--# serial 10
--
--dnl Usage: AM_WITH_NLS([TOOLSYMBOL], [NEEDSYMBOL], [LIBDIR]).
--dnl If TOOLSYMBOL is specified and is 'use-libtool', then a libtool library
--dnl $(top_builddir)/intl/libintl.la will be created (shared and/or static,
--dnl depending on --{enable,disable}-{shared,static} and on the presence of
--dnl AM-DISABLE-SHARED). Otherwise, a static library
--dnl $(top_builddir)/intl/libintl.a will be created.
--dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
--dnl implementations (in libc or libintl) without the ngettext() function
--dnl will be ignored.
--dnl LIBDIR is used to find the intl libraries. If empty,
--dnl the value `$(top_builddir)/intl/' is used.
--dnl
--dnl The result of the configuration is one of three cases:
--dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
--dnl and used.
--dnl Catalog format: GNU --> install in $(datadir)
--dnl Catalog extension: .mo after installation, .gmo in source tree
--dnl 2) GNU gettext has been found in the system's C library.
--dnl Catalog format: GNU --> install in $(datadir)
--dnl Catalog extension: .mo after installation, .gmo in source tree
--dnl 3) No internationalization, always use English msgid.
--dnl Catalog format: none
--dnl Catalog extension: none
--dnl The use of .gmo is historical (it was needed to avoid overwriting the
--dnl GNU format catalogs when building on a platform with an X/Open gettext),
--dnl but we keep it in order not to force irrelevant filename changes on the
--dnl maintainers.
--dnl
--AC_DEFUN([AM_WITH_NLS],
-- [AC_MSG_CHECKING([whether NLS is requested])
-- dnl Default is enabled NLS
-- AC_ARG_ENABLE(nls,
-- [ --disable-nls do not use Native Language Support],
-- USE_NLS=$enableval, USE_NLS=yes)
-- AC_MSG_RESULT($USE_NLS)
-- AC_SUBST(USE_NLS)
--
-- BUILD_INCLUDED_LIBINTL=no
-- USE_INCLUDED_LIBINTL=no
-- INTLLIBS=
--
-- dnl If we use NLS figure out what method
-- if test "$USE_NLS" = "yes"; then
-- AC_DEFINE(ENABLE_NLS, 1,
-- [Define to 1 if translation of program messages to the user's native language
-- is requested.])
-- AC_MSG_CHECKING([whether included gettext is requested])
-- AC_ARG_WITH(included-gettext,
-- [ --with-included-gettext use the GNU gettext library included here],
-- nls_cv_force_use_gnu_gettext=$withval,
-- nls_cv_force_use_gnu_gettext=no)
-- AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
--
-- nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
-- if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
-- dnl User does not insist on using GNU NLS library. Figure out what
-- dnl to use. If GNU gettext is available we use this. Else we have
-- dnl to fall back to GNU NLS library.
-- CATOBJEXT=NONE
--
-- dnl Add a version number to the cache macros.
-- define(gt_cv_func_gnugettext_libc, [gt_cv_func_gnugettext]ifelse([$2], need-ngettext, 2, 1)[_libc])
-- define(gt_cv_func_gnugettext_libintl, [gt_cv_func_gnugettext]ifelse([$2], need-ngettext, 2, 1)[_libintl])
--
-- AC_CHECK_HEADER(libintl.h,
-- [AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,
-- [AC_TRY_LINK([#include <libintl.h>
--extern int _nl_msg_cat_cntr;],
-- [bindtextdomain ("", "");
--return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr],
-- gt_cv_func_gnugettext_libc=yes,
-- gt_cv_func_gnugettext_libc=no)])
--
-- if test "$gt_cv_func_gnugettext_libc" != "yes"; then
-- AC_CACHE_CHECK([for GNU gettext in libintl],
-- gt_cv_func_gnugettext_libintl,
-- [gt_save_LIBS="$LIBS"
-- LIBS="$LIBS -lintl $LIBICONV"
-- AC_TRY_LINK([#include <libintl.h>
--extern int _nl_msg_cat_cntr;],
-- [bindtextdomain ("", "");
--return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr],
-- gt_cv_func_gnugettext_libintl=yes,
-- gt_cv_func_gnugettext_libintl=no)
-- LIBS="$gt_save_LIBS"])
-- fi
--
-- dnl If an already present or preinstalled GNU gettext() is found,
-- dnl use it. But if this macro is used in GNU gettext, and GNU
-- dnl gettext is already preinstalled in libintl, we update this
-- dnl libintl. (Cf. the install rule in intl/Makefile.in.)
-- if test "$gt_cv_func_gnugettext_libc" = "yes" \
-- || { test "$gt_cv_func_gnugettext_libintl" = "yes" \
-- && test "$PACKAGE" != gettext; }; then
-- AC_DEFINE(HAVE_GETTEXT, 1,
-- [Define if the GNU gettext() function is already present or preinstalled.])
--
-- if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
-- dnl If iconv() is in a separate libiconv library, then anyone
-- dnl linking with libintl{.a,.so} also needs to link with
-- dnl libiconv.
-- INTLLIBS="-lintl $LIBICONV"
-- fi
--
-- gt_save_LIBS="$LIBS"
-- LIBS="$LIBS $INTLLIBS"
-- AC_CHECK_FUNCS(dcgettext)
-- LIBS="$gt_save_LIBS"
--
-- dnl Search for GNU msgfmt in the PATH.
-- AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-- [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1], :)
-- AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
--
-- dnl Search for GNU xgettext in the PATH.
-- AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-- [$ac_dir/$ac_word --omit-header /dev/null >/dev/null 2>&1], :)
--
-- CATOBJEXT=.gmo
-- fi
-- ])
--
-- if test "$CATOBJEXT" = "NONE"; then
-- dnl GNU gettext is not found in the C library.
-- dnl Fall back on GNU gettext library.
-- nls_cv_use_gnu_gettext=yes
-- fi
-- fi
--
-- if test "$nls_cv_use_gnu_gettext" = "yes"; then
-- dnl Mark actions used to generate GNU NLS library.
-- INTLOBJS="\$(GETTOBJS)"
-- AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-- [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1], :)
-- AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-- AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-- [$ac_dir/$ac_word --omit-header /dev/null >/dev/null 2>&1], :)
-- AC_SUBST(MSGFMT)
-- BUILD_INCLUDED_LIBINTL=yes
-- USE_INCLUDED_LIBINTL=yes
-- CATOBJEXT=.gmo
-- INTLLIBS="ifelse([$3],[],\$(top_builddir)/intl,[$3])/libintl.ifelse([$1], use-libtool, [l], [])a $LIBICONV"
-- LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
-- fi
--
-- dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
-- dnl Test whether we really found GNU msgfmt.
-- if test "$GMSGFMT" != ":"; then
-- dnl If it is no GNU msgfmt we define it as : so that the
-- dnl Makefiles still can work.
-- if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then
-- : ;
-- else
-- AC_MSG_RESULT(
-- [found msgfmt program is not GNU msgfmt; ignore it])
-- GMSGFMT=":"
-- fi
-- fi
--
-- dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
-- dnl Test whether we really found GNU xgettext.
-- if test "$XGETTEXT" != ":"; then
-- dnl If it is no GNU xgettext we define it as : so that the
-- dnl Makefiles still can work.
-- if $XGETTEXT --omit-header /dev/null >/dev/null 2>&1; then
-- : ;
-- else
-- AC_MSG_RESULT(
-- [found xgettext program is not GNU xgettext; ignore it])
-- XGETTEXT=":"
-- fi
-- fi
--
-- dnl We need to process the po/ directory.
-- POSUB=po
-- fi
-- AC_OUTPUT_COMMANDS(
-- [for ac_file in $CONFIG_FILES; do
-- # Support "outfile[:infile[:infile...]]"
-- case "$ac_file" in
-- *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-- esac
-- # PO directories have a Makefile.in generated from Makefile.in.in.
-- case "$ac_file" in */Makefile.in)
-- # Adjust a relative srcdir.
-- ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
-- ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
-- ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
-- # In autoconf-2.13 it is called $ac_given_srcdir.
-- # In autoconf-2.50 it is called $srcdir.
-- test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
-- case "$ac_given_srcdir" in
-- .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
-- /*) top_srcdir="$ac_given_srcdir" ;;
-- *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
-- esac
-- if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
-- rm -f "$ac_dir/POTFILES"
-- test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
-- sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," -e "\$s/\(.*\) \\\\/\1/" < "$ac_given_srcdir/$ac_dir/POTFILES.in" > "$ac_dir/POTFILES"
-- test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
-- sed -e "/POTFILES =/r $ac_dir/POTFILES" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
-- fi
-- ;;
-- esac
-- done])
--
--
-- dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
-- dnl to 'yes' because some of the testsuite requires it.
-- if test "$PACKAGE" = gettext; then
-- BUILD_INCLUDED_LIBINTL=yes
-- fi
--
-- dnl intl/plural.c is generated from intl/plural.y. It requires bison,
-- dnl because plural.y uses bison specific features. It requires at least
-- dnl bison-1.26 because earlier versions generate a plural.c that doesn't
-- dnl compile.
-- dnl bison is only needed for the maintainer (who touches plural.y). But in
-- dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
-- dnl the rule in general Makefile. Now, some people carelessly touch the
-- dnl files or have a broken "make" program, hence the plural.c rule will
-- dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
-- dnl present or too old.
-- AC_CHECK_PROGS([INTLBISON], [bison])
-- if test -z "$INTLBISON"; then
-- ac_verc_fail=yes
-- else
-- dnl Found it, now check the version.
-- AC_MSG_CHECKING([version of bison])
--changequote(<<,>>)dnl
-- ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
-- case $ac_prog_version in
-- '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
-- 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
--changequote([,])dnl
-- ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
-- *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
-- esac
-- AC_MSG_RESULT([$ac_prog_version])
-- fi
-- if test $ac_verc_fail = yes; then
-- INTLBISON=:
-- fi
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
-- dnl These rules are solely for the distribution goal. While doing this
-- dnl we only have to keep exactly one list of the available catalogs
-- dnl in configure.in.
-- for lang in $ALL_LINGUAS; do
-- GMOFILES="$GMOFILES $lang.gmo"
-- POFILES="$POFILES $lang.po"
-- done
-+# serial 4
-
-- dnl Make all variables we use known to autoconf.
-- AC_SUBST(BUILD_INCLUDED_LIBINTL)
-- AC_SUBST(USE_INCLUDED_LIBINTL)
-- AC_SUBST(CATALOGS)
-- AC_SUBST(CATOBJEXT)
-- AC_SUBST(GMOFILES)
-- AC_SUBST(INTLLIBS)
-- AC_SUBST(INTLOBJS)
-- AC_SUBST(POFILES)
-- AC_SUBST(POSUB)
--
-- dnl For backward compatibility. Some configure.ins may be using this.
-- nls_cv_header_intl=
-- nls_cv_header_libgt=
--
-- dnl For backward compatibility. Some Makefiles may be using this.
-- DATADIRNAME=share
-- AC_SUBST(DATADIRNAME)
--
-- dnl For backward compatibility. Some Makefiles may be using this.
-- INSTOBJEXT=.mo
-- AC_SUBST(INSTOBJEXT)
--
-- dnl For backward compatibility. Some Makefiles may be using this.
-- GENCAT=gencat
-- AC_SUBST(GENCAT)
-- ])
--
--dnl Usage: Just like AM_WITH_NLS, which see.
--AC_DEFUN([AM_GNU_GETTEXT],
-- [AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-- AC_REQUIRE([AC_PROG_CC])dnl
-- AC_REQUIRE([AC_CANONICAL_HOST])dnl
-- AC_REQUIRE([AC_PROG_RANLIB])dnl
-- AC_REQUIRE([AC_ISC_POSIX])dnl
-- AC_REQUIRE([AC_HEADER_STDC])dnl
-- AC_REQUIRE([AC_C_CONST])dnl
-- AC_REQUIRE([AC_C_INLINE])dnl
-- AC_REQUIRE([AC_TYPE_OFF_T])dnl
-- AC_REQUIRE([AC_TYPE_SIZE_T])dnl
-- AC_REQUIRE([AC_FUNC_ALLOCA])dnl
-- AC_REQUIRE([AC_FUNC_MMAP])dnl
-- AC_REQUIRE([jm_GLIBC21])dnl
--
-- AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
--stdlib.h string.h unistd.h sys/param.h])
-- AC_CHECK_FUNCS([feof_unlocked fgets_unlocked getcwd getegid geteuid \
--getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \
--strdup strtoul tsearch __argz_count __argz_stringify __argz_next])
--
-- AM_ICONV
-- AM_LANGINFO_CODESET
-- AM_LC_MESSAGES
-- AM_WITH_NLS([$1],[$2],[$3])
--
-- if test "x$CATOBJEXT" != "x"; then
-- if test "x$ALL_LINGUAS" = "x"; then
-- LINGUAS=
-- else
-- AC_MSG_CHECKING(for catalogs to be installed)
-- NEW_LINGUAS=
-- for presentlang in $ALL_LINGUAS; do
-- useit=no
-- for desiredlang in ${LINGUAS-$ALL_LINGUAS}; do
-- # Use the presentlang catalog if desiredlang is
-- # a. equal to presentlang, or
-- # b. a variant of presentlang (because in this case,
-- # presentlang can be used as a fallback for messages
-- # which are not translated in the desiredlang catalog).
-- case "$desiredlang" in
-- "$presentlang"*) useit=yes;;
-- esac
-- done
-- if test $useit = yes; then
-- NEW_LINGUAS="$NEW_LINGUAS $presentlang"
-- fi
-- done
-- LINGUAS=$NEW_LINGUAS
-- AC_MSG_RESULT($LINGUAS)
-- fi
--
-- dnl Construct list of names of catalog files to be constructed.
-- if test -n "$LINGUAS"; then
-- for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
-- fi
-+# AM_SANITY_CHECK
-+# ---------------
-+AC_DEFUN([AM_SANITY_CHECK],
-+[AC_MSG_CHECKING([whether build environment is sane])
-+# Just in case
-+sleep 1
-+echo timestamp > conftest.file
-+# Do `set' in a subshell so we don't clobber the current shell's
-+# arguments. Must try -L first in case configure is actually a
-+# symlink; some systems play weird games with the mod time of symlinks
-+# (eg FreeBSD returns the mod time of the symlink's containing
-+# directory).
-+if (
-+ set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-+ if test "$[*]" = "X"; then
-+ # -L didn't work.
-+ set X `ls -t $srcdir/configure conftest.file`
- fi
-+ rm -f conftest.file
-+ if test "$[*]" != "X $srcdir/configure conftest.file" \
-+ && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
-- dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
-- dnl find the mkinstalldirs script in another subdir but $(top_srcdir).
-- dnl Try to locate is.
-- MKINSTALLDIRS=
-- if test -n "$ac_aux_dir"; then
-- MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
-- fi
-- if test -z "$MKINSTALLDIRS"; then
-- MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
-+ # If neither matched, then we have a broken ls. This can happen
-+ # if, for instance, CONFIG_SHELL is bash and it inherits a
-+ # broken ls alias from the environment. This has actually
-+ # happened. Such a system could not be considered "sane".
-+ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
-+alias in your environment])
- fi
-- AC_SUBST(MKINSTALLDIRS)
--
-- dnl Enable libtool support if the surrounding package wishes it.
-- INTL_LIBTOOL_SUFFIX_PREFIX=ifelse([$1], use-libtool, [l], [])
-- AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
-- ])
--
--# Search path for a program which passes the given test.
--# Ulrich Drepper <drepper at cygnus.com>, 1996.
--#
--# This file can be copied and used freely without restrictions. It can
--# be used in projects which are not available under the GNU General Public
--# License or the GNU Library General Public License but which still want
--# to provide support for the GNU gettext functionality.
--# Please note that the actual code of the GNU gettext library is covered
--# by the GNU Library General Public License, and the rest of the GNU
--# gettext package package is covered by the GNU General Public License.
--# They are *not* in the public domain.
-
--# serial 2
--
--dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
--dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
--AC_DEFUN([AM_PATH_PROG_WITH_TEST],
--[# Extract the first word of "$2", so it can be a program name with args.
--set dummy $2; ac_word=[$]2
--AC_MSG_CHECKING([for $ac_word])
--AC_CACHE_VAL(ac_cv_path_$1,
--[case "[$]$1" in
-- /*)
-- ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
-- ;;
-- *)
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-- for ac_dir in ifelse([$5], , $PATH, [$5]); do
-- test -z "$ac_dir" && ac_dir=.
-- if test -f $ac_dir/$ac_word; then
-- if [$3]; then
-- ac_cv_path_$1="$ac_dir/$ac_word"
-- break
-- fi
-- fi
-- done
-- IFS="$ac_save_ifs"
--dnl If no 4th arg is given, leave the cache variable unset,
--dnl so AC_PATH_PROGS will keep looking.
--ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
--])dnl
-- ;;
--esac])dnl
--$1="$ac_cv_path_$1"
--if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
-- AC_MSG_RESULT([$]$1)
-+ test "$[2]" = conftest.file
-+ )
-+then
-+ # Ok.
-+ :
- else
-- AC_MSG_RESULT(no)
-+ AC_MSG_ERROR([newly created file is older than distributed files!
-+Check your system clock])
- fi
--AC_SUBST($1)dnl
--])
--
--#serial 1
--# This test replaces the one in autoconf.
--# Currently this macro should have the same name as the autoconf macro
--# because gettext's gettext.m4 (distributed in the automake package)
--# still uses it. Otherwise, the use in gettext.m4 makes autoheader
--# give these diagnostics:
--# configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX
--# configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX
--
--undefine([AC_ISC_POSIX])
--
--AC_DEFUN([AC_ISC_POSIX],
-- [
-- dnl This test replaces the obsolescent AC_ISC_POSIX kludge.
-- AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"])
-- ]
--)
--
--
--#serial 2
--# Test for the GNU C Library, version 2.1 or newer.
--# From Bruno Haible.
--
--AC_DEFUN([jm_GLIBC21],
-- [
-- AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
-- ac_cv_gnu_library_2_1,
-- [AC_EGREP_CPP([Lucky GNU user],
-- [
--#include <features.h>
--#ifdef __GNU_LIBRARY__
-- #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
-- Lucky GNU user
-- #endif
--#endif
-- ],
-- ac_cv_gnu_library_2_1=yes,
-- ac_cv_gnu_library_2_1=no)
-- ]
-- )
-- AC_SUBST(GLIBC21)
-- GLIBC21="$ac_cv_gnu_library_2_1"
-- ]
--)
-+AC_MSG_RESULT(yes)])
-
--# Check whether LC_MESSAGES is available in <locale.h>.
--# Ulrich Drepper <drepper at cygnus.com>, 1995.
-+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
- #
--# This file can be copied and used freely without restrictions. It can
--# be used in projects which are not available under the GNU General Public
--# License or the GNU Library General Public License but which still want
--# to provide support for the GNU gettext functionality.
--# Please note that the actual code of the GNU gettext library is covered
--# by the GNU Library General Public License, and the rest of the GNU
--# gettext package package is covered by the GNU General Public License.
--# They are *not* in the public domain.
--
--# serial 2
--
--AC_DEFUN([AM_LC_MESSAGES],
-- [if test $ac_cv_header_locale_h = yes; then
-- AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
-- [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
-- am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
-- if test $am_cv_val_LC_MESSAGES = yes; then
-- AC_DEFINE(HAVE_LC_MESSAGES, 1,
-- [Define if your <locale.h> file defines LC_MESSAGES.])
-- fi
-- fi])
--
--dnl FC_CHECK_NGETTEXT_RUNTIME(EXTRA-LIBS, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
--dnl
--dnl This tests whether ngettext works at runtime. Here, "works"
--dnl means "doesn't dump core", as some versions (for exmaple the
--dnl version which comes with glibc 2.2.5 is broken, gettext
--dnl version 0.10.38 however is ok).
--
--AC_DEFUN([FC_CHECK_NGETTEXT_RUNTIME],
--[
--templibs="$LIBS"
--LIBS="$1 $LIBS"
--templang="$LANG"
--LANG="de_DE"
--AC_TRY_RUN([
--/*
-- * Check to make sure that ngettext works at runtime. Specifically,
-- * some gettext versions dump core if the ngettext function is called.
-- * (c) 2002 Raimar Falke <rfalke at freeciv.org>
-- */
--#include <string.h>
--#include <libintl.h>
--#include <locale.h>
--#include <stdlib.h>
--
--int main(int argc, char *argv[])
--{
-- setlocale(LC_ALL, "");
--
-- if (strcmp(ngettext("unit", "units", 1), "unit") == 0 &&
-- strcmp(ngettext("unit", "units", 2), "units") == 0) {
-- return 0;
-- } else {
-- return 1;
-- }
--}
--],
--[AC_MSG_RESULT(yes)
-- [$2]],
--[AC_MSG_RESULT(no)
-- [$3]],
--[AC_MSG_RESULT(unknown: cross-compiling)
-- [$2]])
--LIBS="$templibs"
--LANG="$templang"
--])
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
--AC_DEFUN([FC_DEBUG], [
--AC_ARG_ENABLE(debug,
--[ --enable-debug[[=no/some/yes]] turn on debugging [[default=some]]],
--[case "${enableval}" in
-- yes) enable_debug=yes ;;
-- some) enable_debug=some ;;
-- no) enable_debug=no ;;
-- *) AC_MSG_ERROR(bad value ${enableval} for --enable-debug) ;;
--esac], [enable_debug=some])
--
--dnl -g is added by AC_PROG_CC if the compiler understands it
--if test "x$enable_debug" = "xyes"; then
-- AC_DEFINE(DEBUG, 1, [Define if you want extra debugging.])
-- EXTRA_GCC_DEBUG_CFLAGS="$EXTRA_GCC_DEBUG_CFLAGS -Werror"
--else
-- if test "x$enable_debug" = "xno"; then
-- AC_DEFINE(NDEBUG, 1, [Define if you want no debug support.])
-- EXTRA_GCC_DEBUG_CFLAGS="-O3 -fomit-frame-pointer"
-- fi
-+# AM_PROG_INSTALL_STRIP
-+# ---------------------
-+# One issue with vendor `install' (even GNU) is that you can't
-+# specify the program used to strip binaries. This is especially
-+# annoying in cross-compiling environments, where the build's strip
-+# is unlikely to handle the host's binaries.
-+# Fortunately install-sh will honor a STRIPPROG variable, so we
-+# always use install-sh in `make install-strip', and initialize
-+# STRIPPROG with the value of the STRIP variable (set by the user).
-+AC_DEFUN([AM_PROG_INSTALL_STRIP],
-+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-+# Installed binaries are usually stripped using `strip' when the user
-+# run `make install-strip'. However `strip' might not be the right
-+# tool to use in cross-compilation environments, therefore Automake
-+# will honor the `STRIP' environment variable to overrule this program.
-+dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
-+if test "$cross_compiling" != no; then
-+ AC_CHECK_TOOL([STRIP], [strip], :)
- fi
--])
--
--# Check for the presence of C99 features. Generally the check will fail
--# if the feature isn't present (a C99 compiler isn't that much to ask,
--# right?).
--
--# Check C99-style variadic macros (required):
--#
--# #define PRINTF(msg, ...) (printf(msg, __VA_ARGS__)
--#
--AC_DEFUN([AC_C99_VARIADIC_MACROS],
--[
-- dnl Check for variadic macros
-- AC_CACHE_CHECK([for C99 variadic macros],
-- [ac_cv_c99_variadic_macros],
-- [AC_TRY_COMPILE(
-- [#include <stdio.h>
-- #define MSG(...) fprintf(stderr, __VA_ARGS__)
-- ],
-- [MSG("foo");
-- MSG("%s", "foo");
-- MSG("%s%d", "foo", 1);],
-- ac_cv_c99_variadic_macros=yes,
-- ac_cv_c99_variadic_macros=no)])
-- if test "x${ac_cv_c99_variadic_macros}" != "xyes"; then
-- AC_MSG_ERROR([A compiler supporting C99 variadic macros is required])
-- fi
--])
--
--# Check C99-style variable-sized arrays (required):
--#
--# char concat_str[strlen(s1) + strlen(s2) + 1];
--#
--AC_DEFUN([AC_C99_VARIABLE_ARRAYS],
--[
-- dnl Check for variable arrays
-- AC_CACHE_CHECK([for C99 variable arrays],
-- [ac_cv_c99_variable_arrays],
-- [AC_TRY_COMPILE(
-- [],
-- [char *s1 = "foo", *s2 = "bar";
-- char s3[strlen(s1) + strlen(s2) + 1];
-- sprintf(s3, "%s%s", s1, s2);],
-- ac_cv_c99_variable_arrays=yes,
-- ac_cv_c99_variable_arrays=no)])
-- if test "x${ac_cv_c99_variable_arrays}" != "xyes"; then
-- AC_MSG_ERROR([A compiler supporting C99 variable arrays is required])
-- fi
--])
-+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-+AC_SUBST([INSTALL_STRIP_PROGRAM])])
-
--# Check C99-style initializers (required):
-+# Copyright (C) 2006 Free Software Foundation, Inc.
- #
--# Examples:
--# struct timeval tv = {.tv_sec = 0, .tv_usec = 500000};
--# int fibonacci[6] = {[0] = 0, [1] = 1, [2] = 1, [3] = 2, [4] = 3, [5] = 5};
--# Note we do not check for multi-field initializers like
--# struct { struct { int b; } a; } = {.a.b = 5}
--# which are not supported by many compilers. It is best to avoid this
--# problem by writing these using nesting. The above case becomes
--# struct { struct { int b; } a; } = {.a = {.b = 5}}
--AC_DEFUN([AC_C99_INITIALIZERS],
--[
-- dnl Check for C99 initializers
-- AC_CACHE_CHECK([for C99 initializers],
-- [ac_cv_c99_initializers],
-- [AC_TRY_COMPILE(
-- [struct foo {
-- int an_integer;
-- char *a_string;
-- int an_array[5];
-- union {int x, y;} a_union;
-- };
-- ],
-- [struct foo bar = {.an_array = {0, [3] = 2, [2] = 1, [4] = 3},
-- .an_integer = 999,
-- .a_string = "does it work?",
-- .a_union = {.y = 243}};],
-- [ac_cv_c99_initializers=yes],
-- [ac_cv_c99_initializers=no])])
-- if test "${ac_cv_c99_initializers}" != "yes"; then
-- AC_MSG_ERROR([A compiler supporting C99 initializers is required])
-- fi
--])
--
--# Check C99-style stdint.h (required)
--AC_DEFUN([AC_C99_STDINT_H],
--[
-- AC_CHECK_HEADERS([stdint.h])
-- dnl Check for C99 stdint.h
-- AC_CACHE_CHECK([for C99 stdint.h],
-- [ac_cv_c99_stdint_h],
-- [ac_cv_c99_stdint_h=$ac_cv_header_stdint_h])
-- if test "${ac_cv_c99_stdint_h}" != "yes"; then
-- AC_MSG_ERROR([A compiler supporting C99's stdint.h is required])
-- fi
--])
--
--# Try to configure the GTK+-2.0 client (gui-gtk-2.0)
--
--# FC_GTK_CLIENT
--# Test for GTK+-2.0 libraries needed for gui-gtk-2.0
--
--AC_DEFUN([FC_GTK2_CLIENT],
--[
-- if test "$client" = "gtk-2.0" || test "$client" = yes ; then
-- AM_PATH_GTK_2_0(2.4.0,
-- [
-- client="gtk-2.0"
-- CLIENT_CFLAGS="$GTK_CFLAGS"
-- CLIENT_LIBS="$GTK_LIBS"
-- if test x"$MINGW32" = "xyes"; then
-- dnl Required to compile gtk2 on Windows platform
-- CFLAGS="$CFLAGS -mms-bitfields"
-- CLIENT_LDFLAGS="$LDFLAGS -mwindows"
-- fi
-- ],
-- [
-- FC_NO_CLIENT([gtk-2.0], [GTK+-2.0 libraries not found])
-- ])
-- fi
--])
--
--# Configure paths for GTK+
--# Owen Taylor 1997-2001
--
--dnl AM_PATH_GTK_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
--dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES,
--dnl pass to pkg-config
--dnl
--AC_DEFUN([AM_PATH_GTK_2_0],
--[dnl
--dnl Get the cflags and libraries from pkg-config
--dnl
--AC_ARG_ENABLE(gtktest, [ --disable-gtktest do not try to compile and run a test GTK+ program],
-- , enable_gtktest=yes)
--
-- pkg_config_args=gtk+-2.0
-- for module in . $4
-- do
-- case "$module" in
-- gthread)
-- pkg_config_args="$pkg_config_args gthread-2.0"
-- ;;
-- esac
-- done
--
-- no_gtk=""
--
-- AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
--
-- if test x$PKG_CONFIG != xno ; then
-- if pkg-config --atleast-pkgconfig-version 0.7 ; then
-- :
-- else
-- echo *** pkg-config too old; version 0.7 or better required.
-- no_gtk=yes
-- PKG_CONFIG=no
-- fi
-- else
-- no_gtk=yes
-- fi
--
-- min_gtk_version=ifelse([$1], ,2.0.0,$1)
-- AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version)
--
-- if test x$PKG_CONFIG != xno ; then
-- ## don't try to run the test against uninstalled libtool libs
-- if $PKG_CONFIG --uninstalled $pkg_config_args; then
-- echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH"
-- enable_gtktest=no
-- fi
--
-- if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then
-- :
-- else
-- no_gtk=yes
-- fi
-- fi
--
-- if test x"$no_gtk" = x ; then
-- GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags`
-- GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs`
-- gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
-- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-- gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
-- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-- gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
-- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-- if test "x$enable_gtktest" = "xyes" ; then
-- ac_save_CFLAGS="$CFLAGS"
-- ac_save_LIBS="$LIBS"
-- CFLAGS="$CFLAGS $GTK_CFLAGS"
-- LIBS="$GTK_LIBS $LIBS"
--dnl
--dnl Now check if the installed GTK+ is sufficiently new. (Also sanity
--dnl checks the results of pkg-config to some extent)
--dnl
-- rm -f conf.gtktest
-- AC_TRY_RUN([
--#include <gtk/gtk.h>
--#include <stdio.h>
--#include <stdlib.h>
--
--int
--main ()
--{
-- int major, minor, micro;
-- char *tmp_version;
--
-- system ("touch conf.gtktest");
--
-- /* HP/UX 9 (%@#!) writes to sscanf strings */
-- tmp_version = g_strdup("$min_gtk_version");
-- if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
-- printf("%s, bad version string\n", "$min_gtk_version");
-- exit(1);
-- }
--
-- if ((gtk_major_version != $gtk_config_major_version) ||
-- (gtk_minor_version != $gtk_config_minor_version) ||
-- (gtk_micro_version != $gtk_config_micro_version))
-- {
-- printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
-- $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
-- gtk_major_version, gtk_minor_version, gtk_micro_version);
-- printf ("*** was found! If pkg-config was correct, then it is best\n");
-- printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
-- printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-- printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-- printf("*** required on your system.\n");
-- printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
-- printf("*** to point to the correct configuration files\n");
-- }
-- else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
-- (gtk_minor_version != GTK_MINOR_VERSION) ||
-- (gtk_micro_version != GTK_MICRO_VERSION))
-- {
-- printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
-- GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
-- printf("*** library (version %d.%d.%d)\n",
-- gtk_major_version, gtk_minor_version, gtk_micro_version);
-- }
-- else
-- {
-- if ((gtk_major_version > major) ||
-- ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
-- ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
-- {
-- return 0;
-- }
-- else
-- {
-- printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
-- gtk_major_version, gtk_minor_version, gtk_micro_version);
-- printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
-- major, minor, micro);
-- printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
-- printf("***\n");
-- printf("*** If you have already installed a sufficiently new version, this error\n");
-- printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
-- printf("*** being found. The easiest way to fix this is to remove the old version\n");
-- printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n");
-- printf("*** correct copy of pkg-config. (In this case, you will have to\n");
-- printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-- printf("*** so that the correct libraries are found at run-time))\n");
-- }
-- }
-- return 1;
--}
--],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-- CFLAGS="$ac_save_CFLAGS"
-- LIBS="$ac_save_LIBS"
-- fi
-- fi
-- if test "x$no_gtk" = x ; then
-- AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version))
-- ifelse([$2], , :, [$2])
-- else
-- AC_MSG_RESULT(no)
-- if test "$PKG_CONFIG" = "no" ; then
-- echo "*** A new enough version of pkg-config was not found."
-- echo "*** See http://pkgconfig.sourceforge.net"
-- else
-- if test -f conf.gtktest ; then
-- :
-- else
-- echo "*** Could not run GTK+ test program, checking why..."
-- ac_save_CFLAGS="$CFLAGS"
-- ac_save_LIBS="$LIBS"
-- CFLAGS="$CFLAGS $GTK_CFLAGS"
-- LIBS="$LIBS $GTK_LIBS"
-- AC_TRY_LINK([
--#include <gtk/gtk.h>
--#include <stdio.h>
--], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
-- [ echo "*** The test program compiled, but did not run. This usually means"
-- echo "*** that the run-time linker is not finding GTK+ or finding the wrong"
-- echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your"
-- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-- echo "*** to the installed location Also, make sure you have run ldconfig if that"
-- echo "*** is required on your system"
-- echo "***"
-- echo "*** If you have an old version installed, it is best to remove it, although"
-- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
-- [ echo "*** The test program failed to compile or link. See the file config.log for the"
-- echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."])
-- CFLAGS="$ac_save_CFLAGS"
-- LIBS="$ac_save_LIBS"
-- fi
-- fi
-- GTK_CFLAGS=""
-- GTK_LIBS=""
-- ifelse([$3], , :, [$3])
-- fi
-- AC_SUBST(GTK_CFLAGS)
-- AC_SUBST(GTK_LIBS)
-- rm -f conf.gtktest
--])
--
--# Fail because a client wasn't found, if it was requested
--
--# FC_NO_CLIENT($which_client, $error_message)
--# The $1 client has failed its configure check; it cannot be compiled. This
--# simple macro will exit if this was the requested client, giving an error
--# message including $2. If this wasn't the specified client, it will do
--# nothing and configure should continue...
--
--AC_DEFUN([FC_NO_CLIENT],
--[
-- if test "$client" = "$1"; then
-- AC_MSG_ERROR([specified client '$1' not configurable ($2)])
-- fi
--])
--
--# Try to configure the SDL client (gui-sdl)
--
--dnl FC_SDL_CLIENT
--dnl Test for SDL and needed libraries for gui-sdl
--
--AC_DEFUN([FC_SDL_CLIENT],
--[
-- if test "$client" = yes; then
-- AC_MSG_WARN([Not checking for SDL; use --enable-client=sdl to enable])
-- elif test "$client" = sdl ; then
-- AM_PATH_SDL([1.1.4], [sdl_found="yes"], [sdl_found="no"])
-- if test "$sdl_found" = yes; then
-- ac_save_CPPFLAGS="$CPPFLAGS"
-- ac_save_CFLAGS="$CFLAGS"
-- ac_save_LIBS="$LIBS"
-- CPPFLAGS="$CPPFLAGS $SDL_CFLAGS"
-- CFLAGS="$CFLAGS $SDL_CFLAGS"
-- LIBS="$LIBS $SDL_LIBS"
-- AC_CHECK_LIB([SDL_image], [IMG_Load],
-- [sdl_image_found="yes"], [sdl_image_found="no"])
-- if test "$sdl_image_found" = "yes"; then
-- AC_CHECK_HEADER([SDL/SDL_image.h],
-- [sdl_image_h_found="yes"], [sdl_image_h_found="no"])
-- if test "$sdl_image_h_found" = yes; then
-- CPPFLAGS="$ac_save_CPPFLAGS"
-- CFLAGS="$ac_save_CFLAGS"
-- LIBS="$ac_save_LIBS"
-- AC_CHECK_FT2([2.1.3], [freetype_found="yes"],[freetype_found="no"])
-- if test "$freetype_found" = yes; then
-- CLIENT_CFLAGS="$SDL_CFLAGS $FT2_CFLAGS"
-- CLIENT_LIBS="-lSDL_image $SDL_LIBS $FT2_LIBS"
-- AC_DEFINE(SDL, 1, [SDL is used])
-- found_client=yes
-- elif test "$client" = "sdl"; then
-- AC_MSG_ERROR([specified client 'sdl' not configurable (FreeType2 >= 2.1.3 is needed (www.freetype.org))])
-- fi
-- elif test "$client" = "sdl"; then
-- AC_MSG_ERROR([specified client 'sdl' not configurable (SDL_image-devel is needed (www.libsdl.org))])
-- fi
-- elif test "$client" = "sdl"; then
-- AC_MSG_ERROR([specified client 'sdl' not configurable (SDL_image is needed (www.libsdl.org))])
-- fi
-- fi
--
-- if test "$found_client" = yes; then
-- client=sdl
--
-- dnl Check for libiconv (which is usually included in glibc, but may
-- dnl be distributed separately).
-- AM_ICONV
-- AM_LIBCHARSET
-- AM_LANGINFO_CODESET
-- CLIENT_LIBS="$LIBICONV $CLIENT_LIBS"
--
-- dnl Check for some other libraries - needed under BeOS for instance.
-- dnl These should perhaps be checked for in all cases?
-- AC_CHECK_LIB(socket, connect, CLIENT_LIBS="-lsocket $CLIENT_LIBS")
-- AC_CHECK_LIB(bind, gethostbyaddr, CLIENT_LIBS="-lbind $CLIENT_LIBS")
--
-- elif test "$client" = "sdl"; then
-- AC_MSG_ERROR([specified client 'sdl' not configurable (SDL >= 1.1.4 is needed (www.libsdl.org))])
-- fi
-- fi
--])
--
--# Configure paths for SDL
--# Sam Lantinga 9/21/99
--# stolen from Manish Singh
--# stolen back from Frank Belew
--# stolen from Manish Singh
--# Shamelessly stolen from Owen Taylor
--# Taken to Freeciv from SDL release 1.2.12
--
--dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
--dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
--dnl
--AC_DEFUN([AM_PATH_SDL],
--[dnl
--dnl Get the cflags and libraries from the sdl-config script
--dnl
--AC_ARG_WITH(sdl-prefix,[ --with-sdl-prefix=PFX Prefix where SDL is installed (optional)],
-- sdl_prefix="$withval", sdl_prefix="")
--AC_ARG_WITH(sdl-exec-prefix,[ --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)],
-- sdl_exec_prefix="$withval", sdl_exec_prefix="")
--AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run a test SDL program],
-- , enable_sdltest=yes)
--
-- if test x$sdl_exec_prefix != x ; then
-- sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
-- if test x${SDL_CONFIG+set} != xset ; then
-- SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
-- fi
-- fi
-- if test x$sdl_prefix != x ; then
-- sdl_args="$sdl_args --prefix=$sdl_prefix"
-- if test x${SDL_CONFIG+set} != xset ; then
-- SDL_CONFIG=$sdl_prefix/bin/sdl-config
-- fi
-- fi
--
-- if test "x$prefix" != xNONE; then
-- PATH="$prefix/bin:$prefix/usr/bin:$PATH"
-- fi
-- AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH])
-- min_sdl_version=ifelse([$1], ,0.11.0,$1)
-- AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
-- no_sdl=""
-- if test "$SDL_CONFIG" = "no" ; then
-- no_sdl=yes
-- else
-- SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags`
-- SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs`
--
-- sdl_major_version=`$SDL_CONFIG $sdl_args --version | \
-- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-- sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \
-- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-- sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
-- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-- if test "x$enable_sdltest" = "xyes" ; then
-- ac_save_CFLAGS="$CFLAGS"
-- ac_save_CXXFLAGS="$CXXFLAGS"
-- ac_save_LIBS="$LIBS"
-- CFLAGS="$CFLAGS $SDL_CFLAGS"
-- CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
-- LIBS="$LIBS $SDL_LIBS"
--dnl
--dnl Now check if the installed SDL is sufficiently new. (Also sanity
--dnl checks the results of sdl-config to some extent
--dnl
-- rm -f conf.sdltest
-- AC_TRY_RUN([
--#include <stdio.h>
--#include <stdlib.h>
--#include <string.h>
--#include "SDL.h"
--
--char*
--my_strdup (char *str)
--{
-- char *new_str;
--
-- if (str)
-- {
-- new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
-- strcpy (new_str, str);
-- }
-- else
-- new_str = NULL;
--
-- return new_str;
--}
--
--int main (int argc, char *argv[])
--{
-- int major, minor, micro;
-- char *tmp_version;
--
-- /* This hangs on some systems (?)
-- system ("touch conf.sdltest");
-- */
-- { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); }
--
-- /* HP/UX 9 (%@#!) writes to sscanf strings */
-- tmp_version = my_strdup("$min_sdl_version");
-- if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
-- printf("%s, bad version string\n", "$min_sdl_version");
-- exit(1);
-- }
--
-- if (($sdl_major_version > major) ||
-- (($sdl_major_version == major) && ($sdl_minor_version > minor)) ||
-- (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro)))
-- {
-- return 0;
-- }
-- else
-- {
-- printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
-- printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro);
-- printf("*** best to upgrade to the required version.\n");
-- printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n");
-- printf("*** to point to the correct copy of sdl-config, and remove the file\n");
-- printf("*** config.cache before re-running configure\n");
-- return 1;
-- }
--}
--
--],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-- CFLAGS="$ac_save_CFLAGS"
-- CXXFLAGS="$ac_save_CXXFLAGS"
-- LIBS="$ac_save_LIBS"
-- fi
-- fi
-- if test "x$no_sdl" = x ; then
-- AC_MSG_RESULT(yes)
-- ifelse([$2], , :, [$2])
-- else
-- AC_MSG_RESULT(no)
-- if test "$SDL_CONFIG" = "no" ; then
-- echo "*** The sdl-config script installed by SDL could not be found"
-- echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
-- echo "*** your path, or set the SDL_CONFIG environment variable to the"
-- echo "*** full path to sdl-config."
-- else
-- if test -f conf.sdltest ; then
-- :
-- else
-- echo "*** Could not run SDL test program, checking why..."
-- CFLAGS="$CFLAGS $SDL_CFLAGS"
-- CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
-- LIBS="$LIBS $SDL_LIBS"
-- AC_TRY_LINK([
--#include <stdio.h>
--#include "SDL.h"
--
--int main(int argc, char *argv[])
--{ return 0; }
--#undef main
--#define main K_and_R_C_main
--], [ return 0; ],
-- [ echo "*** The test program compiled, but did not run. This usually means"
-- echo "*** that the run-time linker is not finding SDL or finding the wrong"
-- echo "*** version of SDL. If it is not finding SDL, you'll need to set your"
-- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-- echo "*** to the installed location Also, make sure you have run ldconfig if that"
-- echo "*** is required on your system"
-- echo "***"
-- echo "*** If you have an old version installed, it is best to remove it, although"
-- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
-- [ echo "*** The test program failed to compile or link. See the file config.log for the"
-- echo "*** exact error that occured. This usually means SDL was incorrectly installed"
-- echo "*** or that you have moved SDL since it was installed. In the latter case, you"
-- echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ])
-- CFLAGS="$ac_save_CFLAGS"
-- CXXFLAGS="$ac_save_CXXFLAGS"
-- LIBS="$ac_save_LIBS"
-- fi
-- fi
-- SDL_CFLAGS=""
-- SDL_LIBS=""
-- ifelse([$3], , :, [$3])
-- fi
-- AC_SUBST(SDL_CFLAGS)
-- AC_SUBST(SDL_LIBS)
-- rm -f conf.sdltest
--])
--
--# Configure paths for FreeType2
--# Marcelo Magallon 2001-10-26, based on gtk.m4 by Owen Taylor
--
--dnl AC_CHECK_FT2([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
--dnl Test for FreeType2, and define FT2_CFLAGS and FT2_LIBS
--dnl
--AC_DEFUN([AC_CHECK_FT2],
--[dnl
--dnl Get the cflags and libraries from the freetype-config script
--dnl
--AC_ARG_WITH(ft-prefix,
--[ --with-ft-prefix=PREFIX
-- Prefix where FreeType is installed (optional)],
-- ft_config_prefix="$withval", ft_config_prefix="")
--AC_ARG_WITH(ft-exec-prefix,
--[ --with-ft-exec-prefix=PREFIX
-- Exec prefix where FreeType is installed (optional)],
-- ft_config_exec_prefix="$withval", ft_config_exec_prefix="")
--AC_ARG_ENABLE(freetypetest,
--[ --disable-freetypetest Do not try to compile and run
-- a test FreeType program],
-- [], enable_fttest=yes)
--
--if test x$ft_config_exec_prefix != x ; then
-- ft_config_args="$ft_config_args --exec-prefix=$ft_config_exec_prefix"
-- if test x${FT2_CONFIG+set} != xset ; then
-- FT2_CONFIG=$ft_config_exec_prefix/bin/freetype-config
-- fi
--fi
--if test x$ft_config_prefix != x ; then
-- ft_config_args="$ft_config_args --prefix=$ft_config_prefix"
-- if test x${FT2_CONFIG+set} != xset ; then
-- FT2_CONFIG=$ft_config_prefix/bin/freetype-config
-- fi
--fi
--AC_PATH_PROG(FT2_CONFIG, freetype-config, no)
--
--min_ft_version=ifelse([$1], ,6.1.0,$1)
--AC_MSG_CHECKING(for FreeType - version >= $min_ft_version)
--no_ft=""
--if test "$FT2_CONFIG" = "no" ; then
-- no_ft=yes
--else
-- FT2_CFLAGS=`$FT2_CONFIG $ft_config_args --cflags`
-- FT2_LIBS=`$FT2_CONFIG $ft_config_args --libs`
-- ft_config_major_version=`$FT2_CONFIG $ft_config_args --version | \
-- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-- ft_config_minor_version=`$FT2_CONFIG $ft_config_args --version | \
-- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-- ft_config_micro_version=`$FT2_CONFIG $ft_config_args --version | \
-- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-- ft_min_major_version=`echo $min_ft_version | \
-- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-- ft_min_minor_version=`echo $min_ft_version | \
-- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-- ft_min_micro_version=`echo $min_ft_version | \
-- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-- if test x$enable_fttest = xyes ; then
-- ft_config_is_lt=""
-- if test $ft_config_major_version -lt $ft_min_major_version ; then
-- ft_config_is_lt=yes
-- else
-- if test $ft_config_major_version -eq $ft_min_major_version ; then
-- if test $ft_config_minor_version -lt $ft_min_minor_version ; then
-- ft_config_is_lt=yes
-- else
-- if test $ft_config_minor_version -eq $ft_min_minor_version ; then
-- if test $ft_config_micro_version -lt $ft_min_micro_version ; then
-- ft_config_is_lt=yes
-- fi
-- fi
-- fi
-- fi
-- fi
-- if test x$ft_config_is_lt = xyes ; then
-- no_ft=yes
-- else
-- ac_save_CFLAGS="$CFLAGS"
-- ac_save_LIBS="$LIBS"
-- CFLAGS="$CFLAGS $FT2_CFLAGS"
-- LIBS="$FT2_LIBS $LIBS"
--dnl
--dnl Sanity checks for the results of freetype-config to some extent
--dnl
-- AC_TRY_RUN([
--#include <ft2build.h>
--#include FT_FREETYPE_H
--#include <stdio.h>
--#include <stdlib.h>
--
--int
--main()
--{
-- FT_Library library;
-- FT_Error error;
--
-- error = FT_Init_FreeType(&library);
--
-- if (error)
-- return 1;
-- else
-- {
-- FT_Done_FreeType(library);
-- return 0;
-- }
--}
--],, no_ft=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-- CFLAGS="$ac_save_CFLAGS"
-- LIBS="$ac_save_LIBS"
-- fi # test $ft_config_version -lt $ft_min_version
-- fi # test x$enable_fttest = xyes
--fi # test "$FT2_CONFIG" = "no"
--if test x$no_ft = x ; then
-- AC_MSG_RESULT(yes)
-- ifelse([$2], , :, [$2])
--else
-- AC_MSG_RESULT(no)
-- if test "$FT2_CONFIG" = "no" ; then
-- echo "*** The freetype-config script installed by FreeType 2 could not be found."
-- echo "*** If FreeType 2 was installed in PREFIX, make sure PREFIX/bin is in"
-- echo "*** your path, or set the FT2_CONFIG environment variable to the"
-- echo "*** full path to freetype-config."
-- else
-- if test x$ft_config_is_lt = xyes ; then
-- echo "*** Your installed version of the FreeType 2 library is too old."
-- echo "*** If you have different versions of FreeType 2, make sure that"
-- echo "*** correct values for --with-ft-prefix or --with-ft-exec-prefix"
-- echo "*** are used, or set the FT2_CONFIG environment variable to the"
-- echo "*** full path to freetype-config."
-- else
-- echo "*** The FreeType test program failed to run. If your system uses"
-- echo "*** shared libraries and they are installed outside the normal"
-- echo "*** system library path, make sure the variable LD_LIBRARY_PATH"
-- echo "*** (or whatever is appropiate for your system) is correctly set."
-- fi
-- fi
-- FT2_CFLAGS=""
-- FT2_LIBS=""
-- ifelse([$3], , :, [$3])
--fi
--AC_SUBST(FT2_CFLAGS)
--AC_SUBST(FT2_LIBS)
--])
--
--# Try to configure the XAW client (gui-xaw)
--
--# FC_XAW_CLIENT
--# Test for X and XAW libraries needed for gui-xaw
--
--AC_DEFUN([FC_XAW_CLIENT],
--[
-- if test "$client" = yes ; then
-- AC_MSG_WARN([Not checking for XAW; use --enable-client=xaw to enable])
-- elif test "$client" = xaw ; then
-- dnl Checks for X:
-- AC_PATH_XTRA
--
-- dnl Determine the Xfuncproto control definitions:
-- FC_CHECK_X_PROTO_DEFINE(FUNCPROTO)
-- if test -n "$fc_x_proto_value"; then
-- AC_DEFINE_UNQUOTED(FUNCPROTO, $fc_x_proto_value, [Xfuncproto])
-- fi
-- FC_CHECK_X_PROTO_DEFINE(NARROWPROTO)
-- if test -n "$fc_x_proto_value"; then
-- AC_DEFINE_UNQUOTED(NARROWPROTO, $fc_x_proto_value, [Narrowproto])
-- fi
--
-- dnl Check for libpng
-- PKG_CHECK_MODULES([PNG], [libpng],
-- [
-- X_LIBS="$X_LIBS $PNG_LIBS"
-- X_CFLAGS="$X_CFLAGS $PNG_CFLAGS"
-- ],
-- [
-- AC_CHECK_LIB([png12], [png_read_image], [X_LIBS="$X_LIBS -lpng12 -lm"],
-- [
-- AC_CHECK_LIB([png], [png_read_image], [X_LIBS="$X_LIBS -lpng -lm"],
-- [
-- AC_MSG_ERROR([Could not find PNG library.])
-- ])
-- ])
-- AC_CHECK_HEADER([png.h],,
-- [
-- AC_MSG_ERROR([libpng found but not png.h.
--You may need to install a libpng \"development\" package.])
-- ])
-- ])
--
-- dnl Try to get additional Xpm paths:
-- FC_XPM_PATHS
--
-- if test "$xpm_incdir" != "no"; then
-- X_CFLAGS="$X_CFLAGS -I$xpm_incdir"
-- fi
-- if test "$xpm_libdir" != "no"; then
-- X_LIBS="$X_LIBS -L$xpm_libdir"
-- dnl Try using R values set in AC_PATH_XTRA:
-- if test "$ac_R_nospace" = "yes"; then
-- X_LIBS="$X_LIBS -R$xpm_libdir"
-- elif test "$ac_R_space" = "yes"; then
-- X_LIBS="$X_LIBS -R $xpm_libdir"
-- fi
-- dnl Some sites may put xpm.h in a directory whose parent isn't "X11"
-- if test "x$xpm_h_no_x11" = "xyes"; then
-- AC_DEFINE(XPM_H_NO_X11, 1, [XPM support])
-- fi
-- fi
--
-- dnl Checks for X libs:
-- fc_save_X_LIBS="$X_LIBS"
-- X_LIBS="$X_LIBS $X_PRE_LIBS"
-- FC_CHECK_X_LIB(X11, XOpenDisplay, , haveX11=no)
-- if test "x$haveX11" != "xno"; then
-- FC_CHECK_X_LIB(Xext, XShapeCombineMask)
--
-- dnl Insert X_PRE_LIBS (eg -lSM -lICE) into X_EXTRA_LIBS here:
-- X_EXTRA_LIBS="$X_PRE_LIBS $X_EXTRA_LIBS"
-- X_LIBS="$fc_save_X_LIBS"
--
-- FC_CHECK_X_LIB(Xt, main)
-- FC_CHECK_X_LIB(Xmu, main)
-- FC_CHECK_X_LIB(Xpm, XpmReadFileToPixmap, , haveXpm=no)
-- if test "x$haveXpm" != "xno"; then
-- dnl Xaw or Xaw3d:
-- if test -n "$WITH_XAW3D"; then
-- FC_CHECK_X_LIB(Xaw3d, main, , AC_MSG_ERROR(did not find Xaw3d library))
-- elif test "$client" = "xaw"; then
-- FC_CHECK_X_LIB(Xaw, main, , AC_MSG_ERROR(did not find Xaw library))
-- else
-- FC_CHECK_X_LIB(Xaw3d, main, , noXaw3d=1)
-- if test -n "$noXaw3d"; then
-- FC_CHECK_X_LIB(Xaw, main, ,
-- AC_MSG_ERROR(did not find either Xaw or Xaw3d library))
-- fi
-- fi
--
-- CLIENT_CFLAGS="$X_CFLAGS"
-- CLIENT_LIBS="$X_LIBS $X_EXTRA_LIBS"
--
-- found_client=yes
-- fi
-- fi
--
-- if test "x$found_client" = "xyes"; then
-- client=xaw
-- elif test "$client" = "xaw"; then
-- if test "x$haveXpm" = "xno"; then
-- AC_MSG_ERROR(specified client 'xaw' not configurable -- need Xpm library and development headers; perhaps try/adjust --with-xpm-lib)
-- else
-- AC_MSG_ERROR(specified client 'xaw' not configurable -- need X11 libraries and development headers; perhaps try/adjust --x-libraries)
-- fi
-- fi
-- fi
--])
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
-+# _AM_SUBST_NOTMAKE(VARIABLE)
-+# ---------------------------
-+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
-+# This macro is traced by Automake.
-+AC_DEFUN([_AM_SUBST_NOTMAKE])
-
--dnl FC_CHECK_X_LIB(LIBRARY, FUNCTION [, ACTION-IF-FOUND [,
--dnl ACTION-IF-NOT-FOUND]])
--dnl
--dnl This macro is intended to search for X11-related libraries. It takes the
--dnl following variables for input:
--dnl X_LIBS -- prefixed to all linker lines
--dnl X_EXTRA_LIBS -- suffixed to all linker lines
--dnl LIBS -- suffixed to all linker lines (after X_EXTRA_LIBS)
--dnl Thus, the trial linker line will be "$X_LIBS -l$1 $X_EXTRA_LIBS $LIBS".
--dnl
--dnl The following variables are output:
--dnl X_EXTRA_LIBS -- contains "-l$1 $X_EXTRA_LIBS" if the link succeeds
--dnl
--dnl Thus, the intended usage of this macro is something like this:
--dnl AC_PATH_XTRA
--dnl X_LIBS="$X_LIBS $X_PRE_LIBS"
--dnl dnl Is it just me or is AC_PATH_XTRA broken?
--dnl FC_CHECK_X_LIB(X11, XOpenDisplay, , AC_MSG_ERROR("Need X11"))
--dnl FC_CHECK_X_LIB(Xext, XShapeCombineMask)
--dnl [etc.]
--dnl LIBS="$X_LIBS $X_EXTRA_LIBS $LIBS"
--dnl
--AC_DEFUN([FC_CHECK_X_LIB], [
-- AC_MSG_CHECKING([for $2 in X library -l$1])
--
-- dnl Use a cache variable name containing both the library and function name,
-- dnl because the test really is for library $1 defining function $2, not
-- dnl just for library $1. Separate tests with the same $1 and different $2s
-- dnl may have different results.
--
-- ac_lib_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'`
-- AC_CACHE_VAL(ac_cv_lib_$ac_lib_var,
-- [ac_save_LIBS="$LIBS"
-- LIBS="$X_LIBS -l$1 $X_EXTRA_LIBS $LIBS"
-- AC_TRY_LINK(dnl
-- ifelse([$2], [main], ,
-- [#ifdef __cplusplus
-- extern "C"
-- #endif]
-- [/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
-- char $2();]
-- )
-- , [$2()],
-- eval "ac_cv_lib_$ac_lib_var=yes",
-- eval "ac_cv_lib_$ac_lib_var=no")
-- LIBS="$ac_save_LIBS"
-- ])dnl
-- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-- AC_MSG_RESULT(yes)
-- ifelse([$3], ,
-- [changequote(, )dnl
-- ac_tr_lib=HAVE_LIB`echo $1 | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-- changequote([, ])dnl
--
-- # The HAVE_LIBX** values are defined in FC_CHECK_X_LIB, but we need an
-- # AH_TEMPLATE for them so that autoheader will know about them.
-- AH_TEMPLATE([HAVE_LIBX11], [Define if the X11 lib is available])
-- AH_TEMPLATE([HAVE_LIBXEXT], [Define if the Xext lib is available])
-- AH_TEMPLATE([HAVE_LIBXT], [Define if the Xt lib is available])
-- AH_TEMPLATE([HAVE_LIBXMU], [Define if the Xmu lib is available])
-- AH_TEMPLATE([HAVE_LIBXPM], [Define if the Xpm lib is available])
-- AH_TEMPLATE([HAVE_LIBXAW], [Define if the Xaw lib is to be used])
-- AH_TEMPLATE([HAVE_LIBXAW3D], [Define if the Xaw3d lib is to be used])
-- if (test $ac_tr_lib == HAVE_LIBX11 \
-- || test $ac_tr_lib == HAVE_LIBXEXT \
-- || test $ac_tr_lib == HAVE_LIBXT \
-- || test $ac_tr_lib == HAVE_LIBXMU \
-- || test $ac_tr_lib == HAVE_LIBXPM \
-- || test $ac_tr_lib == HAVE_LIBXAW \
-- || test $ac_tr_lib == HAVE_LIBXAW3D); then
-- AC_DEFINE_UNQUOTED($ac_tr_lib)
-- X_EXTRA_LIBS="-l$1 $X_EXTRA_LIBS"
-- else
-- AC_MSG_ERROR([Invalid define of $ac_tr_lib in $1])
-- fi
-- ], [$3])
-- else
-- AC_MSG_RESULT(no)
-- ifelse([$4], , , [$4
-- ])dnl
-- fi
--])
-+# Check how to create a tarball. -*- Autoconf -*-
-
--dnl FC_EXPAND_DIR(VARNAME, DIR)
--dnl expands occurrences of ${prefix} and ${exec_prefix} in the given DIR,
--dnl and assigns the resulting string to VARNAME
--dnl example: FC_EXPAND_DIR(LOCALEDIR, "$datadir/locale")
--dnl eg, then: AC_DEFINE_UNQUOTED(LOCALEDIR, "$LOCALEDIR")
--dnl by Alexandre Oliva
--dnl from http://www.cygnus.com/ml/automake/1998-Aug/0040.html
--AC_DEFUN([FC_EXPAND_DIR], [
-- $1=$2
-- $1=`(
-- test "x$prefix" = xNONE && prefix="$ac_default_prefix"
-- test "x$exec_prefix" = xNONE && exec_prefix="${prefix}"
-- eval echo \""[$]$1"\"
-- )`
--])
-+# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
-+# serial 2
-
--dnl FC_XPM_PATHS
--dnl Allow user to specify extra include/lib paths for Xpm, with
--dnl --with-xpm=prefix --with-xpm-lib=dir --with-xpm-include=dir
--dnl The latter two override the prefix form.
--dnl Sets variables xpm_libdir and xpm_incdir
--dnl If user supplies a path, use that.
--dnl If user specifies "no", set that, meaning "no extra path"
--dnl If user specifies "yes" (default), then use /usr/local if it looks
--dnl likely, else set to "no".
--dnl Doesn't do any cache stuff.
--dnl
--AC_DEFUN([FC_XPM_PATHS],
--[AC_MSG_CHECKING(extra paths for Xpm)
--dnl General Xpm prefix:
--dnl "no" means no prefix is required, "yes" means try /usr/local
--AC_ARG_WITH(xpm-prefix,
-- [ --with-xpm-prefix=DIR Xpm files are in DIR/lib and DIR/include,
-- or use the following to set them separately:],
-- xpm_prefix="$withval",
-- xpm_prefix="yes"
--)
--if test "$xpm_prefix" = "yes" || test "$xpm_prefix" = "no"; then
-- xpm_libdir="$xpm_prefix"
-- xpm_incdir="$xpm_prefix"
--else
-- xpm_libdir="$xpm_prefix/lib"
-- xpm_incdir="$xpm_prefix/include"
--fi
--dnl May override general Xpm prefix with explicit individual paths:
--AC_ARG_WITH(xpm-lib,
-- [ --with-xpm-lib=DIR Xpm library is in DIR],
-- xpm_libdir="$withval"
--)
--AC_ARG_WITH(xpm-include,
-- [ --with-xpm-include=DIR Xpm header file is in DIR (that is, DIR/X11/xpm.h)],
-- xpm_incdir="$withval"
--)
--dnl If xpm-lib path was not specified, try /usr/local/lib if that
--dnl looks likely; we don't actually try to link.
--fc_xpm_default=/usr/local
--if test "$xpm_libdir" = "yes"; then
-- xpm_libdir="no"
-- fc_xpm_default_lib="$fc_xpm_default/lib"
-- for fc_extension in a so sl; do
-- if test -r $fc_xpm_default_lib/libXpm.$fc_extension; then
-- xpm_libdir=$fc_xpm_default_lib
-- break
-- fi
-+# _AM_PROG_TAR(FORMAT)
-+# --------------------
-+# Check how to create a tarball in format FORMAT.
-+# FORMAT should be one of `v7', `ustar', or `pax'.
-+#
-+# Substitute a variable $(am__tar) that is a command
-+# writing to stdout a FORMAT-tarball containing the directory
-+# $tardir.
-+# tardir=directory && $(am__tar) > result.tar
-+#
-+# Substitute a variable $(am__untar) that extract such
-+# a tarball read from stdin.
-+# $(am__untar) < result.tar
-+AC_DEFUN([_AM_PROG_TAR],
-+[# Always define AMTAR for backward compatibility.
-+AM_MISSING_PROG([AMTAR], [tar])
-+m4_if([$1], [v7],
-+ [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
-+ [m4_case([$1], [ustar],, [pax],,
-+ [m4_fatal([Unknown tar format])])
-+AC_MSG_CHECKING([how to create a $1 tar archive])
-+# Loop over all known methods to create a tar archive until one works.
-+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-+_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-+# Do not fold the above two line into one, because Tru64 sh and
-+# Solaris sh will not grok spaces in the rhs of `-'.
-+for _am_tool in $_am_tools
-+do
-+ case $_am_tool in
-+ gnutar)
-+ for _am_tar in tar gnutar gtar;
-+ do
-+ AM_RUN_LOG([$_am_tar --version]) && break
- done
--fi
--dnl Likewise for xpm-include with /usr/local/include;
--dnl we don't actually try to include.
--if test "$xpm_incdir" = "yes"; then
-- xpm_incdir="no"
-- fc_xpm_default_inc="$fc_xpm_default/include"
-- if test -r $fc_xpm_default_inc/X11/xpm.h; then
-- xpm_incdir=$fc_xpm_default_inc
-- elif test -r $fc_xpm_default_inc/xpm.h; then
-- xpm_incdir=$fc_xpm_default_inc
-- xpm_h_no_x11=yes
-- fi
--fi
--AC_MSG_RESULT([library $xpm_libdir, include $xpm_incdir])
--])
--
-+ am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-+ am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-+ am__untar="$_am_tar -xf -"
-+ ;;
-+ plaintar)
-+ # Must skip GNU tar: if it does not support --format= it doesn't create
-+ # ustar tarball either.
-+ (tar --version) >/dev/null 2>&1 && continue
-+ am__tar='tar chf - "$$tardir"'
-+ am__tar_='tar chf - "$tardir"'
-+ am__untar='tar xf -'
-+ ;;
-+ pax)
-+ am__tar='pax -L -x $1 -w "$$tardir"'
-+ am__tar_='pax -L -x $1 -w "$tardir"'
-+ am__untar='pax -r'
-+ ;;
-+ cpio)
-+ am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-+ am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-+ am__untar='cpio -i -H $1 -d'
-+ ;;
-+ none)
-+ am__tar=false
-+ am__tar_=false
-+ am__untar=false
-+ ;;
-+ esac
-+
-+ # If the value was cached, stop now. We just wanted to have am__tar
-+ # and am__untar set.
-+ test -n "${am_cv_prog_tar_$1}" && break
-
--dnl FC_CHECK_X_PROTO_DEFINE(DEFINED-VARIABLE)
--dnl
--dnl This macro determines the value of the given defined
--dnl variable needed by Xfuncproto.h in order to compile correctly.
--dnl
--dnl Typical DEFINED-VARIABLEs are:
--dnl FUNCPROTO
--dnl NARROWPROTO
--dnl
--dnl The following variables are output:
--dnl fc_x_proto_value -- contains the value to which
--dnl the DEFINED-VARIABLE is set,
--dnl or "" if it has no known value.
--dnl
--dnl Example use:
--dnl FC_CHECK_X_PROTO_DEFINE(FUNCPROTO)
--dnl if test -n "$fc_x_proto_value"; then
--dnl AC_DEFINE_UNQUOTED(FUNCPROTO, $fc_x_proto_value)
--dnl fi
--dnl
--AC_DEFUN([FC_CHECK_X_PROTO_DEFINE],
--[AC_REQUIRE([FC_CHECK_X_PROTO_FETCH])dnl
--AC_MSG_CHECKING(for Xfuncproto control definition $1)
--# Search for the requested defined variable; return it's value:
--fc_x_proto_value=
--for fc_x_define in $fc_x_proto_defines; do
-- fc_x_val=1
-- eval `echo $fc_x_define | sed -e 's/=/ ; fc_x_val=/' | sed -e 's/^/fc_x_var=/'`
-- if test "x$fc_x_var" = "x$1"; then
-- fc_x_proto_value=$fc_x_val
-- break
-+ # tar/untar a dummy directory, and stop if the command works
-+ rm -rf conftest.dir
-+ mkdir conftest.dir
-+ echo GrepMe > conftest.dir/file
-+ AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
-+ rm -rf conftest.dir
-+ if test -s conftest.tar; then
-+ AM_RUN_LOG([$am__untar <conftest.tar])
-+ grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
- fi
- done
--if test -n "$fc_x_proto_value"; then
-- AC_MSG_RESULT([yes: $fc_x_proto_value])
--else
-- AC_MSG_RESULT([no])
--fi
--])
--
--dnl FC_CHECK_X_PROTO_FETCH
--dnl
--dnl This macro fetches the Xfuncproto control definitions.
--dnl (Intended to be called once from FC_CHECK_X_PROTO_DEFINE.)
--dnl
--dnl The following variables are output:
--dnl fc_x_proto_defines -- contains the list of defines of
--dnl Xfuncproto control definitions
--dnl (defines may or may not include
--dnl the -D prefix, or an =VAL part).
--dnl
--dnl Example use:
--dnl AC_REQUIRE([FC_CHECK_X_PROTO_FETCH])
--dnl
--AC_DEFUN([FC_CHECK_X_PROTO_FETCH],
--[AC_REQUIRE([AC_PATH_X])dnl
--AC_MSG_CHECKING(whether Xfuncproto was supplied)
--dnl May override determined defines with explicit argument:
--AC_ARG_WITH(x-funcproto,
-- [ --with-x-funcproto=DEFS Xfuncproto control definitions are DEFS
-- (e.g.: --with-x-funcproto='FUNCPROTO=15 NARROWPROTO']dnl
--)
--if test "x$with_x_funcproto" = "x"; then
-- fc_x_proto_defines=
-- rm -fr conftestdir
-- if mkdir conftestdir; then
-- cd conftestdir
-- # Make sure to not put "make" in the Imakefile rules, since we grep it out.
-- cat > Imakefile <<'EOF'
--fcfindpd:
-- @echo 'fc_x_proto_defines=" ${PROTO_DEFINES}"'
--EOF
-- if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
-- # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-- eval `${MAKE-make} fcfindpd 2>/dev/null | grep -v make | sed -e 's/ -D/ /g'`
-- AC_MSG_RESULT([no, found: $fc_x_proto_defines])
-- cd ..
-- rm -fr conftestdir
-- else
-- dnl Oops -- no/bad xmkmf... Time to go a-guessing...
-- AC_MSG_RESULT([no])
-- cd ..
-- rm -fr conftestdir
-- dnl First, guess something for FUNCPROTO:
-- AC_MSG_CHECKING([for compilable FUNCPROTO definition])
-- dnl Try in order of preference...
-- for fc_x_value in 15 11 3 1 ""; do
-- FC_CHECK_X_PROTO_FUNCPROTO_COMPILE($fc_x_value)
-- if test "x$fc_x_proto_FUNCPROTO" != "xno"; then
-- break
-- fi
-- done
-- if test "x$fc_x_proto_FUNCPROTO" != "xno"; then
-- fc_x_proto_defines="$fc_x_proto_defines FUNCPROTO=$fc_x_proto_FUNCPROTO"
-- AC_MSG_RESULT([yes, determined: $fc_x_proto_FUNCPROTO])
-- else
-- AC_MSG_RESULT([no, cannot determine])
-- fi
-- dnl Second, guess something for NARROWPROTO:
-- AC_MSG_CHECKING([for workable NARROWPROTO definition])
-- dnl Try in order of preference...
-- for fc_x_value in 1 ""; do
-- FC_CHECK_X_PROTO_NARROWPROTO_WORKS($fc_x_value)
-- if test "x$fc_x_proto_NARROWPROTO" != "xno"; then
-- break
-- fi
-- done
-- if test "x$fc_x_proto_NARROWPROTO" != "xno"; then
-- fc_x_proto_defines="$fc_x_proto_defines NARROWPROTO=$fc_x_proto_NARROWPROTO"
-- AC_MSG_RESULT([yes, determined: $fc_x_proto_NARROWPROTO])
-- else
-- AC_MSG_RESULT([no, cannot determine])
-- fi
-- AC_MSG_CHECKING(whether Xfuncproto was determined)
-- if test -n "$fc_x_proto_defines"; then
-- AC_MSG_RESULT([yes: $fc_x_proto_defines])
-- else
-- AC_MSG_RESULT([no])
-- fi
-- fi
-- else
-- AC_MSG_RESULT([no, examination failed])
-- fi
--else
-- fc_x_proto_defines=$with_x_funcproto
-- AC_MSG_RESULT([yes, given: $fc_x_proto_defines])
--fi
--])
--
--dnl FC_CHECK_X_PROTO_FUNCPROTO_COMPILE(FUNCPROTO-VALUE)
--dnl
--dnl This macro determines whether or not Xfuncproto.h will
--dnl compile given a value to use for the FUNCPROTO definition.
--dnl
--dnl Typical FUNCPROTO-VALUEs are:
--dnl 15, 11, 3, 1, ""
--dnl
--dnl The following variables are output:
--dnl fc_x_proto_FUNCPROTO -- contains the passed-in
--dnl FUNCPROTO-VALUE if Xfuncproto.h
--dnl compiled, or "no" if it did not.
--dnl
--dnl Example use:
--dnl FC_CHECK_X_PROTO_FUNCPROTO_COMPILE($fc_x_value)
--dnl if test "x$fc_x_proto_FUNCPROTO" != "xno"; then
--dnl echo Compile using FUNCPROTO=$fc_x_proto_FUNCPROTO
--dnl fi
--dnl
--AC_DEFUN([FC_CHECK_X_PROTO_FUNCPROTO_COMPILE],
--[AC_REQUIRE([AC_PATH_XTRA])dnl
--AC_LANG_SAVE
--AC_LANG_C
--fc_x_proto_FUNCPROTO=no
--if test "x$1" = "x"; then
-- fc_x_compile="#undef FUNCPROTO"
--else
-- fc_x_compile="#define FUNCPROTO $1"
--fi
--fc_x_save_CFLAGS="$CFLAGS"
--CFLAGS="$CFLAGS $X_CFLAGS"
--AC_TRY_COMPILE([
--$fc_x_compile
--#include <X11/Xfuncproto.h>
-- ],[
--exit (0)
-- ],
-- [fc_x_proto_FUNCPROTO=$1])
--CFLAGS="$fc_x_save_CFLAGS"
--AC_LANG_RESTORE
--])
--
--dnl FC_CHECK_X_PROTO_NARROWPROTO_WORKS(NARROWPROTO-VALUE)
--dnl
--dnl This macro determines whether or not NARROWPROTO is required
--dnl to get a typical X function (XawScrollbarSetThumb) to work.
--dnl
--dnl Typical NARROWPROTO-VALUEs are:
--dnl 1, ""
--dnl
--dnl The following variables are required for input:
--dnl fc_x_proto_FUNCPROTO -- the value to use for FUNCPROTO.
--dnl
--dnl The following variables are output:
--dnl fc_x_proto_NARROWPROTO -- contains the passed-in
--dnl NARROWPROTO-VALUE if the test
--dnl worked, or "no" if it did not.
--dnl
--dnl Example use:
--dnl FC_CHECK_X_PROTO_NARROWPROTO_WORKS($fc_x_value)
--dnl if test "x$fc_x_proto_NARROWPROTO" != "xno"; then
--dnl echo Compile using NARROWPROTO=$fc_x_proto_NARROWPROTO
--dnl fi
--dnl
--AC_DEFUN([FC_CHECK_X_PROTO_NARROWPROTO_WORKS],
--[AC_REQUIRE([AC_PATH_XTRA])dnl
--AC_LANG_SAVE
--AC_LANG_C
--fc_x_proto_NARROWPROTO=no
--if test "x$1" = "x"; then
-- fc_x_works="#undef NARROWPROTO"
--else
-- fc_x_works="#define NARROWPROTO $1"
--fi
--if test "x$fc_x_proto_FUNCPROTO" = "x"; then
-- fc_x_compile="#define FUNCPROTO 1"
--else
-- fc_x_compile="#define FUNCPROTO $fc_x_proto_FUNCPROTO"
--fi
--fc_x_save_CFLAGS="$CFLAGS"
--CFLAGS="$CFLAGS $X_CFLAGS $X_LIBS $X_PRE_LIBS -lXaw -lXt -lX11 $X_EXTRA_LIBS"
--AC_TRY_RUN([
--$fc_x_works
--$fc_x_compile
--#include <X11/Xfuncproto.h>
--#include <X11/Intrinsic.h>
--#include <X11/StringDefs.h>
--#include <X11/Xaw/Scrollbar.h>
--#define TOP_VAL 0.125
--#define SHOWN_VAL 0.25
--int main (int argc, char ** argv)
--{
-- Widget toplevel;
-- XtAppContext appcon;
-- Widget scrollbar;
-- double topbuf;
-- double shownbuf;
-- float * top = (float *)(&topbuf);
-- float * shown = (float *)(&shownbuf);
-- toplevel =
-- XtAppInitialize
-- (
-- &appcon,
-- "FcXTest",
-- NULL, 0,
-- &argc, argv,
-- NULL,
-- NULL, 0
-- );
-- scrollbar =
-- XtVaCreateManagedWidget
-- (
-- "my_scrollbar",
-- scrollbarWidgetClass,
-- toplevel,
-- NULL
-- );
-- XawScrollbarSetThumb (scrollbar, TOP_VAL, SHOWN_VAL);
-- XtVaGetValues
-- (
-- scrollbar,
-- XtNtopOfThumb, top,
-- XtNshown, shown,
-- NULL
-- );
-- if ((*top == TOP_VAL) && (*shown == SHOWN_VAL))
-- {
-- exit (0);
-- }
-- else
-- {
-- exit (1);
-- }
-- return (0);
--}
-- ],
-- [fc_x_proto_NARROWPROTO=$1], [], [:])
--CFLAGS="$fc_x_save_CFLAGS"
--AC_LANG_RESTORE
--])
--
--
--# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
--#
--# Copyright © 2004 Scott James Remnant <scott at netsplit.com>.
--#
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2 of the License, or
--# (at your option) any later version.
--#
--# This program is distributed in the hope that it will be useful, but
--# WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
--# General Public License for more details.
--#
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
--#
--# As a special exception to the GNU General Public License, if you
--# distribute this file as part of a program that contains a
--# configuration script generated by Autoconf, you may include it under
--# the same distribution terms that you use for the rest of that program.
--
--# PKG_PROG_PKG_CONFIG([MIN-VERSION])
--# ----------------------------------
--AC_DEFUN([PKG_PROG_PKG_CONFIG],
--[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
--m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
--AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
--if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-- AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
--fi
--if test -n "$PKG_CONFIG"; then
-- _pkg_min_version=m4_default([$1], [0.9.0])
-- AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
-- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-- AC_MSG_RESULT([yes])
-- else
-- AC_MSG_RESULT([no])
-- PKG_CONFIG=""
-- fi
--
--fi[]dnl
--])# PKG_PROG_PKG_CONFIG
--
--# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
--#
--# Check to see whether a particular set of modules exists. Similar
--# to PKG_CHECK_MODULES(), but does not set variables or print errors.
--#
--#
--# Similar to PKG_CHECK_MODULES, make sure that the first instance of
--# this or PKG_CHECK_MODULES is called, or make sure to call
--# PKG_CHECK_EXISTS manually
--# --------------------------------------------------------------
--AC_DEFUN([PKG_CHECK_EXISTS],
--[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
--if test -n "$PKG_CONFIG" && \
-- AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
-- m4_ifval([$2], [$2], [:])
--m4_ifvaln([$3], [else
-- $3])dnl
--fi])
--
--
--# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
--# ---------------------------------------------
--m4_define([_PKG_CONFIG],
--[if test -n "$PKG_CONFIG"; then
-- if test -n "$$1"; then
-- pkg_cv_[]$1="$$1"
-- else
-- PKG_CHECK_EXISTS([$3],
-- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-- [pkg_failed=yes])
-- fi
--else
-- pkg_failed=untried
--fi[]dnl
--])# _PKG_CONFIG
--
--# _PKG_SHORT_ERRORS_SUPPORTED
--# -----------------------------
--AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
--[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
--if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-- _pkg_short_errors_supported=yes
--else
-- _pkg_short_errors_supported=no
--fi[]dnl
--])# _PKG_SHORT_ERRORS_SUPPORTED
--
--
--# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
--# [ACTION-IF-NOT-FOUND])
--#
--#
--# Note that if there is a possibility the first call to
--# PKG_CHECK_MODULES might not happen, you should be sure to include an
--# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
--#
--#
--# --------------------------------------------------------------
--AC_DEFUN([PKG_CHECK_MODULES],
--[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
--AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
--AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
--
--pkg_failed=no
--AC_MSG_CHECKING([for $1])
--
--_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
--_PKG_CONFIG([$1][_LIBS], [libs], [$2])
--
--m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
--and $1[]_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.])
--
--if test $pkg_failed = yes; then
-- _PKG_SHORT_ERRORS_SUPPORTED
-- if test $_pkg_short_errors_supported = yes; then
-- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
-- else
-- $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
-- fi
-- # Put the nasty error message in config.log where it belongs
-- echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
--
-- ifelse([$4], , [AC_MSG_ERROR(dnl
--[Package requirements ($2) were not met:
--
--$$1_PKG_ERRORS
--
--Consider adjusting the PKG_CONFIG_PATH environment variable if you
--installed software in a non-standard prefix.
--
--_PKG_TEXT
--])],
-- [AC_MSG_RESULT([no])
-- $4])
--elif test $pkg_failed = untried; then
-- ifelse([$4], , [AC_MSG_FAILURE(dnl
--[The pkg-config script could not be found or is too old. Make sure it
--is in your PATH or set the PKG_CONFIG environment variable to the full
--path to pkg-config.
--
--_PKG_TEXT
--
--To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
-- [$4])
--else
-- $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-- $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
-- AC_MSG_RESULT([yes])
-- ifelse([$3], , :, [$3])
--fi[]dnl
--])# PKG_CHECK_MODULES
--
--# Try to configure the Win32 client (gui-win32)
--
--# FC_WIN32_CLIENT
--# Test for Win32 and needed libraries for gui-win32
--
--AC_DEFUN([FC_WIN32_CLIENT],
--[
-- if test "$client" = "win32" || test "$client" = "yes" ; then
-- if test "$MINGW32" = "yes"; then
-- PKG_CHECK_MODULES([PNG], [libpng],
-- [
-- CLIENT_LIBS="-lwsock32 -lcomctl32 -mwindows $PNG_LIBS"
-- CLIENT_CFLAGS="$PNG_CFLAGS"
-- ],
-- [
-- AC_CHECK_LIB([z], [gzgets],
-- [
-- AC_CHECK_HEADER([zlib.h],
-- [
-- AC_CHECK_LIB([png12], [png_read_image],,
-- [
-- AC_CHECK_LIB([png], [png_read_image],,
-- [
-- FC_NO_CLIENT([win32], [libpng is needed])
-- ])
-- ])
--
-- AC_CHECK_HEADER([png.h],
-- [
-- found_client=yes
-- client=win32
-- CLIENT_LIBS="-lwsock32 -lcomctl32 -lpng -mwindows"
-- ],
-- [
-- FC_NO_CLIENT([win32], [libpng-dev is needed])
-- ])
-- ],
-- [
-- FC_NO_CLIENT([win32], [zlib-dev is needed])
-- ])
-- ],
-- [
-- FC_NO_CLIENT([win32], [zlib is needed])
-- ])
-- ])
-- else
-- FC_NO_CLIENT([win32], [mingw32 is needed])
-- fi
-- fi
--])
--
--AC_DEFUN([FC_CHECK_SOUND],[
-- AC_ARG_ENABLE(sdl-mixer,
-- [ --disable-sdl-mixer Do not try to use the SDL mixer],
-- USE_SOUND=no, USE_SOUND_SDL=yes)
--
-- if test "x$USE_SOUND_SDL" = "xyes"; then
-- dnl Add SDL support to client
-- SDL_VERSION=1.0.0
-- AM_PATH_SDL($SDL_VERSION, SDL=yes, SDL=no)
-- if test "x$SDL" != "xno"; then
-- AC_CHECK_HEADER(SDL/SDL_mixer.h, SDL_mixer_h=1, SDL_mixer_h=0)
-- AC_CHECK_LIB(SDL_mixer, Mix_OpenAudio, SDL_mixer=yes)
-- AC_MSG_CHECKING(building SDL_mixer support)
-- if test "x$SDL_mixer_h" = "x1"; then
-- if test "x$SDL_mixer" = "xyes"; then
-- SOUND_CFLAGS="$SOUND_CFLAGS $SDL_CFLAGS"
-- SOUND_LIBS="$SOUND_LIBS $SDL_LIBS -lSDL_mixer"
-- AC_DEFINE(AUDIO_SDL, 1, [SDL_Mixer support])
-- AC_DEFINE(SDL, 1, [SDL is used])
-- AC_MSG_RESULT(yes)
-- else
-- AC_MSG_RESULT([no, found header but not library!])
-- fi
-- else
-- AC_MSG_RESULT([no, install SDL_mixer first: http://www.libsdl.org/projects/SDL_mixer/index.html])
-- SDL_mixer="xno"
-- fi
-- fi
-- fi
--])
--
--dnl ======================================
--dnl GGZ Gaming Zone - Configuration Macros
--dnl ======================================
--dnl
--dnl Copyright (C) 2001 - 2007 Josef Spillner, josef at ggzgamingzone.org
--dnl This file has heavily been inspired by KDE's acinclude :)
--dnl It is published under the conditions of the GNU General Public License.
--dnl
--dnl ======================================
--dnl
--dnl This file is common to most GGZ modules, and should be kept in sync
--dnl between them all. The master copy resides with libggz.
--dnl Currently the following modules use it:
--dnl kde-games, kde-client, gtk-games, gtk-client, utils, grubby,
--dnl ggz-client-libs, ggzd, gnome-client, txt-client, sdl-games, libggz
--dnl See /docs/ggz-project/buildsystem for documentation.
--dnl
--dnl ======================================
--dnl
--dnl History:
--dnl See the SVN log for a full history.
--dnl
--dnl ------------------------------------------------------------------------
--dnl Content of this file:
--dnl ------------------------------------------------------------------------
--dnl High-level macros:
--dnl AC_GGZ_CHECK - Checks for presence of GGZ client and server libraries.
--dnl GGZ users can call this macro to determine at compile
--dnl time whether to include GGZ support. Server and client
--dnl are checked separately. GGZ_SERVER and GGZ_CLIENT are
--dnl defined in config.h, and created as conditionals in
--dnl the Makefiles.
--dnl AC_GGZ_CHECK_SERVER - The same, but server libs only.
--dnl
--dnl Low-level macros:
--dnl AC_GGZ_INIT - initialization and paths/options setup
--dnl AC_GGZ_VERSION - ensure a minimum version of GGZ
--dnl AC_GGZ_LIBGGZ - find the libggz headers and libraries
--dnl AC_GGZ_GGZCORE - find the ggzcore headers and libraries
--dnl AC_GGZ_CONFIG - find the ggz-config tool and set up configuration
--dnl AC_GGZ_GGZMOD - find the ggzmod library
--dnl AC_GGZ_GGZDMOD - find the ggzdmod library
--dnl AC_GGZ_SERVER - set up game and room path for ggzd game servers
--dnl
--dnl Each macro takes two arguments:
--dnl 1. Action-if-found (or empty for no action).
--dnl 2. Action-if-not-found (or empty for error, or "ignore" to ignore).
--dnl
--dnl Internal functions:
--dnl AC_GGZ_ERROR - user-friendly error messages
--dnl AC_GGZ_FIND_FILE - macro for convenience (thanks kde)
--dnl AC_GGZ_REMOVEDUPS - eliminate duplicate list elements
--dnl
--
--# Version number of this script.
--# First part is upstream (ggz) version and second Freeciv modifications.
--# serial 0014.1
--
--dnl ------------------------------------------------------------------------
--dnl Find a directory containing a single file
--dnl Synopsis: AC_GGZ_FIND_FILE(file, directorylist, <returnvar>)
--dnl ------------------------------------------------------------------------
--dnl
--AC_DEFUN([AC_GGZ_FIND_FILE],
--[
--$3=NO
--for i in $2;
--do
-- for j in $1;
-- do
-- echo "configure: __oline__: $i/$j" >&AC_FD_CC
-- if test -r "$i/$j"; then
-- echo "taking that" >&AC_FD_CC
-- $3=$i
-- break 2
-- fi
-- done
--done
--])
--
--dnl ------------------------------------------------------------------------
--dnl Remove duplicate entries in a list, and remove all NO's
--dnl Synopsis: AC_GGZ_REMOVEDUPS(list, <returnlist>)
--dnl ------------------------------------------------------------------------
--dnl
--AC_DEFUN([AC_GGZ_REMOVEDUPS],
--[
--ret=""
--for i in $1; 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
--$2=$ret
--])
--
--dnl ------------------------------------------------------------------------
--dnl User-friendly error messages
--dnl Synopsis: AC_GGZ_ERROR(libraryname, headerdirlist, libdirlist)
--dnl ------------------------------------------------------------------------
--dnl
--AC_DEFUN([AC_GGZ_ERROR],
--[
-- AC_MSG_WARN([no
-- The library '$1' does not seem to be installed correctly.
-- Headers searched in: $2
-- Libraries searched in: $3
-- Please read QuickStart.GGZ in order to fix this.
-- ])
-- exit 1
--])
--
--dnl ------------------------------------------------------------------------
--dnl Initialization, common values and such
--dnl Synopsis: AC_GGZ_INIT([export], [defaults])
--dnl ------------------------------------------------------------------------
--dnl
--AC_DEFUN([AC_GGZ_INIT],
--[
--if test "x$prefix" = "xNONE"; then
-- prefix="${ac_default_prefix}"
--fi
--if test "x$exec_prefix" = "xNONE"; then
-- exec_prefix='${prefix}'
--fi
--
--ac_ggz_prefix=""
--AC_ARG_WITH(ggz-dir,
-- AC_HELP_STRING([--with-ggz-dir=DIR], [Path to GGZ Gaming Zone]),
-- [ ac_ggz_prefix="$withval"
-- ])
--
--if test "x$ac_ggz_prefix" != "xno" ; then
-- 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$1" = "xdefaults" || test "x$2" = "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$1" = "xexport" || test "x$2" = "xexport"; then
-- CPPFLAGS="$CPPFLAGS -I ${ac_ggz_prefix_incdir} -I /usr/local/include"
-- LDFLAGS="$LDFLAGS -L${ac_ggz_prefix_libdir} -L/usr/local/lib"
-- fi
--
-- save_cflags=$CFLAGS
-- save_cxxflags=$CXXFLAGS
-- if test "x$GCC" = xyes; then
-- CFLAGS="-Wall -Werror"
-- AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-- [[void signedness(void){char c;if(c==-1)c=0;}]])],
-- [],
-- [save_cflags="$save_cflags -fsigned-char"
-- save_cxxflags="$save_cxxflags -fsigned-char"])
-- else
-- AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-- [[#if defined(__SUNPRO_C) || (__SUNPRO_C >= 0x550)
-- #else
-- # include "Error: Only GCC and Sun Studio are supported compilers."
-- #endif]], [[]])],
-- [save_cflags="$save_cflags -xchar=signed"
-- save_cxxflags="$save_cxxflags -xchar=signed"],
-- [])
--
-- fi
-- CFLAGS=$save_cflags
-- CXXFLAGS=$save_cxxflags
--fi
--])
--
--dnl ------------------------------------------------------------------------
--dnl Ensure that a minimum version of GGZ is present
--dnl Synopsis: AC_GGZ_VERSION(major, minor, micro,
--dnl action-if-found, action-if-not-found)
--dnl ------------------------------------------------------------------------
--dnl
--AC_DEFUN([AC_GGZ_VERSION],
--[
-- major=$1
-- minor=$2
-- micro=$3
--
-- 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;"
--
-- save_libs=$LIBS
-- save_ldflags=$LDFLAGS
-- save_cppflags=$CPPFLAGS
-- save_ldlibrary_path=$LD_LIBRARY_PATH
-- LDFLAGS=$LIBGGZ_LDFLAGS
-- LIBS=$LIB_GGZ
-- CPPFLAGS=$LIBGGZ_INCLUDES
-- export LD_LIBRARY_PATH=$save_ldlibrary_path:$libggz_libraries
--
-- AC_MSG_CHECKING([for GGZ library version: $major.$minor.$micro])
-- AC_RUN_IFELSE(
-- [AC_LANG_PROGRAM([[$testprologue]], [[$testbody]])],
-- [ac_ggz_version_check=yes],
-- [ac_ggz_version_check=no],
-- [ac_ggz_version_check="skipped due to cross-compiling"]
-- )
-- if test "$ac_ggz_version_check" = "no"; then
-- AC_MSG_RESULT([no])
-- if test "x$5" = "x"; then
-- AC_MSG_ERROR([The GGZ version is too old. Version $major.$minor.$micro is required.])
-- fi
-- $5
-- else
-- AC_MSG_RESULT($ac_ggz_version_check)
-- $4
-- fi
--
-- LIBS=$save_libs
-- LDFLAGS=$save_ldflags
-- CPPFLAGS=$save_cppflags
-- LD_LIBRARY_PATH=$save_ldlibrary_path
--])
--
--dnl ------------------------------------------------------------------------
--dnl Try to find the libggz headers and libraries.
--dnl $(LIBGGZ_LDFLAGS) will be -L ... (if needed)
--dnl and $(LIBGGZ_INCLUDES) will be -I ... (if needed)
--dnl ------------------------------------------------------------------------
--dnl
--AC_DEFUN([AC_GGZ_LIBGGZ],
--[
--AC_MSG_CHECKING([for GGZ library: libggz])
--
--ac_libggz_includes=NO ac_libggz_libraries=NO
--libggz_libraries=""
--libggz_includes=""
--
--AC_ARG_WITH(libggz-dir,
-- AC_HELP_STRING([--with-libggz-dir=DIR],[libggz installation prefix]),
-- [ ac_libggz_includes="$withval"/include
-- ac_libggz_libraries="$withval"/lib
-- ])
--AC_ARG_WITH(libggz-includes,
-- AC_HELP_STRING([--with-libggz-includes=DIR],
-- [where the libggz includes are]),
-- [ ac_libggz_includes="$withval"
-- ])
--AC_ARG_WITH(libggz-libraries,
-- AC_HELP_STRING([--with-libggz-libraries=DIR],[where the libggz libs are]),
-- [ ac_libggz_libraries="$withval"
-- ])
--
--AC_CACHE_VAL(ac_cv_have_libggz,
--[
--libggz_incdirs="$ac_libggz_includes $ac_ggz_stdinc"
--AC_GGZ_REMOVEDUPS($libggz_incdirs, libggz_incdirs)
--libggz_header=ggz.h
--
--AC_GGZ_FIND_FILE($libggz_header, $libggz_incdirs, libggz_incdir)
--ac_libggz_includes="$libggz_incdir"
--
--libggz_libdirs="$ac_libggz_libraries $ac_ggz_stdlib"
--AC_GGZ_REMOVEDUPS($libggz_libdirs, libggz_libdirs)
--
--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" >&AC_FD_CC ; 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
--])
--
--eval "$ac_cv_have_libggz"
--
--if test "$have_libggz" != yes; then
-- if test "x$2" = "xignore"; then
-- AC_MSG_RESULT([$have_libggz (ignored)])
-- else
-- AC_MSG_RESULT([$have_libggz])
-- if test "x$2" = "x"; then
-- AC_GGZ_ERROR(libggz, $libggz_incdirs, $libggz_libdirs)
-- fi
--
-- # perform actions given by argument 2.
-- $2
-- fi
--else
-- ac_cv_have_libggz="have_libggz=yes \
-- ac_libggz_includes=$ac_libggz_includes ac_libggz_libraries=$ac_libggz_libraries"
-- AC_MSG_RESULT([$have_libggz (libraries $ac_libggz_libraries, headers $ac_libggz_includes)])
--
-- libggz_libraries="$ac_libggz_libraries"
-- libggz_includes="$ac_libggz_includes"
--
-- AC_SUBST(libggz_libraries)
-- AC_SUBST(libggz_includes)
--
-- LIBGGZ_INCLUDES="-I $libggz_includes"
-- LIBGGZ_LDFLAGS="-L$libggz_libraries"
--
-- AC_SUBST(LIBGGZ_INCLUDES)
-- AC_SUBST(LIBGGZ_LDFLAGS)
--
-- LIB_GGZ='-lggz'
-- AC_SUBST(LIB_GGZ)
--
-- # perform actions given by argument 1.
-- $1
--fi
--
--])
--
--dnl ------------------------------------------------------------------------
--dnl Try to find the ggzcore headers and libraries.
--dnl $(GGZCORE_LDFLAGS) will be -L ... (if needed)
--dnl and $(GGZCORE_INCLUDES) will be -I ... (if needed)
--dnl ------------------------------------------------------------------------
--dnl
--AC_DEFUN([AC_GGZ_GGZCORE],
--[
--AC_MSG_CHECKING([for GGZ library: ggzcore])
--
--ac_ggzcore_includes=NO ac_ggzcore_libraries=NO
--ggzcore_libraries=""
--ggzcore_includes=""
--
--AC_ARG_WITH(ggzcore-dir,
-- AC_HELP_STRING([--with-ggzcore-dir=DIR],[ggzcore installation prefix]),
-- [ ac_ggzcore_includes="$withval"/include
-- ac_ggzcore_libraries="$withval"/lib
-- ])
--AC_ARG_WITH(ggzcore-includes,
-- AC_HELP_STRING([--with-ggzcore-includes=DIR],
-- [where the ggzcore includes are]),
-- [ ac_ggzcore_includes="$withval"
-- ])
--AC_ARG_WITH(ggzcore-libraries,
-- AC_HELP_STRING([--with-ggzcore-libraries=DIR],
-- [where the ggzcore libs are]),
-- [ ac_ggzcore_libraries="$withval"
-- ])
--
--AC_CACHE_VAL(ac_cv_have_ggzcore,
--[
--ggzcore_incdirs="$ac_ggzcore_includes $ac_ggz_stdinc"
--AC_GGZ_REMOVEDUPS($ggzcore_incdirs, ggzcore_incdirs)
--ggzcore_header=ggzcore.h
--
--AC_GGZ_FIND_FILE($ggzcore_header, $ggzcore_incdirs, ggzcore_incdir)
--ac_ggzcore_includes="$ggzcore_incdir"
--
--ggzcore_libdirs="$ac_ggzcore_libraries $ac_ggz_stdlib"
--AC_GGZ_REMOVEDUPS($ggzcore_libdirs, ggzcore_libdirs)
--
--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" >&AC_FD_CC ; 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
--])
--
--eval "$ac_cv_have_ggzcore"
--
--if test "$have_ggzcore" != yes; then
-- if test "x$2" = "xignore"; then
-- AC_MSG_RESULT([$have_ggzcore (intentionally ignored)])
-- else
-- AC_MSG_RESULT([$have_ggzcore])
-- if test "x$2" = "x"; then
-- AC_GGZ_ERROR(ggzcore, $ggzcore_incdirs, $ggzcore_libdirs)
-- fi
--
-- # Perform actions given by argument 2.
-- $2
-- fi
--else
-- ac_cv_have_ggzcore="have_ggzcore=yes \
-- ac_ggzcore_includes=$ac_ggzcore_includes ac_ggzcore_libraries=$ac_ggzcore_libraries"
-- AC_MSG_RESULT([$have_ggzcore (libraries $ac_ggzcore_libraries, headers $ac_ggzcore_includes)])
--
-- ggzcore_libraries="$ac_ggzcore_libraries"
-- ggzcore_includes="$ac_ggzcore_includes"
--
-- AC_SUBST(ggzcore_libraries)
-- AC_SUBST(ggzcore_includes)
--
-- GGZCORE_INCLUDES="-I $ggzcore_includes"
-- GGZCORE_LDFLAGS="-L$ggzcore_libraries"
--
-- AC_SUBST(GGZCORE_INCLUDES)
-- AC_SUBST(GGZCORE_LDFLAGS)
--
-- LIB_GGZCORE='-lggzcore'
-- AC_SUBST(LIB_GGZCORE)
--
-- # Perform actions given by argument 1.
-- $1
--fi
--
--])
--
--dnl ------------------------------------------------------------------------
--dnl Try to find the ggz-config binary.
--dnl Sets GGZ_CONFIG to the path/name of the program.
--dnl Sets also: ggz_gamedir, ggz_datadir etc.
--dnl ------------------------------------------------------------------------
--dnl
--AC_DEFUN([AC_GGZ_CONFIG],
--[
--AC_MSG_CHECKING([for GGZ configuration tool: ggz-config])
--
--ac_ggz_config=NO
--ggz_config=""
--
--AC_ARG_WITH(ggzconfig,
-- AC_HELP_STRING([--with-ggzconfig=DIR],[path to ggz-config]),
-- [ ac_ggz_config="$withval"
-- ])
--
--ac_ggz_config_orig=$ac_ggz_config
--
--AC_CACHE_VAL(ac_cv_have_ggzconfig,
--[
--ggz_config_dirs="$ac_ggz_config $ac_ggz_stdbin"
--
--AC_GGZ_FIND_FILE(ggz-config, $ggz_config_dirs, ggz_config_dir)
--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
--])
--
--eval "$ac_cv_have_ggz_config"
--
--if test "$have_ggz_config" != yes; then
-- if test "x$2" = "xignore"; then
-- AC_MSG_RESULT([$have_ggz_config (intentionally ignored)])
-- GGZ_CONFIG="true"
-- ggzexecmoddir="\${libdir}/ggz"
-- ggzdatadir="\${datadir}/ggz"
-- AC_SUBST(GGZ_CONFIG)
-- AC_SUBST(ggzexecmoddir)
-- AC_SUBST(ggzdatadir)
-- AC_DEFINE_UNQUOTED(GAMEDIR, "${libdir}/ggz", [Path where to install the games])
-- AC_DEFINE_UNQUOTED(GGZDATADIR, "${datadir}/ggz", [Path where the games should look for their data files])
-- else
-- AC_MSG_RESULT([$have_ggz_config])
-- if test "x$2" = "x"; then
-- AC_MSG_ERROR([ggz-config not found. Please check your installation! ])
-- fi
--
-- # Perform actions given by argument 2.
-- $2
-- fi
--else
-- pathto_app=`echo $prefix/bin/ | tr -s "/"`
-- pathto_ggz=`echo $ac_ggz_config/ | tr -s "/"`
--
-- if test "$ac_ggz_config_orig" != "NO"; then
-- pathto_app=$pathto_ggz
-- fi
--
-- if test "x$pathto_app" != "x$pathto_ggz"; then
-- AC_MSG_RESULT([$have_ggz_config (dismissed due to different prefix)])
-- GGZ_CONFIG="true"
-- ggzexecmoddir="\${libdir}/ggz"
-- ggzdatadir="\${datadir}/ggz"
-- AC_SUBST(GGZ_CONFIG)
-- AC_SUBST(ggzexecmoddir)
-- AC_SUBST(ggzdatadir)
-- AC_DEFINE_UNQUOTED(GGZMODULECONFDIR, "${prefix}/etc", [Path where the game registry is located])
-- AC_DEFINE_UNQUOTED(GAMEDIR, "${libdir}/ggz", [Path where to install the games])
-- AC_DEFINE_UNQUOTED(GGZDATADIR, "${datadir}/ggz", [Path where the games should look for their data files])
-- else
-- ac_cv_have_ggz_config="have_ggz_config=yes \
-- ac_ggz_config=$ac_ggz_config"
-- AC_MSG_RESULT([$ac_ggz_config/ggz-config])
--
-- ggz_config="$ac_ggz_config"
-- AC_SUBST(ggz_config)
--
-- AC_ARG_ENABLE([noregistry],
-- AC_HELP_STRING([--enable-noregistry], [Do not register game modules.]),
-- [enable_noregistry=yes], [enable_noregistry=no])
--
-- GGZ_CONFIG="${ggz_config}/ggz-config"
-- if test "$enable_noregistry" = yes; then
-- GGZ_CONFIG="$GGZ_CONFIG --noregistry=$enableval"
-- fi
-- AC_SUBST(GGZ_CONFIG)
--
-- ggzmoduleconfdir=`$GGZ_CONFIG --configdir`
-- AC_DEFINE_UNQUOTED(GGZMODULECONFDIR, "${ggzmoduleconfdir}", [Path where the game registry is located])
-- ggzexecmoddir=`$GGZ_CONFIG --gamedir`
-- AC_DEFINE_UNQUOTED(GAMEDIR, "${ggzexecmoddir}", [Path where to install the games])
-- ggzdatadir=`$GGZ_CONFIG --datadir`
-- AC_DEFINE_UNQUOTED(GGZDATADIR, "${ggzdatadir}", [Path where the games should look for their data files])
-- packagesrcdir=`cd $srcdir && pwd`
-- AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}", [Path where the source is located])
--
-- if test "$ggzmoduleconfdir" = ""; then
-- AC_MSG_ERROR([ggz-config is unusable. Maybe LD_LIBRARY_PATH needs to be set.])
-- fi
--
-- AC_SUBST(ggzmoduleconfdir)
-- AC_SUBST(ggzexecmoddir)
-- AC_SUBST(ggzdatadir)
-- AC_SUBST(packagesrcdir)
--
-- # Perform actions given by argument 1.
-- $1
-- fi
--fi
--
--])
--
--dnl ------------------------------------------------------------------------
--dnl Try to find the ggzmod headers and libraries.
--dnl $(GGZMOD_LDFLAGS) will be -L ... (if needed)
--dnl and $(GGZMOD_INCLUDES) will be -I ... (if needed)
--dnl ------------------------------------------------------------------------
--dnl
--AC_DEFUN([AC_GGZ_GGZMOD],
--[
--AC_MSG_CHECKING([for GGZ library: ggzmod])
--
--ac_ggzmod_includes=NO ac_ggzmod_libraries=NO
--ggzmod_libraries=""
--ggzmod_includes=""
--
--AC_ARG_WITH(ggzmod-dir,
-- AC_HELP_STRING([--with-ggzmod-dir=DIR],[ggzmod installation prefix]),
-- [ ac_ggzmod_includes="$withval"/include
-- ac_ggzmod_libraries="$withval"/lib
-- ])
--AC_ARG_WITH(ggzmod-includes,
-- AC_HELP_STRING([--with-ggzmod-includes=DIR],
-- [where the ggzmod includes are]),
-- [ ac_ggzmod_includes="$withval"
-- ])
--AC_ARG_WITH(ggzmod-libraries,
-- AC_HELP_STRING([--with-ggzmod-libraries=DIR],
-- [where the ggzmod libs are]),
-- [ ac_ggzmod_libraries="$withval"
-- ])
--
--AC_CACHE_VAL(ac_cv_have_ggzmod,
--[
--ggzmod_incdirs="$ac_ggzmod_includes $ac_ggz_stdinc"
--AC_GGZ_REMOVEDUPS($ggzmod_incdirs, ggzmod_incdirs)
--ggzmod_header=ggzmod.h
--
--AC_GGZ_FIND_FILE($ggzmod_header, $ggzmod_incdirs, ggzmod_incdir)
--ac_ggzmod_includes="$ggzmod_incdir"
--
--ggzmod_libdirs="$ac_ggzmod_libraries $ac_ggz_stdlib"
--AC_GGZ_REMOVEDUPS($ggzmod_libdirs, ggzmod_libdirs)
--
--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" >&AC_FD_CC ; fi
--done
--
--ac_ggzmod_libraries="$ggzmod_libdir"
--
--if test "$ac_ggzmod_includes" = NO || test "$ac_ggzmod_libraries" = NO; then
-- ac_cv_have_ggzmod="have_ggzmod=no"
-- ac_ggzmod_notfound=""
--else
-- have_ggzmod="yes"
--fi
--])
--
--eval "$ac_cv_have_ggzmod"
--
--if test "$have_ggzmod" != yes; then
-- if test "x$2" = "xignore"; then
-- AC_MSG_RESULT([$have_ggzmod (intentionally ignored)])
-- else
-- AC_MSG_RESULT([$have_ggzmod])
-- if test "x$2" = "x"; then
-- AC_GGZ_ERROR(ggzmod, $ggzmod_incdirs, $ggzmod_libdirs)
-- fi
--
-- # Perform actions given by argument 2.
-- $2
-- fi
--else
-- ac_cv_have_ggzmod="have_ggzmod=yes \
-- ac_ggzmod_includes=$ac_ggzmod_includes ac_ggzmod_libraries=$ac_ggzmod_libraries"
-- AC_MSG_RESULT([$have_ggzmod (libraries $ac_ggzmod_libraries, headers $ac_ggzmod_includes)])
--
-- ggzmod_libraries="$ac_ggzmod_libraries"
-- ggzmod_includes="$ac_ggzmod_includes"
--
-- AC_SUBST(ggzmod_libraries)
-- AC_SUBST(ggzmod_includes)
--
-- GGZMOD_INCLUDES="-I $ggzmod_includes"
-- GGZMOD_LDFLAGS="-L$ggzmod_libraries"
--
-- AC_SUBST(GGZMOD_INCLUDES)
-- AC_SUBST(GGZMOD_LDFLAGS)
--
-- LIB_GGZMOD='-lggzmod'
-- AC_SUBST(LIB_GGZMOD)
--
-- # Perform actions given by argument 1.
-- $1
--fi
--
--])
--
--dnl ------------------------------------------------------------------------
--dnl Try to find the ggzdmod headers and libraries.
--dnl $(GGZDMOD_LDFLAGS) will be -L ... (if needed)
--dnl and $(GGZDMOD_INCLUDES) will be -I ... (if needed)
--dnl ------------------------------------------------------------------------
--dnl
--AC_DEFUN([AC_GGZ_GGZDMOD],
--[
--AC_MSG_CHECKING([for GGZ library: ggzdmod])
--
--ac_ggzdmod_includes=NO ac_ggzdmod_libraries=NO
--ggzdmod_libraries=""
--ggzdmod_includes=""
--
--AC_ARG_WITH(ggzdmod-dir,
-- AC_HELP_STRING([--with-ggzdmod-dir=DIR], [ggzdmod installation prefix]),
-- [ ac_ggzdmod_includes="$withval"/include
-- ac_ggzdmod_libraries="$withval"/lib
-- ])
--AC_ARG_WITH(ggzdmod-includes,
-- AC_HELP_STRING([--with-ggzdmod-includes=DIR],
-- [where the ggzdmod includes are]),
-- [ ac_ggzdmod_includes="$withval"
-- ])
--AC_ARG_WITH(ggzdmod-libraries,
-- AC_HELP_STRING([--with-ggzdmod-libraries=DIR],
-- [where the ggzdmod libs are]),
-- [ ac_ggzdmod_libraries="$withval"
-- ])
--
--AC_CACHE_VAL(ac_cv_have_ggzdmod,
--[
--ggzdmod_incdirs="$ac_ggzdmod_includes $ac_ggz_stdinc"
--AC_GGZ_REMOVEDUPS($ggzdmod_incdirs, ggzdmod_incdirs)
--ggzdmod_header=ggzdmod.h
--
--AC_GGZ_FIND_FILE($ggzdmod_header, $ggzdmod_incdirs, ggzdmod_incdir)
--ac_ggzdmod_includes="$ggzdmod_incdir"
--
--ggzdmod_libdirs="$ac_ggzdmod_libraries $ac_ggz_stdlib"
--AC_GGZ_REMOVEDUPS($ggzdmod_libdirs, ggzdmod_libdirs)
--
--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" >&AC_FD_CC ; 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
--])
--
--eval "$ac_cv_have_ggzdmod"
--
--if test "$have_ggzdmod" != yes; then
-- if test "x$2" = "xignore"; then
-- AC_MSG_RESULT([$have_ggzdmod (intentionally ignored)])
-- else
-- AC_MSG_RESULT([$have_ggzdmod])
-- if test "x$2" = "x"; then
-- AC_GGZ_ERROR(ggzdmod, $ggzdmod_incdirs, $ggzdmod_libdirs)
-- fi
--
-- # Perform actions given by argument 2.
-- $2
-- fi
--else
-- ac_cv_have_ggzdmod="have_ggzdmod=yes \
-- ac_ggzdmod_includes=$ac_ggzdmod_includes ac_ggzdmod_libraries=$ac_ggzdmod_libraries"
-- AC_MSG_RESULT([$have_ggzdmod (libraries $ac_ggzdmod_libraries, headers $ac_ggzdmod_includes)])
--
-- ggzdmod_libraries="$ac_ggzdmod_libraries"
-- ggzdmod_includes="$ac_ggzdmod_includes"
--
-- AC_SUBST(ggzdmod_libraries)
-- AC_SUBST(ggzdmod_includes)
--
-- GGZDMOD_INCLUDES="-I $ggzdmod_includes"
-- GGZDMOD_LDFLAGS="-L$ggzdmod_libraries"
--
-- AC_SUBST(GGZDMOD_INCLUDES)
-- AC_SUBST(GGZDMOD_LDFLAGS)
--
-- LIB_GGZDMOD='-lggzdmod'
-- AC_SUBST(LIB_GGZDMOD)
--
-- # Perform actions given by argument 1.
-- $1
--fi
--
--])
--
--dnl ------------------------------------------------------------------------
--dnl Try to find the ggz-gtk headers and libraries.
--dnl $(GGZGTK_LDFLAGS) will be -L ... (if needed)
--dnl and $(GGZGTK_INCLUDES) will be -I ... (if needed)
--dnl ------------------------------------------------------------------------
--dnl
--AC_DEFUN([AC_GGZ_GTK],
--[
--AC_MSG_CHECKING([for GGZ library: ggz-gtk])
--
--ac_ggz_gtk_includes=NO ac_ggz_gtk_libraries=NO
--ggz_gtk_libraries=""
--ggz_gtk_includes=""
--
--AC_ARG_WITH(ggz-gtk-dir,
-- AC_HELP_STRING([--with-ggz-gtk-dir=DIR], [ggz-gtk installation prefix]),
-- [ ac_ggz_gtk_includes="$withval"/include
-- ac_ggz_gtk_libraries="$withval"/lib
-- ])
--AC_ARG_WITH(ggz-gtk-includes,
-- AC_HELP_STRING([--with-ggz-gtk-includes=DIR],
-- [where the ggz-gtk includes are]),
-- [ ac_ggz_gtk_includes="$withval"
-- ])
--AC_ARG_WITH(ggz-gtk-libraries,
-- AC_HELP_STRING([--with-ggz-gtk-libraries=DIR],
-- [where the ggz-gtk libs are]),
-- [ ac_ggz_gtk_libraries="$withval"
-- ])
--
--AC_CACHE_VAL(ac_cv_have_ggz_gtk,
--[
--ggz_gtk_incdirs="$ac_ggz_gtk_includes $ac_ggz_stdinc"
--AC_GGZ_REMOVEDUPS($ggz_gtk_incdirs, ggz_gtk_incdirs)
--ggz_gtk_header=ggz-gtk.h
--
--AC_GGZ_FIND_FILE($ggz_gtk_header, $ggz_gtk_incdirs, ggz_gtk_incdir)
--ac_ggz_gtk_includes="$ggz_gtk_incdir"
--
--ggz_gtk_libdirs="$ac_ggz_gtk_libraries $ac_ggz_stdlib"
--AC_GGZ_REMOVEDUPS($ggz_gtk_libdirs, ggz_gtk_libdirs)
--
--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" >&AC_FD_CC ; 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
--])
--
--eval "$ac_cv_have_ggz_gtk"
--
--if test "$have_ggz_gtk" != yes; then
-- if test "x$2" = "xignore"; then
-- AC_MSG_RESULT([$have_ggz_gtk (intentionally ignored)])
-- else
-- AC_MSG_RESULT([$have_ggz_gtk])
-- if test "x$2" = "x"; then
-- AC_GGZ_ERROR(ggz-gtk, $ggz_gtk_incdirs, $ggz_gtk_libdirs)
-- fi
--
-- # Perform actions given by argument 2.
-- $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"
-- AC_MSG_RESULT([$have_ggz_gtk (libraries $ac_ggz_gtk_libraries, headers $ac_ggz_gtk_includes)])
--
-- ggz_gtk_libraries="$ac_ggz_gtk_libraries"
-- ggz_gtk_includes="$ac_ggz_gtk_includes"
--
-- AC_SUBST(ggz_gtk_libraries)
-- AC_SUBST(ggz_gtk_includes)
--
-- GGZ_GTK_INCLUDES="-I $ggz_gtk_includes"
-- GGZ_GTK_LDFLAGS="-L$ggz_gtk_libraries"
--
-- AC_SUBST(GGZ_GTK_INCLUDES)
-- AC_SUBST(GGZ_GTK_LDFLAGS)
--
-- LIB_GGZ_GTK='-lggz-gtk'
-- AC_SUBST(LIB_GGZ_GTK)
--
-- # Perform actions given by argument 1.
-- $1
--fi
--])
--
--dnl ------------------------------------------------------------------------
--dnl Setup the game server configuration.
--dnl Sets ggzdconfdir (ggzd configuration).
--dnl Sets ggzddatadir (for game server data).
--dnl ------------------------------------------------------------------------
--dnl
--AC_DEFUN([AC_GGZ_SERVER],
--[
--AC_MSG_CHECKING([for GGZ server: ggzd])
--AC_ARG_WITH(ggzd-confdir,
-- AC_HELP_STRING([--with-ggzd-confdir=DIR], [directory for room/game data]),
--[ ac_ggzd_confdir="$withval"
--])
--
--AC_CACHE_VAL(ac_cv_have_ggzdconf,
--[
-- if test "x$1" = "xforce"; then
-- if test "x$ac_ggzd_confdir" = "x"; then
-- ggzdconfdirs="$ac_ggz_stdetc"
-- else
-- ggzdconfdirs="$ac_ggzd_confdir"
-- fi
-- else
-- ggzdconfdirs="$ac_ggzd_confdir $ac_ggz_stdetc"
-- fi
--
-- ggzdconfdir=NONE
-- for dir in $ggzdconfdirs; do
-- if test -n "`ls -d $dir/rooms 2> /dev/null`"; then
-- if test -n "`ls -d $dir/rooms 2> /dev/null`"; then
-- ggzdconfdir=$dir; break;
-- else
-- echo "tried $dir" >&AC_FD_CC;
-- fi
-- else
-- echo "tried $dir" >&AC_FD_CC;
-- fi
-- done
--
-- if test "x$ggzdconfdir" = "xNONE"; then
-- have_ggzdconf="no"
-- else
-- have_ggzdconf="yes"
-- fi
--])
--
--eval "$ac_cv_have_ggzdconf"
--
--if test "$have_ggzdconf" != yes; then
-- if test "x$2" = "xignore"; then
-- AC_MSG_RESULT([$have_ggzdconf (intentionally ignored)])
-- elif test "x$2" = "xforce"; then
-- if test "x$ac_ggzd_confdir" = "x"; then
-- ggzdconfdir="\${prefix}/etc/ggzd"
-- else
-- ggzdconfdir=$ac_ggzd_confdir
-- fi
-- AC_MSG_RESULT([$have_ggzdconf (but forced to ${ggzdconfdir})])
-- else
-- AC_MSG_RESULT([$have_ggzdconf])
-- if test "x$2" = "x"; then
-- AC_MSG_ERROR([GGZ server configuration not found. Please check your installation! ])
-- fi
--
-- # Perform actions given by argument 2.
-- $2
-- fi
--else
-- prefixed=0
-- if test "x${prefix}" != "xNONE" && test "x${prefix}" != "x${ac_default_prefix}"; then
-- if test "x$ac_ggzd_confdir" = "x"; then
-- prefixed=1
-- fi
-- fi
-- if test "x$ggzdconfdir" != "x${prefix}/etc/ggzd" && test "x$prefixed" = "x1"; then
-- AC_MSG_RESULT([$have_ggzdconf ($ggzdconfdir, but using ${prefix}/etc/ggzd nevertheless)])
-- ggzdconfdir="\${prefix}/etc/ggzd"
-- else
-- AC_MSG_RESULT([$have_ggzdconf ($ggzdconfdir)])
-- fi
--fi
--
--if test "$have_ggzdconf" = yes || test "x$2" = "xforce"; then
-- AC_SUBST(ggzdconfdir)
--
-- ggzddatadir=${datadir}/${PACKAGE}
-- AC_DEFINE_UNQUOTED(GGZDDATADIR, "${ggzddatadir}", [Game server data directory])
-- AC_SUBST(ggzddatadir)
--
-- if test "x${libdir}" = 'x${exec_prefix}/lib'; then
-- if test "x${exec_prefix}" = "xNONE"; then
-- if test "x${prefix}" = "xNONE"; then
-- ggzdexecmoddir="\${ac_default_prefix}/lib/ggzd"
-- ggzdexecmodpath="${ac_default_prefix}/lib/ggzd"
-- else
-- ggzdexecmoddir="\${prefix}/lib/ggzd"
-- ggzdexecmodpath="${prefix}/lib/ggzd"
-- fi
-- else
-- ggzdexecmoddir="\${exec_prefix}/lib/ggzd"
-- ggzdexecmodpath="${exec_prefix}/lib/ggzd"
-- fi
-- else
-- ggzdexecmoddir="\${libdir}/ggzd"
-- ggzdexecmodpath="${libdir}/ggzd"
-- fi
-- AC_SUBST(ggzdexecmoddir)
-- AC_SUBST(ggzdexecmodpath)
--
-- # Perform actions given by argument 1.
-- $1
--fi
--
--])
--
--dnl ------------------------------------------------------------------------
--dnl AC_GGZ_CHECK_SERVER
--dnl Check for presence of GGZ server libraries.
--dnl
--dnl Simply call this function in programs that use GGZ. GGZ_SERVER will
--dnl be #defined in config.h, and created as a conditional
--dnl in Makefile.am files, if server libraries are present.
--dnl ------------------------------------------------------------------------
--dnl
--AC_DEFUN([AC_GGZ_CHECK_SERVER],
--[
-- AC_GGZ_LIBGGZ([try_ggz="yes"], [try_ggz="no"])
-- if test "$try_ggz" = "yes"; then
-- # For now, version 0.0.14 is required. This could be an additional
-- # parameter.
-- AC_GGZ_VERSION([0], [0], [14], [], [try_ggz=no])
-- fi
--
-- ggz_server="no"
-- AC_ARG_WITH(ggz-server,
-- AC_HELP_STRING([--with-ggz-server], [Force GGZ server support]),
-- [try_ggz_server=$withval])
--
-- 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
-- AC_GGZ_GGZDMOD([ggz_server="yes"], [ggz_server="no"])
-- fi
-- if test "$ggz_server" = "yes"; then
-- AC_GGZ_SERVER
-- AC_DEFINE(GGZ_SERVER, 1, [Server support for GGZ])
-- else
-- if test "$try_ggz_server" = "yes"; then
-- AC_MSG_ERROR([Could not configure GGZ server support. See above messages.])
-- fi
-- fi
-- fi
--
-- AM_CONDITIONAL(GGZ_SERVER, test "$ggz_server" = "yes")
--])
--
--dnl ------------------------------------------------------------------------
--dnl AC_GGZ_CHECK
--dnl Check for presence of GGZ client and server libraries.
--dnl
--dnl Simply call this function in programs that use GGZ. GGZ_SERVER and
--dnl GGZ_CLIENT will be #defined in config.h, and created as conditionals
--dnl in Makefile.am files.
--dnl
--dnl The only argument accepted gives the frontend for client embedding:
--dnl "gtk" => means the libggz-gtk library will be checked
--dnl ------------------------------------------------------------------------
--dnl
--AC_DEFUN([AC_GGZ_CHECK],
--[
-- AC_GGZ_INIT([defaults])
--
-- if test x$ac_ggz_prefix != xno ; then
-- AC_GGZ_LIBGGZ([try_ggz="yes"], [try_ggz="no"])
-- else
-- try_ggz=no
-- fi
--
-- if test "$try_ggz" = "yes"; then
-- # For now, version 0.0.14 is required. This could be an additional
-- # parameter.
-- AC_GGZ_VERSION([0], [0], [14], [], [try_ggz=no])
-- fi
--
-- ggz_client="no"
-- AC_ARG_WITH(ggz-client,
-- AC_HELP_STRING([--with-ggz-client], [Force GGZ client support]),
-- [try_ggz_client=$withval])
--
-- 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
-- AC_GGZ_GGZMOD([AC_GGZ_CONFIG([ggz_client="yes"], [ggz_client="no"])],
-- [ggz_client="no"])
-- fi
-- if test "$ggz_client" = "yes"; then
-- AC_DEFINE(GGZ_CLIENT, 1, [Client support for GGZ])
-- else
-- if test "$try_ggz_client" = "yes"; then
-- AC_MSG_ERROR([Could not configure GGZ client support. See above messages.])
-- fi
-- fi
-- fi
--
-- ggz_gtk="no"
-- if test "$ggz_client" = "yes"; then
-- if test "x$1" = "xgtk"; then
-- AC_GGZ_GTK([ggz_gtk="yes"])
-- if test $ggz_gtk = "yes"; then
-- AC_DEFINE(GGZ_GTK, 1, [Support for embedded GGZ through libggz-gtk])
-- fi
-- fi
-- fi
--
-- AM_CONDITIONAL(GGZ_CLIENT, test "$ggz_client" = "yes")
-- AM_CONDITIONAL(GGZ_GTK, test "$ggz_gtk" = "yes")
--
-- AC_GGZ_CHECK_SERVER
--])
--
--
--dnl FC_CHECK_READLINE_RUNTIME(EXTRA-LIBS, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
--dnl
--dnl This tests whether readline works at runtime. Here, "works"
--dnl means "doesn't dump core", as some versions do if linked
--dnl against wrong ncurses library. Compiles with LIBS modified
--dnl to included -lreadline and parameter EXTRA-LIBS.
--dnl Should already have checked that header and library exist.
--dnl
--AC_DEFUN([FC_CHECK_READLINE_RUNTIME],
--[AC_MSG_CHECKING(whether readline works at runtime)
--templibs="$LIBS"
--LIBS="-lreadline $1 $LIBS"
--AC_TRY_RUN([
--/*
-- * testrl.c
-- * File revision 0
-- * Check to make sure that readline works at runtime.
-- * (Specifically, some readline packages link against a wrong
-- * version of ncurses library and dump core at runtime.)
-- * (c) 2000 Jacob Lundberg, jacob at chaos2.org
-- */
--
--#include <stdio.h>
--/* We assume that the presence of readline has already been verified. */
--#include <readline/readline.h>
--#include <readline/history.h>
--
--/* Setup for readline. */
--#define TEMP_FILE "./conftest.readline.runtime"
--
--static void handle_readline_input_callback(char *line) {
--/* Generally taken from freeciv-1.11.4/server/sernet.c. */
-- if(line) {
-- if(*line)
-- add_history(line);
-- /* printf(line); */
-- }
--}
--
--int main(void) {
--/* Try to init readline and see if it barfs. */
-- using_history();
-- read_history(TEMP_FILE);
-- rl_initialize();
-- rl_callback_handler_install("_ ", handle_readline_input_callback);
-- rl_callback_handler_remove(); /* needed to re-set terminal */
-- return(0);
--}
--],
--[AC_MSG_RESULT(yes)
-- [$2]],
--[AC_MSG_RESULT(no)
-- [$3]],
--[AC_MSG_RESULT(unknown: cross-compiling)
-- [$2]])
--LIBS="$templibs"
--])
--
--AC_DEFUN([FC_HAS_READLINE],
--[
-- dnl Readline library and header files.
-- if test "$WITH_READLINE" = "yes" || test "$WITH_READLINE" = "maybe"; then
-- HAVE_TERMCAP="";
-- dnl Readline header
-- AC_CHECK_HEADER(readline/readline.h,
-- have_readline_header=1,
-- have_readline_header=0)
-- if test "$have_readline_header" = "0"; then
-- if test "$WITH_READLINE" = "yes"; then
-- AC_MSG_ERROR(Did not find readline header file.
--You may need to install a readline \"development\" package.)
-- else
-- AC_MSG_WARN(Did not find readline header file.
--Configuring server without readline support.)
-- fi
-- else
-- dnl Readline lib
-- AC_CHECK_LIB(readline, completion_matches,
-- have_readline_lib=1, have_readline_lib=0)
-- dnl Readline lib >= 4.2
-- AC_CHECK_LIB(readline, rl_completion_matches,
-- have_new_readline_lib=1, have_new_readline_lib=0)
-- if test "$have_readline_lib" != "1" && test "$have_new_readline_lib" != "1"; then
-- dnl Many readline installations are broken in that they
-- dnl don't set the dependency on the curses lib up correctly.
-- dnl We give them a hand by trying to guess what might be needed.
-- dnl
-- dnl Some older Unices may need both -lcurses and -ltermlib,
-- dnl but we don't support that just yet. This check will take
-- dnl the first lib that it finds and just link to that.
-- AC_CHECK_LIB(tinfo, tgetent, HAVE_TERMCAP="-ltinfo",
-- AC_CHECK_LIB(ncurses, tgetent, HAVE_TERMCAP="-lncurses",
-- AC_CHECK_LIB(curses, tgetent, HAVE_TERMCAP="-lcurses",
-- AC_CHECK_LIB(termcap, tgetent, HAVE_TERMCAP="-ltermcap",
-- AC_CHECK_LIB(termlib, tgetent, HAVE_TERMCAP="-ltermlib")
-- )
-- )
-- )
-- )
--
-- if test x"$HAVE_TERMCAP" != "x"; then
-- dnl We can't check for completion_matches() again,
-- dnl cause the result is cached. And autoconf doesn't
-- dnl seem to have a way to uncache it.
-- AC_CHECK_LIB(readline, filename_completion_function,
-- have_readline_lib=1, have_readline_lib=0,
-- "$HAVE_TERMCAP")
-- if test "$have_readline_lib" = "1"; then
-- AC_MSG_WARN(I had to manually add $HAVE_TERMCAP dependency to
--make readline library pass the test.)
-- fi
-- dnl We can't check for rl_completion_matches() again,
-- dnl cause the result is cached. And autoconf doesn't
-- dnl seem to have a way to uncache it.
-- AC_CHECK_LIB(readline, rl_filename_completion_function,
-- have_new_readline_lib=1, have_new_readline_lib=0,
-- "$HAVE_TERMCAP")
-- if test "$have_new_readline_lib" = "1"; then
-- AC_MSG_WARN(I had to manually add $HAVE_TERMCAP dependency to
--make readline library pass the test.)
-- fi
-- fi
-- fi
--
-- if test "$have_new_readline_lib" = "1"; then
-- FC_CHECK_READLINE_RUNTIME($HAVE_TERMCAP,
-- have_new_readline_lib=1, have_new_readline_lib=0)
-- if test "$have_new_readline_lib" = "1"; then
-- SERVER_LIBS="-lreadline $SERVER_LIBS $HAVE_TERMCAP"
-- AC_DEFINE_UNQUOTED(HAVE_LIBREADLINE, 1, [Readline support])
-- AC_DEFINE_UNQUOTED(HAVE_NEWLIBREADLINE, 1, [Modern readline])
-- else
-- if test "$WITH_READLINE" = "yes"; then
-- AC_MSG_ERROR(Specified --with-readline but the
--runtime test of readline failed.)
-- else
-- AC_MSG_WARN(Runtime test of readline failed.
--Configuring server without readline support.)
-- fi
-- fi
-- else
-- if test "$have_readline_lib" = "1"; then
-- FC_CHECK_READLINE_RUNTIME($HAVE_TERMCAP,
-- have_readline_lib=1, have_readline_lib=0)
-- if test "$have_readline_lib" = "1"; then
-- SERVER_LIBS="-lreadline $SERVER_LIBS $HAVE_TERMCAP"
-- AC_DEFINE_UNQUOTED(HAVE_LIBREADLINE, 1, [Readline support])
-- else
-- if test "$WITH_READLINE" = "yes"; then
-- AC_MSG_ERROR(Specified --with-readline but the
--runtime test of readline failed.)
-- else
-- AC_MSG_WARN(Runtime test of readline failed.
--Configuring server without readline support.)
-- fi
-- fi
-- else
-- if test "$WITH_READLINE" = "yes"; then
-- AC_MSG_ERROR(Specified --with-readline but the
--test to link against the library failed.)
-- else
-- AC_MSG_WARN(Test to link against readline library failed.
--Configuring server without readline support.)
-- fi
-- fi
-- fi
-- fi
-- fi
--])
--
--
--dnl @synopsis AC_FUNC_VSNPRINTF
--dnl
--dnl Check whether there is a reasonably sane vsnprintf() function installed.
--dnl "Reasonably sane" in this context means never clobbering memory beyond
--dnl the buffer supplied, and having a sensible return value. It is
--dnl explicitly allowed not to NUL-terminate the return value, however.
--dnl
--dnl @version $Id: vsnprintf.m4 4430 2002-04-13 13:52:03Z rfalke $
--dnl @author Gaute Strokkenes <gs234 at cam.ac.uk>
--dnl
--AC_DEFUN([AC_FUNC_VSNPRINTF],
--[AC_CACHE_CHECK(for working vsnprintf,
-- ac_cv_func_working_vsnprintf,
--[AC_TRY_RUN(
--[#include <stdio.h>
--#include <stdarg.h>
--
--int
--doit(char * s, ...)
--{
-- char buffer[32];
-- va_list args;
-- int r;
--
-- buffer[5] = 'X';
--
-- va_start(args, s);
-- r = vsnprintf(buffer, 5, s, args);
-- va_end(args);
--
-- /* -1 is pre-C99, 7 is C99. */
--
-- if (r != -1 && r != 7)
-- exit(1);
--
-- /* We deliberately do not care if the result is NUL-terminated or
-- not, since this is easy to work around like this. */
--
-- buffer[4] = 0;
--
-- /* Simple sanity check. */
--
-- if (strcmp(buffer, "1234"))
-- exit(1);
--
-- if (buffer[5] != 'X')
-- exit(1);
--
-- exit(0);
--}
--
--int
--main(void)
--{
-- doit("1234567");
-- exit(1);
--}], ac_cv_func_working_vsnprintf=yes, ac_cv_func_working_vsnprintf=no, ac_cv_func_working_vsnprintf=no)])
--dnl Note that the default is to be pessimistic in the case of cross compilation.
--dnl If you know that the target has a sensible vsnprintf(), you can get around this
--dnl by setting ac_func_vsnprintf to yes, as described in the Autoconf manual.
--if test $ac_cv_func_working_vsnprintf = yes; then
-- AC_DEFINE(HAVE_WORKING_VSNPRINTF, 1,
-- [Define if you have a version of the 'vsnprintf' function
-- that honours the size argument and has a proper return value.])
--fi
--])# AC_FUNC_VSNPRINTF
--
--dnl FC_CHECK_GETTIMEOFDAY_RUNTIME(EXTRA-LIBS, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
--dnl
--dnl This tests whether gettimeofday works at runtime. Here, "works"
--dnl means: time doesn't go backward and time doesn't jump forward by
--dnl a huge amount. It seems that glibc 2.3.1 is broken in this respect.
--
--AC_DEFUN([FC_CHECK_GETTIMEOFDAY_RUNTIME],
--[
--templibs="$LIBS"
--LIBS="$1 $LIBS"
--AC_TRY_RUN([
--#include <sys/time.h>
--#include <unistd.h>
--#include <stdio.h>
--#include <time.h>
--#include <stdlib.h>
--
--#define VERBOSE 0
--#define SECONDS 3
--
--int main(int argc, char **argv)
--{
-- struct timeval tv[2], start, end;
-- int calls;
--
-- if (gettimeofday(&start, NULL) == -1) {
-- return 1;
-- }
-- end = start;
-- end.tv_sec += SECONDS;
--
-- tv[0] = start;
-- tv[1] = start;
--
-- for (calls = 0;; calls++) {
-- time_t sec;
--
-- if (gettimeofday(&tv[0], NULL) == -1) {
-- return 1;
-- }
--
-- if (tv[0].tv_sec < tv[1].tv_sec) {
--#if VERBOSE
-- double diff =
-- (tv[1].tv_sec - start.tv_sec) +
-- ((tv[1].tv_usec - start.tv_usec) / 1e6);
-- printf("after %fs: going backward by %lds\n", diff,
-- tv[1].tv_sec - tv[0].tv_sec);
--#endif
-- return 1;
-- }
--
-- if (tv[0].tv_sec == tv[1].tv_sec && tv[0].tv_usec < tv[1].tv_usec) {
--#if VERBOSE
-- double diff =
-- (tv[1].tv_sec - start.tv_sec) +
-- ((tv[1].tv_usec - start.tv_usec) / 1e6);
-- printf("after %fs: going backward by %ldus\n", diff,
-- tv[1].tv_usec - tv[0].tv_usec);
--#endif
-- return 1;
-- }
--
-- if (tv[0].tv_sec > tv[1].tv_sec + 1) {
--#if VERBOSE
-- double diff =
-- (tv[1].tv_sec - start.tv_sec) +
-- ((tv[1].tv_usec - start.tv_usec) / 1e6);
-- printf("after %fs: going forward by %lds\n", diff,
-- tv[0].tv_sec - tv[1].tv_sec);
--#endif
-- return 1;
-- }
--
-- sec = time(NULL);
--
-- if (abs(sec - tv[0].tv_sec) > 1) {
--#if VERBOSE
-- double diff =
-- (tv[1].tv_sec - start.tv_sec) +
-- ((tv[1].tv_usec - start.tv_usec) / 1e6);
-- printf("after %fs: time() = %ld, gettimeofday = %ld, diff = %ld\n", diff,
-- (long)sec, (long)tv[0].tv_sec, sec - (long)tv[0].tv_sec);
--#endif
-- return 1;
-- }
--
-- if (timercmp(&tv[0], &end, >)) {
-- break;
-- }
-- tv[1] = tv[0];
-- }
--
--#if VERBOSE
-- {
-- double diff =
-- (tv[1].tv_sec - start.tv_sec) +
-- ((tv[1].tv_usec - start.tv_usec) / 1e6);
-- printf("%d calls in %fs = %fus/call\n", calls, diff, 1e6 * diff / calls);
-- }
--#endif
-- return 0;
--}
--],
--[AC_MSG_RESULT(yes)
-- [$2]],
--[AC_MSG_RESULT(no)
-- [$3]],
--[AC_MSG_RESULT(unknown: cross-compiling)
-- [$3]])
--LIBS="$templibs"
--])
-+rm -rf conftest.dir
-
-+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-+AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-+AC_SUBST([am__tar])
-+AC_SUBST([am__untar])
-+]) # _AM_PROG_TAR
-+
-+m4_include([m4/auth.m4])
-+m4_include([m4/c99.m4])
-+m4_include([m4/debug.m4])
-+m4_include([m4/freetype2.m4])
-+m4_include([m4/gettext.m4])
-+m4_include([m4/gettimeofday.m4])
-+m4_include([m4/ggz.m4])
-+m4_include([m4/glibc21.m4])
-+m4_include([m4/gtk-2.0.m4])
-+m4_include([m4/gtk2-client.m4])
-+m4_include([m4/iconv.m4])
-+m4_include([m4/isc-posix.m4])
-+m4_include([m4/lcmessage.m4])
-+m4_include([m4/locale.m4])
-+m4_include([m4/ngettext.m4])
-+m4_include([m4/no-client.m4])
-+m4_include([m4/pkg.m4])
-+m4_include([m4/progtest.m4])
-+m4_include([m4/readline.m4])
-+m4_include([m4/sdl-client.m4])
-+m4_include([m4/sdl.m4])
-+m4_include([m4/sound.m4])
-+m4_include([m4/vsnprintf.m4])
-+m4_include([m4/win32-client.m4])
-+m4_include([m4/x.m4])
-+m4_include([m4/xaw-client.m4])
-diff -Nuar freeciv-2.1.5.orig/configure freeciv-2.1.5/configure
---- freeciv-2.1.5.orig/configure 2008-06-16 09:57:05.000000000 +0200
-+++ freeciv-2.1.5/configure 2008-06-26 19:57:08.000000000 +0200
-@@ -1,36 +1,100 @@
- #! /bin/sh
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.57.
-+# Generated by GNU Autoconf 2.61.
- #
--# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
--# Free Software Foundation, Inc.
-+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-+# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
- # This configure script is free software; the Free Software Foundation
- # gives unlimited permission to copy, distribute and modify it.
- ## --------------------- ##
- ## 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=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '${1+"$@"}'='"$@"'
--elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-- set -o posix
-+ setopt NO_GLOB_SUBST
-+else
-+ case `(set -o) 2>/dev/null` in
-+ *posix*) set -o posix ;;
-+esac
-+
-+fi
-+
-+
-+
-+
-+# PATH needs CR
-+# Avoid depending upon Character Ranges.
-+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-+as_cr_digits='0123456789'
-+as_cr_alnum=$as_cr_Letters$as_cr_digits
-+
-+# The user is always right.
-+if test "${PATH_SEPARATOR+set}" != set; then
-+ echo "#! /bin/sh" >conf$$.sh
-+ echo "exit 0" >>conf$$.sh
-+ chmod +x conf$$.sh
-+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-+ PATH_SEPARATOR=';'
-+ else
-+ PATH_SEPARATOR=:
-+ fi
-+ rm -f conf$$.sh
- fi
-
- # Support unset when possible.
--if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
-+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
- as_unset=unset
- else
- as_unset=false
- fi
-
-
-+# IFS
-+# We need space, tab and new line, in precisely that order. Quoting is
-+# there to prevent editors from complaining about space-tab.
-+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-+# splitting by setting IFS to empty value.)
-+as_nl='
-+'
-+IFS=" "" $as_nl"
-+
-+# Find who we are. Look in the path if we contain no directory separator.
-+case $0 in
-+ *[\\/]* ) as_myself=$0 ;;
-+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-+done
-+IFS=$as_save_IFS
-+
-+ ;;
-+esac
-+# We did not find ourselves, most probably we were run as `sh COMMAND'
-+# in which case we are not to be found in the path.
-+if test "x$as_myself" = x; then
-+ as_myself=$0
-+fi
-+if test ! -f "$as_myself"; then
-+ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-+ { (exit 1); exit 1; }
-+fi
-+
- # Work around bugs in pre-3.0 UWIN ksh.
--$as_unset ENV MAIL MAILPATH
-+for as_var in ENV MAIL MAILPATH
-+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+done
- PS1='$ '
- PS2='> '
- PS4='+ '
-@@ -41,21 +105,22 @@
- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
- LC_TELEPHONE LC_TIME
- do
-- if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
-+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
- eval $as_var=C; export $as_var
- else
-- $as_unset $as_var
-+ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
- fi
- done
-
- # Required to use basename.
--if expr a : '\(a\)' >/dev/null 2>&1; then
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
- else
- as_expr=false
- fi
-
--if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
- as_basename=basename
- else
- as_basename=false
-@@ -63,206 +128,447 @@
-
-
- # Name of the executable.
--as_me=`$as_basename "$0" ||
-+as_me=`$as_basename -- "$0" ||
- $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- X"$0" : 'X\(//\)$' \| \
-- X"$0" : 'X\(/\)$' \| \
-- . : '\(.\)' 2>/dev/null ||
-+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
- echo X/"$0" |
-- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-- /^X\/\(\/\/\)$/{ s//\1/; q; }
-- /^X\/\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
-+ sed '/^.*\/\([^/][^/]*\)\/*$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\/\(\/\/\)$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\/\(\/\).*/{
-+ s//\1/
-+ q
-+ }
-+ s/.*/./; q'`
-
-+# CDPATH.
-+$as_unset CDPATH
-
--# PATH needs CR, and LINENO needs CR and PATH.
--# Avoid depending upon Character Ranges.
--as_cr_letters='abcdefghijklmnopqrstuvwxyz'
--as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
--as_cr_Letters=$as_cr_letters$as_cr_LETTERS
--as_cr_digits='0123456789'
--as_cr_alnum=$as_cr_Letters$as_cr_digits
-
--# The user is always right.
--if test "${PATH_SEPARATOR+set}" != set; then
-- echo "#! /bin/sh" >conf$$.sh
-- echo "exit 0" >>conf$$.sh
-- chmod +x conf$$.sh
-- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-- PATH_SEPARATOR=';'
-- else
-- PATH_SEPARATOR=:
-- fi
-- rm -f conf$$.sh
-+if test "x$CONFIG_SHELL" = x; then
-+ if (eval ":") 2>/dev/null; then
-+ as_have_required=yes
-+else
-+ as_have_required=no
-+fi
-+
-+ if test $as_have_required = yes && (eval ":
-+(as_func_return () {
-+ (exit \$1)
-+}
-+as_func_success () {
-+ as_func_return 0
-+}
-+as_func_failure () {
-+ as_func_return 1
-+}
-+as_func_ret_success () {
-+ return 0
-+}
-+as_func_ret_failure () {
-+ return 1
-+}
-+
-+exitcode=0
-+if as_func_success; then
-+ :
-+else
-+ exitcode=1
-+ echo as_func_success failed.
- fi
-
-+if as_func_failure; then
-+ exitcode=1
-+ echo as_func_failure succeeded.
-+fi
-
-- as_lineno_1=$LINENO
-- as_lineno_2=$LINENO
-- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-- test "x$as_lineno_1" != "x$as_lineno_2" &&
-- test "x$as_lineno_3" = "x$as_lineno_2" || {
-- # Find who we are. Look in the path if we contain no path at all
-- # relative or not.
-- case $0 in
-- *[\\/]* ) as_myself=$0 ;;
-- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
--done
-+if as_func_ret_success; then
-+ :
-+else
-+ exitcode=1
-+ echo as_func_ret_success failed.
-+fi
-
-- ;;
-- esac
-- # We did not find ourselves, most probably we were run as `sh COMMAND'
-- # in which case we are not to be found in the path.
-- if test "x$as_myself" = x; then
-- as_myself=$0
-- fi
-- if test ! -f "$as_myself"; then
-- { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
-- { (exit 1); exit 1; }; }
-- fi
-- case $CONFIG_SHELL in
-- '')
-+if as_func_ret_failure; then
-+ exitcode=1
-+ echo as_func_ret_failure succeeded.
-+fi
-+
-+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-+ :
-+else
-+ exitcode=1
-+ echo positional parameters were not saved.
-+fi
-+
-+test \$exitcode = 0) || { (exit 1); exit 1; }
-+
-+(
-+ as_lineno_1=\$LINENO
-+ as_lineno_2=\$LINENO
-+ test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
-+ test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-+") 2> /dev/null; then
-+ :
-+else
-+ as_candidate_shells=
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for as_base in sh bash ksh sh5; do
-- case $as_dir in
-+ case $as_dir in
- /*)
-- if ("$as_dir/$as_base" -c '
-+ for as_base in sh bash ksh sh5; do
-+ as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
-+ done;;
-+ esac
-+done
-+IFS=$as_save_IFS
-+
-+
-+ for as_shell in $as_candidate_shells $SHELL; do
-+ # 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
-+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-+ emulate sh
-+ NULLCMD=:
-+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-+ # is contrary to our usage. Disable this feature.
-+ alias -g '${1+"$@"}'='"$@"'
-+ setopt NO_GLOB_SUBST
-+else
-+ case `(set -o) 2>/dev/null` in
-+ *posix*) set -o posix ;;
-+esac
-+
-+fi
-+
-+
-+:
-+_ASEOF
-+}; then
-+ CONFIG_SHELL=$as_shell
-+ as_have_required=yes
-+ if { "$as_shell" 2> /dev/null <<\_ASEOF
-+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-+ emulate sh
-+ NULLCMD=:
-+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-+ # is contrary to our usage. Disable this feature.
-+ alias -g '${1+"$@"}'='"$@"'
-+ setopt NO_GLOB_SUBST
-+else
-+ case `(set -o) 2>/dev/null` in
-+ *posix*) set -o posix ;;
-+esac
-+
-+fi
-+
-+
-+:
-+(as_func_return () {
-+ (exit $1)
-+}
-+as_func_success () {
-+ as_func_return 0
-+}
-+as_func_failure () {
-+ as_func_return 1
-+}
-+as_func_ret_success () {
-+ return 0
-+}
-+as_func_ret_failure () {
-+ return 1
-+}
-+
-+exitcode=0
-+if as_func_success; then
-+ :
-+else
-+ exitcode=1
-+ echo as_func_success failed.
-+fi
-+
-+if as_func_failure; then
-+ exitcode=1
-+ echo as_func_failure succeeded.
-+fi
-+
-+if as_func_ret_success; then
-+ :
-+else
-+ exitcode=1
-+ echo as_func_ret_success failed.
-+fi
-+
-+if as_func_ret_failure; then
-+ exitcode=1
-+ echo as_func_ret_failure succeeded.
-+fi
-+
-+if ( set x; as_func_ret_success y && test x = "$1" ); then
-+ :
-+else
-+ exitcode=1
-+ echo positional parameters were not saved.
-+fi
-+
-+test $exitcode = 0) || { (exit 1); exit 1; }
-+
-+(
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
-- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
- test "x$as_lineno_1" != "x$as_lineno_2" &&
-- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
-- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-- CONFIG_SHELL=$as_dir/$as_base
-- export CONFIG_SHELL
-- exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-- fi;;
-- esac
-- done
--done
--;;
-- esac
-+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
-+
-+_ASEOF
-+}; then
-+ break
-+fi
-+
-+fi
-+
-+ done
-+
-+ if test "x$CONFIG_SHELL" != x; then
-+ for as_var in BASH_ENV ENV
-+ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+ done
-+ export CONFIG_SHELL
-+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-+fi
-+
-+
-+ if test $as_have_required = no; then
-+ echo This script requires a shell more modern than all the
-+ echo shells that I found on your system. Please install a
-+ echo modern shell, or manually run the script under such a
-+ echo shell if you do have one.
-+ { (exit 1); exit 1; }
-+fi
-+
-+
-+fi
-+
-+fi
-+
-+
-+
-+(eval "as_func_return () {
-+ (exit \$1)
-+}
-+as_func_success () {
-+ as_func_return 0
-+}
-+as_func_failure () {
-+ as_func_return 1
-+}
-+as_func_ret_success () {
-+ return 0
-+}
-+as_func_ret_failure () {
-+ return 1
-+}
-+
-+exitcode=0
-+if as_func_success; then
-+ :
-+else
-+ exitcode=1
-+ echo as_func_success failed.
-+fi
-+
-+if as_func_failure; then
-+ exitcode=1
-+ echo as_func_failure succeeded.
-+fi
-+
-+if as_func_ret_success; then
-+ :
-+else
-+ exitcode=1
-+ echo as_func_ret_success failed.
-+fi
-+
-+if as_func_ret_failure; then
-+ exitcode=1
-+ echo as_func_ret_failure succeeded.
-+fi
-+
-+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-+ :
-+else
-+ exitcode=1
-+ echo positional parameters were not saved.
-+fi
-+
-+test \$exitcode = 0") || {
-+ echo No shell found that supports shell functions.
-+ echo Please tell autoconf at gnu.org about your system,
-+ echo including any error possibly output before this
-+ echo message
-+}
-+
-+
-+
-+ as_lineno_1=$LINENO
-+ as_lineno_2=$LINENO
-+ test "x$as_lineno_1" != "x$as_lineno_2" &&
-+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
- # uniformly replaced by the line number. The first 'sed' inserts a
-- # line-number line before each line; the second 'sed' does the real
-- # work. The second script uses 'N' to pair each line-number line
-- # with the numbered line, and appends trailing '-' during
-- # substitution so that $LINENO is not a special case at line end.
-+ # line-number line after each line using $LINENO; the second 'sed'
-+ # does the real work. The second script uses 'N' to pair each
-+ # line-number line with the line containing $LINENO, and appends
-+ # trailing '-' during substitution so that $LINENO is not a special
-+ # case at line end.
- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
-- sed '=' <$as_myself |
-+ # scripts with optimization help from Paolo Bonzini. Blame Lee
-+ # E. McMahon (1931-1989) for sed's syntax. :-)
-+ sed -n '
-+ p
-+ /[$]LINENO/=
-+ ' <$as_myself |
- sed '
-+ s/[$]LINENO.*/&-/
-+ t lineno
-+ b
-+ :lineno
- N
-- s,$,-,
-- : loop
-- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-+ :loop
-+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
- t loop
-- s,-$,,
-- s,^['$as_cr_digits']*\n,,
-+ s/-\n.*//
- ' >$as_me.lineno &&
-- chmod +x $as_me.lineno ||
-+ chmod +x "$as_me.lineno" ||
- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
- { (exit 1); exit 1; }; }
-
- # Don't try to exec as it changes $[0], causing all sort of problems
- # (the dirname of $[0] is not the place where we might find the
-- # original and so on. Autoconf is especially sensible to this).
-- . ./$as_me.lineno
-+ # original and so on. Autoconf is especially sensitive to this).
-+ . "./$as_me.lineno"
- # Exit status is that of the last command.
- exit
- }
-
-
--case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-- *c*,-n*) ECHO_N= ECHO_C='
--' ECHO_T=' ' ;;
-- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-- *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
-+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-+ as_dirname=dirname
-+else
-+ as_dirname=false
-+fi
-+
-+ECHO_C= ECHO_N= ECHO_T=
-+case `echo -n x` in
-+-n*)
-+ case `echo 'x\c'` in
-+ *c*) ECHO_T=' ';; # ECHO_T is single tab character.
-+ *) ECHO_C='\c';;
-+ esac;;
-+*)
-+ ECHO_N='-n';;
- esac
-
--if expr a : '\(a\)' >/dev/null 2>&1; then
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
- else
- as_expr=false
- fi
-
- rm -f conf$$ conf$$.exe conf$$.file
-+if test -d conf$$.dir; then
-+ rm -f conf$$.dir/conf$$.file
-+else
-+ rm -f conf$$.dir
-+ mkdir conf$$.dir
-+fi
- echo >conf$$.file
- if ln -s conf$$.file conf$$ 2>/dev/null; then
-- # We could just check for DJGPP; but this test a) works b) is more generic
-- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-- if test -f conf$$.exe; then
-- # Don't use ln at all; we don't have any links
-+ as_ln_s='ln -s'
-+ # ... but there are two gotchas:
-+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-+ # In both cases, we have to default to `cp -p'.
-+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
-- else
-- as_ln_s='ln -s'
-- fi
- elif ln conf$$.file conf$$ 2>/dev/null; then
- as_ln_s=ln
- else
- as_ln_s='cp -p'
- fi
--rm -f conf$$ conf$$.exe conf$$.file
-+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-+rmdir conf$$.dir 2>/dev/null
-
- if mkdir -p . 2>/dev/null; then
- as_mkdir_p=:
- else
-+ test -d ./-p && rmdir ./-p
- as_mkdir_p=false
- fi
-
--as_executable_p="test -f"
-+if test -x / >/dev/null 2>&1; then
-+ as_test_x='test -x'
-+else
-+ 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
-+as_executable_p=$as_test_x
-
- # Sed expression to map a string onto a valid CPP name.
--as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
-+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
- # Sed expression to map a string onto a valid variable name.
--as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
--
-+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
--# IFS
--# We need space, tab and new line, in precisely that order.
--as_nl='
--'
--IFS=" $as_nl"
-
--# CDPATH.
--$as_unset CDPATH
-
-+exec 7<&0 </dev/null 6>&1
-
- # Name of the host.
- # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
- # so uname gets run too.
- ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
--exec 6>&1
--
- #
- # Initializations.
- #
- ac_default_prefix=/usr/local
-+ac_clean_files=
- ac_config_libobj_dir=.
-+LIBOBJS=
- cross_compiling=no
- subdirs=
- MFLAGS=
- MAKEFLAGS=
- SHELL=${CONFIG_SHELL-/bin/sh}
-
--# Maximum number of lines to put in a shell here document.
--# This variable seems obsolete. It should probably be removed, and
--# only ac_max_sed_lines should be used.
--: ${ac_max_here_lines=38}
--
- # Identity of this package.
- PACKAGE_NAME=
- PACKAGE_TARNAME=
-@@ -274,42 +580,286 @@
- # 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>
--#else
--# if HAVE_STDINT_H
--# include <stdint.h>
--# endif
- #endif
--#if HAVE_UNISTD_H
-+#ifdef HAVE_STDINT_H
-+# include <stdint.h>
-+#endif
-+#ifdef HAVE_UNISTD_H
- # include <unistd.h>
- #endif"
-
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os MAJOR_VERSION MINOR_VERSION NETWORK_CAPSTRING INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP EGREP AUTH_CFLAGS AUTH_LIBS SERVER_TRUE SERVER_FALSE CLIENT_TRUE CLIENT_FALSE FTWL_TRUE FTWL_FALSE MAKE_DATA_TRUE MAKE_DATA_FALSE MAKE_CLIENT_INCLUDE_TRUE MAKE_CLIENT_INCLUDE_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE LN_S RANLIB ac_ct_RANLIB AR ac_ct_AR UNAME LIBICONV localedir ALLOCA GLIBC21 USE_NLS MSGFMT GMSGFMT XGETTEXT INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATALOGS CATOBJEXT GMOFILES INTLLIBS INTLOBJS POFILES POSUB DATADIRNAME INSTOBJEXT GENCAT MKINSTALLDIRS INTL_LIBTOOL_SUFFIX_PREFIX AUTO_DEPS WINDRES ac_ct_WINDRES GZIP PKG_CONFIG GTK_CFLAGS GTK_LIBS SDL_CONFIG SDL_CFLAGS SDL_LIBS FT2_CONFIG FT2_CFLAGS FT2_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS ac_pt_PKG_CONFIG PNG_CFLAGS PNG_LIBS 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_GTK_TRUE GGZ_GTK_FALSE ggzdmod_libraries ggzdmod_includes GGZDMOD_INCLUDES GGZDMOD_LDFLAGS LIB_GGZDMOD ggzdconfdir ggzddatadir ggzdexecmoddir ggzdexecmodpath GGZ_SERVER_TRUE GGZ_SERVER_FALSE gui_sources CLIENT_CFLAGS CLIENT_CXXFLAGS CLIENT_LIBS CLIENT_LDFLAGS SOUND_CFLAGS SOUND_LIBS FTWL_CFLAGS VERSION_WITHOUT_LABEL VERSION_LABEL AUDIO_SDL_TRUE AUDIO_SDL_FALSE CLIENT_GUI_SDL_TRUE CLIENT_GUI_SDL_FALSE CLIENT_GUI_GTK_2_0_TRUE CLIENT_GUI_GTK_2_0_FALSE CLIENT_GUI_XAW_TRUE CLIENT_GUI_XAW_FALSE CLIENT_GUI_BEOS_TRUE CLIENT_GUI_BEOS_FALSE CLIENT_GUI_STUB_TRUE CLIENT_GUI_STUB_FALSE CLIENT_GUI_WIN32_TRUE CLIENT_GUI_WIN32_FALSE CLIENT_GUI_FTWL_TRUE CLIENT_GUI_FTWL_FALSE FTWL_X11_TRUE FTWL_X11_FALSE FTWL_SDL_TRUE FTWL_SDL_FALSE FTWL_OPENGL_TRUE FTWL_OPENGL_FALSE MINGW32_TRUE MINGW32_FALSE SERVER_LIBS CONFIGURE_DEPENDENCIES LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL
-+PATH_SEPARATOR
-+PACKAGE_NAME
-+PACKAGE_TARNAME
-+PACKAGE_VERSION
-+PACKAGE_STRING
-+PACKAGE_BUGREPORT
-+exec_prefix
-+prefix
-+program_transform_name
-+bindir
-+sbindir
-+libexecdir
-+datarootdir
-+datadir
-+sysconfdir
-+sharedstatedir
-+localstatedir
-+includedir
-+oldincludedir
-+docdir
-+infodir
-+htmldir
-+dvidir
-+pdfdir
-+psdir
-+libdir
-+localedir
-+mandir
-+DEFS
-+ECHO_C
-+ECHO_N
-+ECHO_T
-+LIBS
-+build_alias
-+host_alias
-+target_alias
-+build
-+build_cpu
-+build_vendor
-+build_os
-+host
-+host_cpu
-+host_vendor
-+host_os
-+MAJOR_VERSION
-+MINOR_VERSION
-+NETWORK_CAPSTRING
-+INSTALL_PROGRAM
-+INSTALL_SCRIPT
-+INSTALL_DATA
-+am__isrc
-+CYGPATH_W
-+PACKAGE
-+VERSION
-+ACLOCAL
-+AUTOCONF
-+AUTOMAKE
-+AUTOHEADER
-+MAKEINFO
-+install_sh
-+STRIP
-+INSTALL_STRIP_PROGRAM
-+mkdir_p
-+AWK
-+SET_MAKE
-+am__leading_dot
-+AMTAR
-+am__tar
-+am__untar
-+MAINTAINER_MODE_TRUE
-+MAINTAINER_MODE_FALSE
-+MAINT
-+CC
-+CFLAGS
-+LDFLAGS
-+CPPFLAGS
-+ac_ct_CC
-+EXEEXT
-+OBJEXT
-+DEPDIR
-+am__include
-+am__quote
-+AMDEP_TRUE
-+AMDEP_FALSE
-+AMDEPBACKSLASH
-+CCDEPMODE
-+am__fastdepCC_TRUE
-+am__fastdepCC_FALSE
-+CPP
-+GREP
-+EGREP
-+AUTH_CFLAGS
-+AUTH_LIBS
-+SERVER_TRUE
-+SERVER_FALSE
-+CLIENT_TRUE
-+CLIENT_FALSE
-+FTWL_TRUE
-+FTWL_FALSE
-+MAKE_DATA_TRUE
-+MAKE_DATA_FALSE
-+MAKE_CLIENT_INCLUDE_TRUE
-+MAKE_CLIENT_INCLUDE_FALSE
-+CXX
-+CXXFLAGS
-+ac_ct_CXX
-+CXXDEPMODE
-+am__fastdepCXX_TRUE
-+am__fastdepCXX_FALSE
-+LN_S
-+RANLIB
-+AR
-+UNAME
-+LIBICONV
-+ALLOCA
-+GLIBC21
-+USE_NLS
-+MSGFMT
-+GMSGFMT
-+XGETTEXT
-+INTLBISON
-+BUILD_INCLUDED_LIBINTL
-+USE_INCLUDED_LIBINTL
-+CATALOGS
-+CATOBJEXT
-+GMOFILES
-+INTLLIBS
-+INTLOBJS
-+POFILES
-+POSUB
-+DATADIRNAME
-+INSTOBJEXT
-+GENCAT
-+MKINSTALLDIRS
-+INTL_LIBTOOL_SUFFIX_PREFIX
-+AUTO_DEPS
-+WINDRES
-+GZIP
-+PKG_CONFIG
-+GTK_CFLAGS
-+GTK_LIBS
-+SDL_CONFIG
-+SDL_CFLAGS
-+SDL_LIBS
-+FT2_CONFIG
-+FT2_CFLAGS
-+FT2_LIBS
-+XMKMF
-+X_CFLAGS
-+X_PRE_LIBS
-+X_LIBS
-+X_EXTRA_LIBS
-+PNG_CFLAGS
-+PNG_LIBS
-+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_GTK_TRUE
-+GGZ_GTK_FALSE
-+ggzdmod_libraries
-+ggzdmod_includes
-+GGZDMOD_INCLUDES
-+GGZDMOD_LDFLAGS
-+LIB_GGZDMOD
-+ggzdconfdir
-+ggzddatadir
-+ggzdexecmoddir
-+ggzdexecmodpath
-+GGZ_SERVER_TRUE
-+GGZ_SERVER_FALSE
-+gui_sources
-+CLIENT_CFLAGS
-+CLIENT_CXXFLAGS
-+CLIENT_LIBS
-+CLIENT_LDFLAGS
-+SOUND_CFLAGS
-+SOUND_LIBS
-+FTWL_CFLAGS
-+VERSION_WITHOUT_LABEL
-+VERSION_LABEL
-+AUDIO_SDL_TRUE
-+AUDIO_SDL_FALSE
-+CLIENT_GUI_SDL_TRUE
-+CLIENT_GUI_SDL_FALSE
-+CLIENT_GUI_GTK_2_0_TRUE
-+CLIENT_GUI_GTK_2_0_FALSE
-+CLIENT_GUI_XAW_TRUE
-+CLIENT_GUI_XAW_FALSE
-+CLIENT_GUI_BEOS_TRUE
-+CLIENT_GUI_BEOS_FALSE
-+CLIENT_GUI_STUB_TRUE
-+CLIENT_GUI_STUB_FALSE
-+CLIENT_GUI_WIN32_TRUE
-+CLIENT_GUI_WIN32_FALSE
-+CLIENT_GUI_FTWL_TRUE
-+CLIENT_GUI_FTWL_FALSE
-+FTWL_X11_TRUE
-+FTWL_X11_FALSE
-+FTWL_SDL_TRUE
-+FTWL_SDL_FALSE
-+FTWL_OPENGL_TRUE
-+FTWL_OPENGL_FALSE
-+MINGW32_TRUE
-+MINGW32_FALSE
-+SERVER_LIBS
-+CONFIGURE_DEPENDENCIES
-+LIBOBJS
-+LTLIBOBJS'
- ac_subst_files=''
-+ ac_precious_vars='build_alias
-+host_alias
-+target_alias
-+CC
-+CFLAGS
-+LDFLAGS
-+LIBS
-+CPPFLAGS
-+CPP
-+CXX
-+CXXFLAGS
-+CCC
-+XMKMF
-+PKG_CONFIG
-+PNG_CFLAGS
-+PNG_LIBS'
-+
-
- # Initialize some variables set by options.
- ac_init_help=
-@@ -336,34 +886,48 @@
- # and all the variables that are supposed to be based on exec_prefix
- # by default will actually change.
- # Use braces instead of parens because sh, perl, etc. also accept them.
-+# (The list follows the same order as the GNU Coding Standards.)
- bindir='${exec_prefix}/bin'
- sbindir='${exec_prefix}/sbin'
- libexecdir='${exec_prefix}/libexec'
--datadir='${prefix}/share'
-+datarootdir='${prefix}/share'
-+datadir='${datarootdir}'
- sysconfdir='${prefix}/etc'
- sharedstatedir='${prefix}/com'
- localstatedir='${prefix}/var'
--libdir='${exec_prefix}/lib'
- includedir='${prefix}/include'
- oldincludedir='/usr/include'
--infodir='${prefix}/info'
--mandir='${prefix}/man'
-+docdir='${datarootdir}/doc/${PACKAGE}'
-+infodir='${datarootdir}/info'
-+htmldir='${docdir}'
-+dvidir='${docdir}'
-+pdfdir='${docdir}'
-+psdir='${docdir}'
-+libdir='${exec_prefix}/lib'
-+localedir='${datarootdir}/locale'
-+mandir='${datarootdir}/man'
-
- ac_prev=
-+ac_dashdash=
- for ac_option
- do
- # If the previous option needs an argument, assign it.
- if test -n "$ac_prev"; then
-- eval "$ac_prev=\$ac_option"
-+ eval $ac_prev=\$ac_option
- ac_prev=
- continue
- fi
-
-- ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
-+ case $ac_option in
-+ *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-+ *) ac_optarg=yes ;;
-+ esac
-
- # Accept the important Cygnus configure options, so we can diagnose typos.
-
-- case $ac_option in
-+ case $ac_dashdash$ac_option in
-+ --)
-+ ac_dashdash=yes ;;
-
- -bindir | --bindir | --bindi | --bind | --bin | --bi)
- ac_prev=bindir ;;
-@@ -385,33 +949,45 @@
- --config-cache | -C)
- cache_file=config.cache ;;
-
-- -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-+ -datadir | --datadir | --datadi | --datad)
- ac_prev=datadir ;;
-- -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-- | --da=*)
-+ -datadir=* | --datadir=* | --datadi=* | --datad=*)
- datadir=$ac_optarg ;;
-
-+ -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
-+ | --dataroo | --dataro | --datar)
-+ ac_prev=datarootdir ;;
-+ -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
-+ | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
-+ datarootdir=$ac_optarg ;;
-+
- -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'`
-- eval "enable_$ac_feature=no" ;;
-+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-+ eval enable_$ac_feature=no ;;
-+
-+ -docdir | --docdir | --docdi | --doc | --do)
-+ ac_prev=docdir ;;
-+ -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
-+ docdir=$ac_optarg ;;
-+
-+ -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
-+ ac_prev=dvidir ;;
-+ -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
-+ dvidir=$ac_optarg ;;
-
- -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'`
-- case $ac_option in
-- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-- *) ac_optarg=yes ;;
-- esac
-- eval "enable_$ac_feature='$ac_optarg'" ;;
-+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-+ eval enable_$ac_feature=\$ac_optarg ;;
-
- -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
- | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-@@ -438,6 +1014,12 @@
- -host=* | --host=* | --hos=* | --ho=*)
- host_alias=$ac_optarg ;;
-
-+ -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
-+ ac_prev=htmldir ;;
-+ -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
-+ | --ht=*)
-+ htmldir=$ac_optarg ;;
-+
- -includedir | --includedir | --includedi | --included | --include \
- | --includ | --inclu | --incl | --inc)
- ac_prev=includedir ;;
-@@ -462,13 +1044,16 @@
- | --libexe=* | --libex=* | --libe=*)
- libexecdir=$ac_optarg ;;
-
-+ -localedir | --localedir | --localedi | --localed | --locale)
-+ ac_prev=localedir ;;
-+ -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
-+ localedir=$ac_optarg ;;
-+
- -localstatedir | --localstatedir | --localstatedi | --localstated \
-- | --localstate | --localstat | --localsta | --localst \
-- | --locals | --local | --loca | --loc | --lo)
-+ | --localstate | --localstat | --localsta | --localst | --locals)
- ac_prev=localstatedir ;;
- -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-- | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-- | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-+ | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
- localstatedir=$ac_optarg ;;
-
- -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-@@ -533,6 +1118,16 @@
- | --progr-tra=* | --program-tr=* | --program-t=*)
- program_transform_name=$ac_optarg ;;
-
-+ -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
-+ ac_prev=pdfdir ;;
-+ -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
-+ pdfdir=$ac_optarg ;;
-+
-+ -psdir | --psdir | --psdi | --psd | --ps)
-+ ac_prev=psdir ;;
-+ -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
-+ psdir=$ac_optarg ;;
-+
- -q | -quiet | --quiet | --quie | --qui | --qu | --q \
- | -silent | --silent | --silen | --sile | --sil)
- silent=yes ;;
-@@ -585,24 +1180,20 @@
- -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'`
-- case $ac_option in
-- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-- *) ac_optarg=yes ;;
-- esac
-- eval "with_$ac_package='$ac_optarg'" ;;
-+ 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'`
-- eval "with_$ac_package=no" ;;
-+ ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-+ eval with_$ac_package=no ;;
-
- --x)
- # Obsolete; use --with-x.
-@@ -633,8 +1224,7 @@
- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
- { (exit 1); exit 1; }; }
-- ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
-- eval "$ac_envvar='$ac_optarg'"
-+ eval $ac_envvar=\$ac_optarg
- export $ac_envvar ;;
-
- *)
-@@ -654,27 +1244,19 @@
- { (exit 1); exit 1; }; }
- fi
-
--# Be sure to have absolute paths.
--for ac_var in exec_prefix prefix
--do
-- eval ac_val=$`echo $ac_var`
-- case $ac_val in
-- [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
-- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-- { (exit 1); exit 1; }; };;
-- esac
--done
--
--# Be sure to have absolute paths.
--for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
-- localstatedir libdir includedir oldincludedir infodir mandir
-+# Be sure to have absolute directory names.
-+for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
-+ datadir sysconfdir sharedstatedir localstatedir includedir \
-+ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-+ libdir localedir mandir
- do
-- eval ac_val=$`echo $ac_var`
-+ eval ac_val=\$$ac_var
- case $ac_val in
-- [\\/$]* | ?:[\\/]* ) ;;
-- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-- { (exit 1); exit 1; }; };;
-+ [\\/$]* | ?:[\\/]* ) continue;;
-+ NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
- esac
-+ { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-+ { (exit 1); exit 1; }; }
- done
-
- # There might be people who depend on the old broken behavior: `$host'
-@@ -701,94 +1283,76 @@
- test "$silent" = yes && exec 6>/dev/null
-
-
-+ac_pwd=`pwd` && test -n "$ac_pwd" &&
-+ac_ls_di=`ls -di .` &&
-+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-+ { echo "$as_me: error: Working directory cannot be determined" >&2
-+ { (exit 1); exit 1; }; }
-+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-+ { echo "$as_me: error: pwd does not report name of working directory" >&2
-+ { (exit 1); exit 1; }; }
-+
-+
- # Find the source files, if location was not specified.
- if test -z "$srcdir"; then
- ac_srcdir_defaulted=yes
-- # Try the directory containing this script, then its parent.
-- ac_confdir=`(dirname "$0") 2>/dev/null ||
-+ # Try the directory containing this script, then the parent directory.
-+ ac_confdir=`$as_dirname -- "$0" ||
- $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-- X"$0" : 'X\(//\)[^/]' \| \
-- X"$0" : 'X\(//\)$' \| \
-- X"$0" : 'X\(/\)' \| \
-- . : '\(.\)' 2>/dev/null ||
-+ X"$0" : 'X\(//\)[^/]' \| \
-+ X"$0" : 'X\(//\)$' \| \
-+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$0" |
-- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-- /^X\(\/\/\)$/{ s//\1/; q; }
-- /^X\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)[^/].*/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\).*/{
-+ s//\1/
-+ q
-+ }
-+ s/.*/./; q'`
- srcdir=$ac_confdir
-- if test ! -r $srcdir/$ac_unique_file; then
-+ if test ! -r "$srcdir/$ac_unique_file"; then
- srcdir=..
- fi
- else
- ac_srcdir_defaulted=no
- fi
--if test ! -r $srcdir/$ac_unique_file; then
-- if test "$ac_srcdir_defaulted" = yes; then
-- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
-- { (exit 1); exit 1; }; }
-- else
-- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-- { (exit 1); exit 1; }; }
-- fi
--fi
--(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
-- { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
-- { (exit 1); exit 1; }; }
--srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
--ac_env_build_alias_set=${build_alias+set}
--ac_env_build_alias_value=$build_alias
--ac_cv_env_build_alias_set=${build_alias+set}
--ac_cv_env_build_alias_value=$build_alias
--ac_env_host_alias_set=${host_alias+set}
--ac_env_host_alias_value=$host_alias
--ac_cv_env_host_alias_set=${host_alias+set}
--ac_cv_env_host_alias_value=$host_alias
--ac_env_target_alias_set=${target_alias+set}
--ac_env_target_alias_value=$target_alias
--ac_cv_env_target_alias_set=${target_alias+set}
--ac_cv_env_target_alias_value=$target_alias
--ac_env_CC_set=${CC+set}
--ac_env_CC_value=$CC
--ac_cv_env_CC_set=${CC+set}
--ac_cv_env_CC_value=$CC
--ac_env_CFLAGS_set=${CFLAGS+set}
--ac_env_CFLAGS_value=$CFLAGS
--ac_cv_env_CFLAGS_set=${CFLAGS+set}
--ac_cv_env_CFLAGS_value=$CFLAGS
--ac_env_LDFLAGS_set=${LDFLAGS+set}
--ac_env_LDFLAGS_value=$LDFLAGS
--ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
--ac_cv_env_LDFLAGS_value=$LDFLAGS
--ac_env_CPPFLAGS_set=${CPPFLAGS+set}
--ac_env_CPPFLAGS_value=$CPPFLAGS
--ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
--ac_cv_env_CPPFLAGS_value=$CPPFLAGS
--ac_env_CPP_set=${CPP+set}
--ac_env_CPP_value=$CPP
--ac_cv_env_CPP_set=${CPP+set}
--ac_cv_env_CPP_value=$CPP
--ac_env_CXX_set=${CXX+set}
--ac_env_CXX_value=$CXX
--ac_cv_env_CXX_set=${CXX+set}
--ac_cv_env_CXX_value=$CXX
--ac_env_CXXFLAGS_set=${CXXFLAGS+set}
--ac_env_CXXFLAGS_value=$CXXFLAGS
--ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set}
--ac_cv_env_CXXFLAGS_value=$CXXFLAGS
--ac_env_PKG_CONFIG_set=${PKG_CONFIG+set}
--ac_env_PKG_CONFIG_value=$PKG_CONFIG
--ac_cv_env_PKG_CONFIG_set=${PKG_CONFIG+set}
--ac_cv_env_PKG_CONFIG_value=$PKG_CONFIG
--ac_env_PNG_CFLAGS_set=${PNG_CFLAGS+set}
--ac_env_PNG_CFLAGS_value=$PNG_CFLAGS
--ac_cv_env_PNG_CFLAGS_set=${PNG_CFLAGS+set}
--ac_cv_env_PNG_CFLAGS_value=$PNG_CFLAGS
--ac_env_PNG_LIBS_set=${PNG_LIBS+set}
--ac_env_PNG_LIBS_value=$PNG_LIBS
--ac_cv_env_PNG_LIBS_set=${PNG_LIBS+set}
--ac_cv_env_PNG_LIBS_value=$PNG_LIBS
-+if test ! -r "$srcdir/$ac_unique_file"; then
-+ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-+ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-+ { (exit 1); exit 1; }; }
-+fi
-+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-+ac_abs_confdir=`(
-+ cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
-+ { (exit 1); exit 1; }; }
-+ pwd)`
-+# When building in place, set srcdir=.
-+if test "$ac_abs_confdir" = "$ac_pwd"; then
-+ srcdir=.
-+fi
-+# Remove unnecessary trailing slashes from srcdir.
-+# Double slashes in file names in object file debugging info
-+# mess up M-x gdb in Emacs.
-+case $srcdir in
-+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
-+esac
-+for ac_var in $ac_precious_vars; do
-+ eval ac_env_${ac_var}_set=\${${ac_var}+set}
-+ eval ac_env_${ac_var}_value=\$${ac_var}
-+ eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
-+ eval ac_cv_env_${ac_var}_value=\$${ac_var}
-+done
-
- #
- # Report the --help message.
-@@ -817,14 +1381,11 @@
- -n, --no-create do not create output files
- --srcdir=DIR find the sources in DIR [configure dir or \`..']
-
--_ACEOF
--
-- cat <<_ACEOF
- Installation directories:
- --prefix=PREFIX install architecture-independent files in PREFIX
-- [$ac_default_prefix]
-+ [$ac_default_prefix]
- --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
-- [PREFIX]
-+ [PREFIX]
-
- By default, \`make install' will install all the files in
- \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
-@@ -837,15 +1398,22 @@
- --bindir=DIR user executables [EPREFIX/bin]
- --sbindir=DIR system admin executables [EPREFIX/sbin]
- --libexecdir=DIR program executables [EPREFIX/libexec]
-- --datadir=DIR read-only architecture-independent data [PREFIX/share]
- --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
- --localstatedir=DIR modifiable single-machine data [PREFIX/var]
- --libdir=DIR object code libraries [EPREFIX/lib]
- --includedir=DIR C header files [PREFIX/include]
- --oldincludedir=DIR C header files for non-gcc [/usr/include]
-- --infodir=DIR info documentation [PREFIX/info]
-- --mandir=DIR man documentation [PREFIX/man]
-+ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
-+ --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
-+ --infodir=DIR info documentation [DATAROOTDIR/info]
-+ --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
-+ --mandir=DIR man documentation [DATAROOTDIR/man]
-+ --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE]
-+ --htmldir=DIR html documentation [DOCDIR]
-+ --dvidir=DIR dvi documentation [DOCDIR]
-+ --pdfdir=DIR pdf documentation [DOCDIR]
-+ --psdir=DIR ps documentation [DOCDIR]
- _ACEOF
-
- cat <<\_ACEOF
-@@ -872,11 +1440,11 @@
- Optional Features:
- --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
- --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
-- --enable-maintainer-mode enable make rules and dependencies not useful
-- (and sometimes confusing) to the casual installer
-+ --enable-maintainer-mode enable make rules and dependencies not useful
-+ (and sometimes confusing) to the casual installer
- --enable-auth[=no/yes/try] compile in authentication [default=no]
-- --disable-dependency-tracking Speeds up one-time builds
-- --enable-dependency-tracking Do not reject slow dependency extractors
-+ --disable-dependency-tracking speeds up one-time build
-+ --enable-dependency-tracking do not reject slow dependency extractors
- --disable-server do not compile the server
- --enable-client=no/yes/xaw3d/xaw/gtk/win32/sdl/ftwl
- compile a client default=yes (if yes, guess type)
-@@ -950,11 +1518,13 @@
- CFLAGS C compiler flags
- LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
- nonstandard directory <lib dir>
-- CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have
-- headers in a nonstandard directory <include 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
- CXX C++ compiler command
- CXXFLAGS C++ compiler flags
-+ XMKMF Path to xmkmf, Makefile generator for X Window System
- PKG_CONFIG path to pkg-config utility
- PNG_CFLAGS C compiler flags for PNG, overriding pkg-config
- PNG_LIBS linker flags for PNG, overriding pkg-config
-@@ -963,86 +1533,86 @@
- it to find libraries and programs with nonstandard names/locations.
-
- _ACEOF
-+ac_status=$?
- fi
-
- if test "$ac_init_help" = "recursive"; then
- # If there are subdirs, report their specific --help.
-- ac_popdir=`pwd`
- for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-- test -d $ac_dir || continue
-+ test -d "$ac_dir" || continue
- ac_builddir=.
-
--if test "$ac_dir" != .; then
-+case "$ac_dir" in
-+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+*)
- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-- # A "../" for each directory in $ac_dir_suffix.
-- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
--else
-- ac_dir_suffix= ac_top_builddir=
--fi
-+ # A ".." for each directory in $ac_dir_suffix.
-+ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
-+ case $ac_top_builddir_sub in
-+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-+ esac ;;
-+esac
-+ac_abs_top_builddir=$ac_pwd
-+ac_abs_builddir=$ac_pwd$ac_dir_suffix
-+# for backward compatibility:
-+ac_top_builddir=$ac_top_build_prefix
-
- case $srcdir in
-- .) # No --srcdir option. We are building in place.
-+ .) # We are building in place.
- ac_srcdir=.
-- if test -z "$ac_top_builddir"; then
-- ac_top_srcdir=.
-- else
-- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-- fi ;;
-- [\\/]* | ?:[\\/]* ) # Absolute path.
-+ ac_top_srcdir=$ac_top_builddir_sub
-+ ac_abs_top_srcdir=$ac_pwd ;;
-+ [\\/]* | ?:[\\/]* ) # Absolute name.
- ac_srcdir=$srcdir$ac_dir_suffix;
-- ac_top_srcdir=$srcdir ;;
-- *) # Relative path.
-- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-- ac_top_srcdir=$ac_top_builddir$srcdir ;;
--esac
--# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
--# absolute.
--ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
--ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
--ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
--ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
--
-- cd $ac_dir
-- # Check for guested configure; otherwise get Cygnus style configure.
-- if test -f $ac_srcdir/configure.gnu; then
-- echo
-- $SHELL $ac_srcdir/configure.gnu --help=recursive
-- elif test -f $ac_srcdir/configure; then
-- echo
-- $SHELL $ac_srcdir/configure --help=recursive
-- elif test -f $ac_srcdir/configure.ac ||
-- test -f $ac_srcdir/configure.in; then
-- echo
-- $ac_configure --help
-+ ac_top_srcdir=$srcdir
-+ ac_abs_top_srcdir=$srcdir ;;
-+ *) # Relative name.
-+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-+ ac_top_srcdir=$ac_top_build_prefix$srcdir
-+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-+esac
-+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-+
-+ cd "$ac_dir" || { ac_status=$?; continue; }
-+ # Check for guested configure.
-+ if test -f "$ac_srcdir/configure.gnu"; then
-+ echo &&
-+ $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-+ elif test -f "$ac_srcdir/configure"; then
-+ echo &&
-+ $SHELL "$ac_srcdir/configure" --help=recursive
- else
- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-- fi
-- cd $ac_popdir
-+ fi || ac_status=$?
-+ cd "$ac_pwd" || { ac_status=$?; break; }
- done
- fi
-
--test -n "$ac_init_help" && exit 0
-+test -n "$ac_init_help" && exit $ac_status
- if $ac_init_version; then
- cat <<\_ACEOF
-+configure
-+generated by GNU Autoconf 2.61
-
--Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
--Free Software Foundation, Inc.
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-+2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
- This configure script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it.
- _ACEOF
-- exit 0
-+ exit
- fi
--exec 5>config.log
--cat >&5 <<_ACEOF
-+cat >config.log <<_ACEOF
- This file contains any messages produced by compilers while
- running configure, to aid debugging if configure makes a mistake.
-
- It was created by $as_me, which was
--generated by GNU Autoconf 2.57. Invocation command line was
-+generated by GNU Autoconf 2.61. Invocation command line was
-
- $ $0 $@
-
- _ACEOF
-+exec 5>>config.log
- {
- cat <<_ASUNAME
- ## --------- ##
-@@ -1061,7 +1631,7 @@
- /bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
- /usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
- /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
--hostinfo = `(hostinfo) 2>/dev/null || echo unknown`
-+/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown`
- /bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
- /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
- /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
-@@ -1075,6 +1645,7 @@
- test -z "$as_dir" && as_dir=.
- echo "PATH: $as_dir"
- done
-+IFS=$as_save_IFS
-
- } >&5
-
-@@ -1096,7 +1667,6 @@
- ac_configure_args=
- ac_configure_args0=
- ac_configure_args1=
--ac_sep=
- ac_must_keep_next=false
- for ac_pass in 1 2
- do
-@@ -1107,7 +1677,7 @@
- -q | -quiet | --quiet | --quie | --qui | --qu | --q \
- | -silent | --silent | --silen | --sile | --sil)
- continue ;;
-- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-+ *\'*)
- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
- esac
- case $ac_pass in
-@@ -1115,23 +1685,21 @@
- 2)
- ac_configure_args1="$ac_configure_args1 '$ac_arg'"
- if test $ac_must_keep_next = true; then
-- ac_must_keep_next=false # Got value, back to normal.
-+ ac_must_keep_next=false # Got value, back to normal.
- else
-- case $ac_arg in
-- *=* | --config-cache | -C | -disable-* | --disable-* \
-- | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-- | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-- | -with-* | --with-* | -without-* | --without-* | --x)
-- case "$ac_configure_args0 " in
-- "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-- esac
-- ;;
-- -* ) ac_must_keep_next=true ;;
-- esac
-+ case $ac_arg in
-+ *=* | --config-cache | -C | -disable-* | --disable-* \
-+ | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-+ | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-+ | -with-* | --with-* | -without-* | --without-* | --x)
-+ case "$ac_configure_args0 " in
-+ "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-+ esac
-+ ;;
-+ -* ) ac_must_keep_next=true ;;
-+ esac
- fi
-- ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
-- # Get rid of the leading space.
-- ac_sep=" "
-+ ac_configure_args="$ac_configure_args '$ac_arg'"
- ;;
- esac
- done
-@@ -1142,8 +1710,8 @@
- # When interrupted or exit'd, cleanup temporary files, and complete
- # config.log. We remove comments because anyway the quotes in there
- # would cause problems or look ugly.
--# WARNING: Be sure not to use single quotes in there, as some shells,
--# such as our DU 5.0 friend, will then `close' the trap.
-+# WARNING: Use '\'' to represent an apostrophe within the trap.
-+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
- trap 'exit_status=$?
- # Save into config.log some information that might help in debugging.
- {
-@@ -1156,20 +1724,34 @@
- _ASBOX
- echo
- # The following way of writing the cache mishandles newlines in values,
--{
-+(
-+ for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
-+ eval ac_val=\$$ac_var
-+ case $ac_val in #(
-+ *${as_nl}*)
-+ case $ac_var in #(
-+ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-+ esac
-+ case $ac_var in #(
-+ _ | IFS | as_nl) ;; #(
-+ *) $as_unset $ac_var ;;
-+ esac ;;
-+ esac
-+ done
- (set) 2>&1 |
-- case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
-- *ac_space=\ *)
-+ case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
-+ *${as_nl}ac_space=\ *)
- sed -n \
-- "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
-- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
-- ;;
-+ "s/'\''/'\''\\\\'\'''\''/g;
-+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
-+ ;; #(
- *)
-- sed -n \
-- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
- ;;
-- esac;
--}
-+ esac |
-+ sort
-+)
- echo
-
- cat <<\_ASBOX
-@@ -1180,22 +1762,28 @@
- echo
- for ac_var in $ac_subst_vars
- do
-- eval ac_val=$`echo $ac_var`
-- echo "$ac_var='"'"'$ac_val'"'"'"
-+ eval ac_val=\$$ac_var
-+ case $ac_val in
-+ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-+ esac
-+ echo "$ac_var='\''$ac_val'\''"
- done | sort
- echo
-
- if test -n "$ac_subst_files"; then
- cat <<\_ASBOX
--## ------------- ##
--## Output files. ##
--## ------------- ##
-+## ------------------- ##
-+## File substitutions. ##
-+## ------------------- ##
- _ASBOX
- echo
- for ac_var in $ac_subst_files
- do
-- eval ac_val=$`echo $ac_var`
-- echo "$ac_var='"'"'$ac_val'"'"'"
-+ eval ac_val=\$$ac_var
-+ case $ac_val in
-+ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-+ esac
-+ echo "$ac_var='\''$ac_val'\''"
- done | sort
- echo
- fi
-@@ -1207,26 +1795,24 @@
- ## ----------- ##
- _ASBOX
- echo
-- sed "/^$/d" confdefs.h | sort
-+ cat confdefs.h
- echo
- fi
- test "$ac_signal" != 0 &&
- echo "$as_me: caught signal $ac_signal"
- echo "$as_me: exit $exit_status"
- } >&5
-- rm -f core core.* *.core &&
-- rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
-+ rm -f core *.core core.conftest.* &&
-+ rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
- exit $exit_status
-- ' 0
-+' 0
- for ac_signal in 1 2 13 15; do
- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
- done
- ac_signal=0
-
- # confdefs.h avoids OS command line length limits that DEFS can exceed.
--rm -rf conftest* confdefs.h
--# AIX cpp loses on an empty file, so make sure it contains at least a newline.
--echo >confdefs.h
-+rm -f -r conftest* confdefs.h
-
- # Predefined preprocessor variables.
-
-@@ -1257,14 +1843,17 @@
-
- # Let the site file select an alternate cache file if it wants to.
- # Prefer explicitly selected file to automatically selected ones.
--if test -z "$CONFIG_SITE"; then
-- if test "x$prefix" != xNONE; then
-- CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-- else
-- CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-- fi
-+if test -n "$CONFIG_SITE"; then
-+ set x "$CONFIG_SITE"
-+elif test "x$prefix" != xNONE; then
-+ set x "$prefix/share/config.site" "$prefix/etc/config.site"
-+else
-+ set x "$ac_default_prefix/share/config.site" \
-+ "$ac_default_prefix/etc/config.site"
- fi
--for ac_site_file in $CONFIG_SITE; do
-+shift
-+for ac_site_file
-+do
- if test -r "$ac_site_file"; then
- { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
- echo "$as_me: loading site script $ac_site_file" >&6;}
-@@ -1280,8 +1869,8 @@
- { echo "$as_me:$LINENO: loading cache $cache_file" >&5
- echo "$as_me: loading cache $cache_file" >&6;}
- case $cache_file in
-- [\\/]* | ?:[\\/]* ) . $cache_file;;
-- *) . ./$cache_file;;
-+ [\\/]* | ?:[\\/]* ) . "$cache_file";;
-+ *) . "./$cache_file";;
- esac
- fi
- else
-@@ -1293,12 +1882,11 @@
- # Check that the precious variables saved in the cache have kept the same
- # value.
- ac_cache_corrupted=false
--for ac_var in `(set) 2>&1 |
-- sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
-+for ac_var in $ac_precious_vars; do
- eval ac_old_set=\$ac_cv_env_${ac_var}_set
- eval ac_new_set=\$ac_env_${ac_var}_set
-- eval ac_old_val="\$ac_cv_env_${ac_var}_value"
-- eval ac_new_val="\$ac_env_${ac_var}_value"
-+ eval ac_old_val=\$ac_cv_env_${ac_var}_value
-+ eval ac_new_val=\$ac_env_${ac_var}_value
- case $ac_old_set,$ac_new_set in
- set,)
- { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-@@ -1311,20 +1899,19 @@
- ,);;
- *)
- if test "x$ac_old_val" != "x$ac_new_val"; then
-- { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-+ { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
- echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-- { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
-+ { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
- echo "$as_me: former value: $ac_old_val" >&2;}
-- { echo "$as_me:$LINENO: current value: $ac_new_val" >&5
-+ { echo "$as_me:$LINENO: current value: $ac_new_val" >&5
- echo "$as_me: current value: $ac_new_val" >&2;}
-- ac_cache_corrupted=:
-+ ac_cache_corrupted=:
- fi;;
- esac
- # Pass precious variables to config.status.
- if test "$ac_new_set" = set; then
- case $ac_new_val in
-- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-- ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-+ *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
- *) ac_arg=$ac_var=$ac_new_val ;;
- esac
- case " $ac_configure_args " in
-@@ -1341,12 +1928,6 @@
- { (exit 1); exit 1; }; }
- fi
-
--ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
--
-
-
-
-@@ -1363,93 +1944,129 @@
-
-
-
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-
- ac_aux_dir=
--for ac_dir in bootstrap $srcdir/bootstrap; do
-- if test -f $ac_dir/install-sh; then
-+for ac_dir in bootstrap "$srcdir"/bootstrap; do
-+ if test -f "$ac_dir/install-sh"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install-sh -c"
- break
-- elif test -f $ac_dir/install.sh; then
-+ elif test -f "$ac_dir/install.sh"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install.sh -c"
- break
-- elif test -f $ac_dir/shtool; then
-+ elif test -f "$ac_dir/shtool"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/shtool install -c"
- break
- fi
- done
- if test -z "$ac_aux_dir"; then
-- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in bootstrap $srcdir/bootstrap" >&5
--echo "$as_me: error: cannot find install-sh or install.sh in bootstrap $srcdir/bootstrap" >&2;}
-+ { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in bootstrap \"$srcdir\"/bootstrap" >&5
-+echo "$as_me: error: cannot find install-sh or install.sh in bootstrap \"$srcdir\"/bootstrap" >&2;}
- { (exit 1); exit 1; }; }
- fi
--ac_config_guess="$SHELL $ac_aux_dir/config.guess"
--ac_config_sub="$SHELL $ac_aux_dir/config.sub"
--ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
-- # This can't be quoted or automake will fail
--# Add the stamp file to the list of files AC keeps track of,
--# along with our hook.
-- ac_config_headers="$ac_config_headers config.h"
-
-+# These three variables are undocumented and unsupported,
-+# and are intended to be withdrawn in a future Autoconf release.
-+# They can cause serious problems if a builder's source tree is in a directory
-+# whose full name contains unusual characters.
-+ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var.
-+ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var.
-+ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
-
-+ # This can't be quoted or automake will fail
-+ac_config_headers="$ac_config_headers config.h"
-
- # Make sure we can run config.sub.
--$ac_config_sub sun4 >/dev/null 2>&1 ||
-- { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
--echo "$as_me: error: cannot run $ac_config_sub" >&2;}
-+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-+ { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-+echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
- { (exit 1); exit 1; }; }
-
--echo "$as_me:$LINENO: checking build system type" >&5
--echo $ECHO_N "checking build system type... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking build system type" >&5
-+echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
- if test "${ac_cv_build+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- ac_cv_build_alias=$build_alias
--test -z "$ac_cv_build_alias" &&
-- ac_cv_build_alias=`$ac_config_guess`
--test -z "$ac_cv_build_alias" &&
-+ ac_build_alias=$build_alias
-+test "x$ac_build_alias" = x &&
-+ ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-+test "x$ac_build_alias" = x &&
- { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
- echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
- { (exit 1); exit 1; }; }
--ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
-- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
--echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
-+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
- { (exit 1); exit 1; }; }
-
- fi
--echo "$as_me:$LINENO: result: $ac_cv_build" >&5
--echo "${ECHO_T}$ac_cv_build" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-+echo "${ECHO_T}$ac_cv_build" >&6; }
-+case $ac_cv_build in
-+*-*-*) ;;
-+*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-+echo "$as_me: error: invalid value of canonical build" >&2;}
-+ { (exit 1); exit 1; }; };;
-+esac
- build=$ac_cv_build
--build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
--build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
--build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-+ac_save_IFS=$IFS; IFS='-'
-+set x $ac_cv_build
-+shift
-+build_cpu=$1
-+build_vendor=$2
-+shift; shift
-+# Remember, the first character of IFS is used to create $*,
-+# except with old shells:
-+build_os=$*
-+IFS=$ac_save_IFS
-+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-
-
--echo "$as_me:$LINENO: checking host system type" >&5
--echo $ECHO_N "checking host system type... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking host system type" >&5
-+echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
- if test "${ac_cv_host+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- ac_cv_host_alias=$host_alias
--test -z "$ac_cv_host_alias" &&
-- ac_cv_host_alias=$ac_cv_build_alias
--ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
-- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
--echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
-+ if test "x$host_alias" = x; then
-+ ac_cv_host=$ac_cv_build
-+else
-+ ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
- { (exit 1); exit 1; }; }
-+fi
-
- fi
--echo "$as_me:$LINENO: result: $ac_cv_host" >&5
--echo "${ECHO_T}$ac_cv_host" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-+echo "${ECHO_T}$ac_cv_host" >&6; }
-+case $ac_cv_host in
-+*-*-*) ;;
-+*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-+echo "$as_me: error: invalid value of canonical host" >&2;}
-+ { (exit 1); exit 1; }; };;
-+esac
- host=$ac_cv_host
--host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
--host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
--host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-+ac_save_IFS=$IFS; IFS='-'
-+set x $ac_cv_host
-+shift
-+host_cpu=$1
-+host_vendor=$2
-+shift; shift
-+# Remember, the first character of IFS is used to create $*,
-+# except with old shells:
-+host_os=$*
-+IFS=$ac_save_IFS
-+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-
-
-
-@@ -1582,7 +2199,8 @@
-
-
-
--am__api_version="1.6"
-+am__api_version='1.10'
-+
- # Find a good install program. We prefer a C program (faster),
- # so one script is as good as another. But avoid the broken or
- # incompatible versions:
-@@ -1594,9 +2212,10 @@
- # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
- # AFS /usr/afsws/bin/install, which mishandles nonexistent args
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-+# OS/2's system install, which has a completely different semantic
- # ./install, which can be erroneously created by make from ./install.sh.
--echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
--echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
- if test -z "$INSTALL"; then
- if test "${ac_cv_path_install+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1610,6 +2229,7 @@
- case $as_dir/ in
- ./ | .// | /cC/* | \
- /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-+ ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
- /usr/ucb/* ) ;;
- *)
- # OSF1 and SCO ODT 3.0 have their own names for install.
-@@ -1617,40 +2237,41 @@
- # by default.
- for ac_prog in ginstall scoinst install; do
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$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.
-- :
-- elif test $ac_prog = install &&
-- grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-- # program-specific install script used by HP pwplus--don't use.
-- :
-- else
-- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-- break 3
-- fi
-- fi
-+ 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.
-+ :
-+ elif test $ac_prog = install &&
-+ grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-+ # program-specific install script used by HP pwplus--don't use.
-+ :
-+ else
-+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-+ break 3
-+ fi
-+ fi
- done
- done
- ;;
- esac
- done
-+IFS=$as_save_IFS
-
-
- fi
- if test "${ac_cv_path_install+set}" = set; then
- INSTALL=$ac_cv_path_install
- else
-- # As a last resort, use the slow shell script. We don't cache a
-- # path for INSTALL within a source directory, because that will
-+ # As a last resort, use the slow shell script. Don't cache a
-+ # value for INSTALL within a source directory, because that will
- # break other packages using the cache if that directory is
-- # removed, or if the path is relative.
-+ # removed, or if the value is a relative name.
- INSTALL=$ac_install_sh
- fi
- fi
--echo "$as_me:$LINENO: result: $INSTALL" >&5
--echo "${ECHO_T}$INSTALL" >&6
-+{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-+echo "${ECHO_T}$INSTALL" >&6; }
-
- # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
- # It thinks the first close brace ends the variable substitution.
-@@ -1660,8 +2281,8 @@
-
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
--echo "$as_me:$LINENO: checking whether build environment is sane" >&5
--echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-+echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
- # Just in case
- sleep 1
- echo timestamp > conftest.file
-@@ -1703,21 +2324,20 @@
- Check your system clock" >&2;}
- { (exit 1); exit 1; }; }
- fi
--echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+{ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- test "$program_prefix" != NONE &&
-- program_transform_name="s,^,$program_prefix,;$program_transform_name"
-+ program_transform_name="s&^&$program_prefix&;$program_transform_name"
- # Use a double $ so make ignores it.
- test "$program_suffix" != NONE &&
-- program_transform_name="s,\$,$program_suffix,;$program_transform_name"
-+ program_transform_name="s&\$&$program_suffix&;$program_transform_name"
- # Double any \ or $. echo might interpret backslashes.
- # By default was `s,x,x', remove it if useless.
- cat <<\_ACEOF >conftest.sed
- s/[\\$]/&&/g;s/;s,x,x,$//
- _ACEOF
- program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
--rm conftest.sed
--
-+rm -f conftest.sed
-
- # expand $ac_aux_dir to an absolute path
- am_aux_dir=`cd $ac_aux_dir && pwd`
-@@ -1732,12 +2352,60 @@
- echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
- fi
-
-+{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
-+echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
-+if test -z "$MKDIR_P"; then
-+ if test "${ac_cv_path_mkdir+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_prog in mkdir gmkdir; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
-+ case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-+ 'mkdir (GNU coreutils) '* | \
-+ 'mkdir (coreutils) '* | \
-+ 'mkdir (fileutils) '4.1*)
-+ ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
-+ break 3;;
-+ esac
-+ done
-+ done
-+done
-+IFS=$as_save_IFS
-+
-+fi
-+
-+ if test "${ac_cv_path_mkdir+set}" = set; then
-+ MKDIR_P="$ac_cv_path_mkdir -p"
-+ else
-+ # As a last resort, use the slow shell script. Don't cache a
-+ # value for MKDIR_P within a source directory, because that will
-+ # break other packages using the cache if that directory is
-+ # removed, or if the value is a relative name.
-+ test -d ./--version && rmdir ./--version
-+ MKDIR_P="$ac_install_sh -d"
-+ fi
-+fi
-+{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
-+echo "${ECHO_T}$MKDIR_P" >&6; }
-+
-+mkdir_p="$MKDIR_P"
-+case $mkdir_p in
-+ [\\/$]* | ?:[\\/]*) ;;
-+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-+esac
-+
- for ac_prog in gawk mawk nawk awk
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_AWK+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -1750,65 +2418,91 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $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
- fi
- done
- done
-+IFS=$as_save_IFS
-
- fi
- fi
- AWK=$ac_cv_prog_AWK
- if test -n "$AWK"; then
-- echo "$as_me:$LINENO: result: $AWK" >&5
--echo "${ECHO_T}$AWK" >&6
-+ { echo "$as_me:$LINENO: result: $AWK" >&5
-+echo "${ECHO_T}$AWK" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- test -n "$AWK" && break
- done
-
--echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
--echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
--set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
--if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-+set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.make <<\_ACEOF
-+SHELL = /bin/sh
- all:
-- @echo 'ac_maketemp="$(MAKE)"'
-+ @echo '@@@%%%=$(MAKE)=@@@%%%'
- _ACEOF
- # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
--eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
--if test -n "$ac_maketemp"; then
-- eval ac_cv_prog_make_${ac_make}_set=yes
--else
-- eval ac_cv_prog_make_${ac_make}_set=no
--fi
-+case `${MAKE-make} -f conftest.make 2>/dev/null` in
-+ *@@@%%%=?*=@@@%%%*)
-+ eval ac_cv_prog_make_${ac_make}_set=yes;;
-+ *)
-+ eval ac_cv_prog_make_${ac_make}_set=no;;
-+esac
- rm -f conftest.make
- fi
--if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- SET_MAKE=
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- SET_MAKE="MAKE=${MAKE-make}"
- fi
-
-- # test to see if srcdir already configured
--if test "`cd $srcdir && pwd`" != "`pwd`" &&
-- test -f $srcdir/config.status; then
-- { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-+rm -rf .tst 2>/dev/null
-+mkdir .tst 2>/dev/null
-+if test -d .tst; then
-+ am__leading_dot=.
-+else
-+ am__leading_dot=_
-+fi
-+rmdir .tst 2>/dev/null
-+
-+if test "`cd $srcdir && pwd`" != "`pwd`"; then
-+ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-+ # is not polluted with repeated "-I."
-+ am__isrc=' -I$(srcdir)'
-+ # test to see if srcdir already configured
-+ if test -f $srcdir/config.status; then
-+ { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
- echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
- { (exit 1); exit 1; }; }
-+ fi
-+fi
-+
-+# test whether we have cygpath
-+if test -z "$CYGPATH_W"; then
-+ if (cygpath --version) >/dev/null 2>/dev/null; then
-+ CYGPATH_W='cygpath -w'
-+ else
-+ CYGPATH_W=echo
-+ fi
- fi
-
-+
- # Define the identity of the package.
- PACKAGE=$PACKAGE
- VERSION=$VERSION
-@@ -1839,10 +2533,7 @@
-
- MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-
--
--AMTAR=${AMTAR-"${am_missing_run}tar"}
--
--install_sh=${install_sh-"$am_aux_dir/install-sh"}
-+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
-
- # Installed binaries are usually stripped using `strip' when the user
- # run `make install-strip'. However `strip' might not be the right
-@@ -1852,8 +2543,8 @@
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
- set dummy ${ac_tool_prefix}strip; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_STRIP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -1866,32 +2557,34 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $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
- fi
- done
- done
-+IFS=$as_save_IFS
-
- fi
- fi
- STRIP=$ac_cv_prog_STRIP
- if test -n "$STRIP"; then
-- echo "$as_me:$LINENO: result: $STRIP" >&5
--echo "${ECHO_T}$STRIP" >&6
-+ { echo "$as_me:$LINENO: result: $STRIP" >&5
-+echo "${ECHO_T}$STRIP" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- fi
- if test -z "$ac_cv_prog_STRIP"; then
- ac_ct_STRIP=$STRIP
- # Extract the first word of "strip", so it can be a program name with args.
- set dummy strip; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -1904,54 +2597,73 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $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
- fi
- done
- done
-+IFS=$as_save_IFS
-
-- test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
- fi
- fi
- ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
- if test -n "$ac_ct_STRIP"; then
-- echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
--echo "${ECHO_T}$ac_ct_STRIP" >&6
-+ { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-+echo "${ECHO_T}$ac_ct_STRIP" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-- STRIP=$ac_ct_STRIP
-+ if test "x$ac_ct_STRIP" = x; then
-+ STRIP=":"
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ STRIP=$ac_ct_STRIP
-+ fi
- else
- STRIP="$ac_cv_prog_STRIP"
- fi
-
- fi
--INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
-+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-
- # We need awk for the "check" target. The system "awk" is bad on
- # some platforms.
-+# Always define AMTAR for backward compatibility.
-+
-+AMTAR=${AMTAR-"${am_missing_run}tar"}
-+
-+am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
-+
-+
-
-
-
-
--echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
--echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6
-- # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
-+{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
-+echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; }
-+ # Check whether --enable-maintainer-mode was given.
- if test "${enable_maintainer_mode+set}" = set; then
-- enableval="$enable_maintainer_mode"
-- USE_MAINTAINER_MODE=$enableval
-+ enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
- else
- USE_MAINTAINER_MODE=no
--fi;
-- echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
--echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6
--
-+fi
-
--if test $USE_MAINTAINER_MODE = yes; then
-+ { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
-+echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
-+ if test $USE_MAINTAINER_MODE = yes; then
- MAINTAINER_MODE_TRUE=
- MAINTAINER_MODE_FALSE='#'
- else
-@@ -1963,28 +2675,20 @@
-
-
-
--rm -f .deps 2>/dev/null
--mkdir .deps 2>/dev/null
--if test -d .deps; then
-- DEPDIR=.deps
--else
-- # MS-DOS does not allow filenames that begin with a dot.
-- DEPDIR=_deps
--fi
--rmdir .deps 2>/dev/null
--
-+DEPDIR="${am__leading_dot}deps"
-
-- ac_config_commands="$ac_config_commands depfiles"
-+ac_config_commands="$ac_config_commands depfiles"
-
-
- am_make=${MAKE-make}
- cat > confinc << 'END'
--doit:
-+am__doit:
- @echo done
-+.PHONY: am__doit
- END
- # If we don't find an include directive, just comment out the code.
--echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
--echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-+echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
- am__include="#"
- am__quote=
- _am_result=none
-@@ -1995,7 +2699,7 @@
- # In particular we don't look at `^make:' because GNU make might
- # be invoked under some other name (usually "gmake"), in which
- # case it prints its new name instead of `make'.
--if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then
-+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
- am__include=include
- am__quote=
- _am_result=GNU
-@@ -2011,22 +2715,20 @@
- fi
-
-
--echo "$as_me:$LINENO: result: $_am_result" >&5
--echo "${ECHO_T}$_am_result" >&6
-+{ echo "$as_me:$LINENO: result: $_am_result" >&5
-+echo "${ECHO_T}$_am_result" >&6; }
- rm -f confinc confmf
-
--# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
-+# Check whether --enable-dependency-tracking was given.
- if test "${enable_dependency_tracking+set}" = set; then
-- enableval="$enable_dependency_tracking"
-+ enableval=$enable_dependency_tracking;
-+fi
-
--fi;
- if test "x$enable_dependency_tracking" != xno; then
- am_depcomp="$ac_aux_dir/depcomp"
- AMDEPBACKSLASH='\'
- fi
--
--
--if test "x$enable_dependency_tracking" != xno; then
-+ if test "x$enable_dependency_tracking" != xno; then
- AMDEP_TRUE=
- AMDEP_FALSE='#'
- else
-@@ -2035,7 +2737,6 @@
- fi
-
-
--
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -2044,8 +2745,8 @@
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
- set dummy ${ac_tool_prefix}gcc; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2058,32 +2759,34 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $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
- fi
- done
- done
-+IFS=$as_save_IFS
-
- fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
-+ { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- fi
- if test -z "$ac_cv_prog_CC"; then
- ac_ct_CC=$CC
- # Extract the first word of "gcc", so it can be a program name with args.
- set dummy gcc; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2096,36 +2799,51 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $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
- fi
- done
- done
-+IFS=$as_save_IFS
-
- fi
- fi
- ac_ct_CC=$ac_cv_prog_ac_ct_CC
- if test -n "$ac_ct_CC"; then
-- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
--echo "${ECHO_T}$ac_ct_CC" >&6
-+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+echo "${ECHO_T}$ac_ct_CC" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-- CC=$ac_ct_CC
-+ if test "x$ac_ct_CC" = x; then
-+ CC=""
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ CC=$ac_ct_CC
-+ fi
- else
- CC="$ac_cv_prog_CC"
- fi
-
- if test -z "$CC"; then
-- if test -n "$ac_tool_prefix"; then
-- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-+ if test -n "$ac_tool_prefix"; then
-+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
- set dummy ${ac_tool_prefix}cc; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2138,74 +2856,34 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $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
- fi
- done
- done
-+IFS=$as_save_IFS
-
- fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
--else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
--
--fi
--if test -z "$ac_cv_prog_CC"; then
-- ac_ct_CC=$CC
-- # Extract the first word of "cc", so it can be a program name with args.
--set dummy cc; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- if test -n "$ac_ct_CC"; then
-- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-- ac_cv_prog_ac_ct_CC="cc"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--
--fi
--fi
--ac_ct_CC=$ac_cv_prog_ac_ct_CC
--if test -n "$ac_ct_CC"; then
-- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
--echo "${ECHO_T}$ac_ct_CC" >&6
-+ { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-- CC=$ac_ct_CC
--else
-- CC="$ac_cv_prog_CC"
--fi
-
-+ fi
- fi
- if test -z "$CC"; then
- # Extract the first word of "cc", so it can be a program name with args.
- set dummy cc; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2219,7 +2897,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $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
-@@ -2230,6 +2908,7 @@
- fi
- done
- done
-+IFS=$as_save_IFS
-
- if test $ac_prog_rejected = yes; then
- # We found a bogon in the path, so make sure we never use it.
-@@ -2247,22 +2926,23 @@
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
-+ { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- fi
- if test -z "$CC"; then
- if test -n "$ac_tool_prefix"; then
-- for ac_prog in cl
-+ for ac_prog in cl.exe
- 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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2275,36 +2955,38 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $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
- fi
- done
- done
-+IFS=$as_save_IFS
-
- fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
-+ { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- test -n "$CC" && break
- done
- fi
- if test -z "$CC"; then
- ac_ct_CC=$CC
-- for ac_prog in cl
-+ for ac_prog in cl.exe
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2317,29 +2999,45 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $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
- fi
- done
- done
-+IFS=$as_save_IFS
-
- fi
- fi
- ac_ct_CC=$ac_cv_prog_ac_ct_CC
- if test -n "$ac_ct_CC"; then
-- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
--echo "${ECHO_T}$ac_ct_CC" >&6
-+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+echo "${ECHO_T}$ac_ct_CC" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- test -n "$ac_ct_CC" && break
- done
-
-- CC=$ac_ct_CC
-+ if test "x$ac_ct_CC" = x; then
-+ CC=""
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ CC=$ac_ct_CC
-+ fi
- fi
-
- fi
-@@ -2352,27 +3050,40 @@
- { (exit 1); exit 1; }; }
-
- # Provide some information about the compiler.
--echo "$as_me:$LINENO:" \
-- "checking for C compiler version" >&5
-+echo "$as_me:$LINENO: checking for C compiler version" >&5
- ac_compiler=`set X $ac_compile; echo $2`
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-- (eval $ac_compiler --version </dev/null >&5) 2>&5
-+{ (ac_try="$ac_compiler --version >&5"
-+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_compiler --version >&5") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-- (eval $ac_compiler -v </dev/null >&5) 2>&5
-+{ (ac_try="$ac_compiler -v >&5"
-+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_compiler -v >&5") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-- (eval $ac_compiler -V </dev/null >&5) 2>&5
-+{ (ac_try="$ac_compiler -V >&5"
-+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_compiler -V >&5") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -2392,47 +3103,77 @@
- # Try to create an executable without -o first, disregard a.out.
- # It will help us diagnose broken compilers, and finding out an intuition
- # of exeext.
--echo "$as_me:$LINENO: checking for C compiler default output" >&5
--echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
- ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
--if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
-- (eval $ac_link_default) 2>&5
-+#
-+# List of possible output files, starting from the most likely.
-+# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
-+# only as a last resort. b.out is created by i960 compilers.
-+ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
-+#
-+# The IRIX 6 linker writes into existing files which may not be
-+# executable, retaining their permissions. Remove them first so a
-+# subsequent execution test works.
-+ac_rmfiles=
-+for ac_file in $ac_files
-+do
-+ case $ac_file in
-+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
-+ * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-+ esac
-+done
-+rm -f $ac_rmfiles
-+
-+if { (ac_try="$ac_link_default"
-+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_default") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- # Find the output, starting from the most likely. This scheme is
--# not robust to junk in `.', hence go to wildcards (a.*) only as a last
--# resort.
--
--# Be careful to initialize this variable, since it used to be cached.
--# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
--ac_cv_exeext=
--# b.out is created by i960 compilers.
--for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
-+ # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-+# 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 ''
- do
- test -f "$ac_file" || continue
- case $ac_file in
-- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
-- ;;
-- conftest.$ac_ext )
-- # This is the source file.
-- ;;
-+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
-+ ;;
- [ab].out )
-- # We found the default executable, but exeext='' is most
-- # certainly right.
-- break;;
-+ # We found the default executable, but exeext='' is most
-+ # certainly right.
-+ break;;
- *.* )
-- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-- # FIXME: I believe we export ac_cv_exeext for Libtool,
-- # but it would be cool to find out if it's true. Does anybody
-- # maintain Libtool? --akim.
-- export ac_cv_exeext
-- break;;
-+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-+ then :; else
-+ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-+ fi
-+ # We set ac_cv_exeext here because the later test for it is not
-+ # safe: cross compilers may not add the suffix if given an `-o'
-+ # argument, so we may need to know it at that point already.
-+ # Even if this section looks crufty: it has the advantage of
-+ # actually working.
-+ break;;
- * )
-- break;;
-+ break;;
- esac
- done
-+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
-
-@@ -2444,19 +3185,21 @@
- fi
-
- ac_exeext=$ac_cv_exeext
--echo "$as_me:$LINENO: result: $ac_file" >&5
--echo "${ECHO_T}$ac_file" >&6
-
--# Check the compiler produces executables we can run. If not, either
-+# Check that the compiler produces executables we can run. If not, either
- # the compiler is broken, or we cross compile.
--echo "$as_me:$LINENO: checking whether the C compiler works" >&5
--echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-+echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
- # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
- # If not cross compiling, check that we can run a simple program.
- if test "$cross_compiling" != yes; then
- if { ac_try='./$ac_file'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (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
-@@ -2475,22 +3218,27 @@
- fi
- fi
- fi
--echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+{ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-
- rm -f a.out a.exe conftest$ac_cv_exeext b.out
- ac_clean_files=$ac_clean_files_save
--# Check the compiler produces executables we can run. If not, either
-+# Check that the compiler produces executables we can run. If not, either
- # the compiler is broken, or we cross compile.
--echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
--echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
--echo "$as_me:$LINENO: result: $cross_compiling" >&5
--echo "${ECHO_T}$cross_compiling" >&6
--
--echo "$as_me:$LINENO: checking for suffix of executables" >&5
--echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
-+{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
-+echo "${ECHO_T}$cross_compiling" >&6; }
-+
-+{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
-+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-@@ -2501,10 +3249,9 @@
- for ac_file in conftest.exe conftest conftest.*; do
- test -f "$ac_file" || continue
- case $ac_file in
-- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
-+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
- *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-- export ac_cv_exeext
-- break;;
-+ break;;
- * ) break;;
- esac
- done
-@@ -2517,19 +3264,18 @@
- fi
-
- rm -f conftest$ac_cv_exeext
--echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
--echo "${ECHO_T}$ac_cv_exeext" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-+echo "${ECHO_T}$ac_cv_exeext" >&6; }
-
- rm -f conftest.$ac_ext
- EXEEXT=$ac_cv_exeext
- ac_exeext=$EXEEXT
--echo "$as_me:$LINENO: checking for suffix of object files" >&5
--echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
-+echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
- if test "${ac_cv_objext+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -2545,14 +3291,20 @@
- }
- _ACEOF
- rm -f conftest.o conftest.obj
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+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>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
-+ for ac_file in conftest.o conftest.obj conftest.*; do
-+ test -f "$ac_file" || continue;
- case $ac_file in
-- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
-+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
- *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
- break;;
- esac
-@@ -2570,17 +3322,16 @@
-
- rm -f conftest.$ac_cv_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
--echo "${ECHO_T}$ac_cv_objext" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-+echo "${ECHO_T}$ac_cv_objext" >&6; }
- OBJEXT=$ac_cv_objext
- ac_objext=$OBJEXT
--echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
--echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
- if test "${ac_cv_c_compiler_gnu+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -2599,41 +3350,87 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_compiler_gnu=no
-+ ac_compiler_gnu=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
- fi
--echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
--echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
- GCC=`test $ac_compiler_gnu = yes && echo yes`
- ac_test_CFLAGS=${CFLAGS+set}
- ac_save_CFLAGS=$CFLAGS
--CFLAGS="-g"
--echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
--echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
- if test "${ac_cv_prog_cc_g+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
-+ ac_save_c_werror_flag=$ac_c_werror_flag
-+ ac_c_werror_flag=yes
-+ ac_cv_prog_cc_g=no
-+ CFLAGS="-g"
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+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
-+ ac_cv_prog_cc_g=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ CFLAGS=""
-+ cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -2649,28 +3446,80 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+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 -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&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
-+
-+ ac_c_werror_flag=$ac_save_c_werror_flag
-+ CFLAGS="-g"
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+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); }; }; 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
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_prog_cc_g=no
-+
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ ac_c_werror_flag=$ac_save_c_werror_flag
- fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
--echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
- if test "$ac_test_CFLAGS" = set; then
- CFLAGS=$ac_save_CFLAGS
- elif test $ac_cv_prog_cc_g = yes; then
-@@ -2686,15 +3535,14 @@
- CFLAGS=
- fi
- fi
--echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
--echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
--if test "${ac_cv_prog_cc_stdc+set}" = set; then
-+{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-+echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_cc_c89+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- ac_cv_prog_cc_stdc=no
-+ ac_cv_prog_cc_c89=no
- ac_save_CC=$CC
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -2722,6 +3570,21 @@
- va_end (v);
- return s;
- }
-+
-+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
-+ function prototypes and stuff, but not '\xHH' hex character constants.
-+ These don't provoke an error unfortunately, instead are silently treated
-+ as 'x'. The following induces an error, until -std is added to get
-+ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
-+ array size at least. It's necessary to write '\x00'==0 to get something
-+ that's true only with -std. */
-+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-+
-+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-+ inside strings and character constants. */
-+#define FOO(x) 'x'
-+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-+
- int test (int i, double x);
- struct s1 {int (*f) (int a);};
- struct s2 {int (*f) (double a);};
-@@ -2736,168 +3599,57 @@
- return 0;
- }
- _ACEOF
--# Don't try gcc -ansi; that turns off useful extensions and
--# breaks some systems' header files.
--# AIX -qlanglvl=ansi
--# Ultrix and OSF/1 -std1
--# HP-UX 10.20 and later -Ae
--# HP-UX older versions -Aa -D_HPUX_SOURCE
--# SVR4 -Xc -D__EXTENSIONS__
--for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
- do
- CC="$ac_save_CC $ac_arg"
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; then
-- ac_cv_prog_cc_stdc=$ac_arg
--break
-+ (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
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
- fi
--rm -f conftest.$ac_objext
-+
-+rm -f core conftest.err conftest.$ac_objext
-+ test "x$ac_cv_prog_cc_c89" != "xno" && break
- done
--rm -f conftest.$ac_ext conftest.$ac_objext
-+rm -f conftest.$ac_ext
- CC=$ac_save_CC
-
- fi
--
--case "x$ac_cv_prog_cc_stdc" in
-- x|xno)
-- echo "$as_me:$LINENO: result: none needed" >&5
--echo "${ECHO_T}none needed" >&6 ;;
-+# AC_CACHE_VAL
-+case "x$ac_cv_prog_cc_c89" in
-+ x)
-+ { echo "$as_me:$LINENO: result: none needed" >&5
-+echo "${ECHO_T}none needed" >&6; } ;;
-+ xno)
-+ { echo "$as_me:$LINENO: result: unsupported" >&5
-+echo "${ECHO_T}unsupported" >&6; } ;;
- *)
-- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
--echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
-- CC="$CC $ac_cv_prog_cc_stdc" ;;
-+ CC="$CC $ac_cv_prog_cc_c89"
-+ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
- esac
-
--# Some people use a C++ compiler to compile C. Since we use `exit',
--# in C++ we need to declare it. In case someone uses the same compiler
--# for both compiling C and C++ we need to have the C++ compiler decide
--# the declaration of exit, since it's the most demanding environment.
--cat >conftest.$ac_ext <<_ACEOF
--#ifndef __cplusplus
-- choke me
--#endif
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- for ac_declaration in \
-- ''\
-- '#include <stdlib.h>' \
-- 'extern "C" void std::exit (int) throw (); using std::exit;' \
-- 'extern "C" void std::exit (int); using std::exit;' \
-- 'extern "C" void exit (int) throw ();' \
-- 'extern "C" void exit (int);' \
-- 'void exit (int);'
--do
-- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--#include <stdlib.h>
--$ac_declaration
--int
--main ()
--{
--exit (42);
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- :
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--continue
--fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_declaration
--int
--main ()
--{
--exit (42);
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- break
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--fi
--rm -f conftest.$ac_objext conftest.$ac_ext
--done
--rm -f conftest*
--if test -n "$ac_declaration"; then
-- echo '#ifdef __cplusplus' >>confdefs.h
-- echo $ac_declaration >>confdefs.h
-- echo '#endif' >>confdefs.h
--fi
--
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-
--fi
--rm -f conftest.$ac_objext conftest.$ac_ext
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -2906,8 +3658,8 @@
-
- depcc="$CC" am_compiler_list=
-
--echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
--echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
- if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2922,18 +3674,34 @@
- # using a relative directory.
- cp "$am_depcomp" conftest.dir
- cd conftest.dir
-+ # We will build objects and dependencies in a subdirectory because
-+ # it helps to detect inapplicable dependency modes. For instance
-+ # both Tru64's cc and ICC support -MD to output dependencies as a
-+ # side effect of compilation, but ICC will put the dependencies in
-+ # the current directory while Tru64 will put them in the object
-+ # directory.
-+ mkdir sub
-
- am_cv_CC_dependencies_compiler_type=none
- if test "$am_compiler_list" = ""; then
- am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
- fi
- for depmode in $am_compiler_list; do
-+ # Setup a source with many dependencies, because some compilers
-+ # like to wrap large dependency lists on column 80 (with \), and
-+ # we should not choose a depcomp mode which is confused by this.
-+ #
- # We need to recreate these files for each test, as the compiler may
- # overwrite some of them when testing with obscure command lines.
- # This happens at least with the AIX C compiler.
-- echo '#include "conftest.h"' > conftest.c
-- echo 'int i;' > conftest.h
-- echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
-+ : > sub/conftest.c
-+ for i in 1 2 3 4 5 6; do
-+ echo '#include "conftst'$i'.h"' >> sub/conftest.c
-+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-+ # Solaris 8's {/usr,}/bin/sh.
-+ touch sub/conftst$i.h
-+ done
-+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
- case $depmode in
- nosideeffect)
-@@ -2951,13 +3719,26 @@
- # mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this.
- if depmode=$depmode \
-- source=conftest.c object=conftest.o \
-- depfile=conftest.Po tmpdepfile=conftest.TPo \
-- $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
-- grep conftest.h conftest.Po > /dev/null 2>&1 &&
-+ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-+ >/dev/null 2>conftest.err &&
-+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-- am_cv_CC_dependencies_compiler_type=$depmode
-- break
-+ # icc doesn't choke on unknown options, it will just issue warnings
-+ # or remarks (even with -Werror). So we grep stderr for any message
-+ # that says an option was ignored or not supported.
-+ # When given -MP, icc 7.0 and 7.1 complain thusly:
-+ # icc: Command line warning: ignoring option '-M'; no argument required
-+ # The diagnosis changed in icc 8.0:
-+ # icc: Command line remark: option '-MP' not supported
-+ if (grep 'ignoring option' conftest.err ||
-+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-+ am_cv_CC_dependencies_compiler_type=$depmode
-+ break
-+ fi
- fi
- done
-
-@@ -2968,10 +3749,20 @@
- fi
-
- fi
--echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
--echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
-+{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
- CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
-+ if
-+ test "x$enable_dependency_tracking" != xno \
-+ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-+ am__fastdepCC_TRUE=
-+ am__fastdepCC_FALSE='#'
-+else
-+ am__fastdepCC_TRUE='#'
-+ am__fastdepCC_FALSE=
-+fi
-+
-
-
- ac_ext=c
-@@ -2979,8 +3770,8 @@
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
--echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
--echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
- # On Suns, sometimes $CPP names a directory.
- if test -n "$CPP" && test -d "$CPP"; then
- CPP=
-@@ -3002,7 +3793,6 @@
- # On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp. "Syntax error" is here to catch this case.
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -3013,25 +3803,24 @@
- #else
- # include <assert.h>
- #endif
-- Syntax error
-+ Syntax error
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+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
-- 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
-@@ -3040,12 +3829,12 @@
- # Broken: fails on valid input.
- continue
- fi
-+
- rm -f conftest.err conftest.$ac_ext
-
-- # OK, works on sane cases. Now check whether non-existent headers
-+ # OK, works on sane cases. Now check whether nonexistent headers
- # can be detected and how.
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -3053,23 +3842,22 @@
- /* end confdefs.h. */
- #include <ac_nonexistent.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+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
-- 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
-@@ -3080,6 +3868,7 @@
- ac_preproc_ok=:
- break
- fi
-+
- rm -f conftest.err conftest.$ac_ext
-
- done
-@@ -3097,8 +3886,8 @@
- else
- ac_cv_prog_CPP=$CPP
- fi
--echo "$as_me:$LINENO: result: $CPP" >&5
--echo "${ECHO_T}$CPP" >&6
-+{ echo "$as_me:$LINENO: result: $CPP" >&5
-+echo "${ECHO_T}$CPP" >&6; }
- ac_preproc_ok=false
- for ac_c_preproc_warn_flag in '' yes
- do
-@@ -3109,7 +3898,6 @@
- # On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp. "Syntax error" is here to catch this case.
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -3120,25 +3908,24 @@
- #else
- # include <assert.h>
- #endif
-- Syntax error
-+ Syntax error
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+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
-- 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
-@@ -3147,12 +3934,12 @@
- # Broken: fails on valid input.
- continue
- fi
-+
- rm -f conftest.err conftest.$ac_ext
-
-- # OK, works on sane cases. Now check whether non-existent headers
-+ # OK, works on sane cases. Now check whether nonexistent headers
- # can be detected and how.
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -3160,23 +3947,22 @@
- /* end confdefs.h. */
- #include <ac_nonexistent.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+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
-- 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
-@@ -3187,6 +3973,7 @@
- ac_preproc_ok=:
- break
- fi
-+
- rm -f conftest.err conftest.$ac_ext
-
- done
-@@ -3209,28 +3996,174 @@
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
--echo "$as_me:$LINENO: checking for egrep" >&5
--echo $ECHO_N "checking for egrep... $ECHO_C" >&6
--if test "${ac_cv_prog_egrep+set}" = set; then
-+{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-+echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
-+if test "${ac_cv_path_GREP+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ # Extract the first word of "grep ggrep" to use in msg output
-+if test -z "$GREP"; then
-+set dummy grep ggrep; ac_prog_name=$2
-+if test "${ac_cv_path_GREP+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_path_GREP_found=false
-+# Loop through the user's path and test for each of PROGNAME-LIST
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_prog in grep ggrep; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-+ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-+ # Check for GNU ac_path_GREP and select it if it is found.
-+ # Check for GNU $ac_path_GREP
-+case `"$ac_path_GREP" --version 2>&1` in
-+*GNU*)
-+ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-+*)
-+ ac_count=0
-+ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
-+ while :
-+ do
-+ cat "conftest.in" "conftest.in" >"conftest.tmp"
-+ mv "conftest.tmp" "conftest.in"
-+ cp "conftest.in" "conftest.nl"
-+ echo 'GREP' >> "conftest.nl"
-+ "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-+ ac_count=`expr $ac_count + 1`
-+ if test $ac_count -gt ${ac_path_GREP_max-0}; then
-+ # Best one so far, save it but keep looking for a better one
-+ ac_cv_path_GREP="$ac_path_GREP"
-+ ac_path_GREP_max=$ac_count
-+ fi
-+ # 10*(2^10) chars as input seems more than enough
-+ test $ac_count -gt 10 && break
-+ done
-+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-+esac
-+
-+
-+ $ac_path_GREP_found && break 3
-+ done
-+done
-+
-+done
-+IFS=$as_save_IFS
-+
-+
-+fi
-+
-+GREP="$ac_cv_path_GREP"
-+if test -z "$GREP"; then
-+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+
-+else
-+ ac_cv_path_GREP=$GREP
-+fi
-+
-+
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-+echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
-+ GREP="$ac_cv_path_GREP"
-+
-+
-+{ echo "$as_me:$LINENO: checking for egrep" >&5
-+echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
-+if test "${ac_cv_path_EGREP+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-+ then ac_cv_path_EGREP="$GREP -E"
-+ else
-+ # Extract the first word of "egrep" to use in msg output
-+if test -z "$EGREP"; then
-+set dummy egrep; ac_prog_name=$2
-+if test "${ac_cv_path_EGREP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- if echo a | (grep -E '(a|b)') >/dev/null 2>&1
-- then ac_cv_prog_egrep='grep -E'
-- else ac_cv_prog_egrep='egrep'
-+ ac_path_EGREP_found=false
-+# Loop through the user's path and test for each of PROGNAME-LIST
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_prog in egrep; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-+ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-+ # Check for GNU ac_path_EGREP and select it if it is found.
-+ # Check for GNU $ac_path_EGREP
-+case `"$ac_path_EGREP" --version 2>&1` in
-+*GNU*)
-+ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-+*)
-+ ac_count=0
-+ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
-+ while :
-+ do
-+ cat "conftest.in" "conftest.in" >"conftest.tmp"
-+ mv "conftest.tmp" "conftest.in"
-+ cp "conftest.in" "conftest.nl"
-+ echo 'EGREP' >> "conftest.nl"
-+ "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-+ ac_count=`expr $ac_count + 1`
-+ if test $ac_count -gt ${ac_path_EGREP_max-0}; then
-+ # Best one so far, save it but keep looking for a better one
-+ ac_cv_path_EGREP="$ac_path_EGREP"
-+ ac_path_EGREP_max=$ac_count
- fi
-+ # 10*(2^10) chars as input seems more than enough
-+ test $ac_count -gt 10 && break
-+ done
-+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-+esac
-+
-+
-+ $ac_path_EGREP_found && break 3
-+ done
-+done
-+
-+done
-+IFS=$as_save_IFS
-+
-+
-+fi
-+
-+EGREP="$ac_cv_path_EGREP"
-+if test -z "$EGREP"; then
-+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-+ { (exit 1); exit 1; }; }
- fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
--echo "${ECHO_T}$ac_cv_prog_egrep" >&6
-- EGREP=$ac_cv_prog_egrep
-
-+else
-+ ac_cv_path_EGREP=$EGREP
-+fi
-+
-+
-+ fi
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-+echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
-+ EGREP="$ac_cv_path_EGREP"
-
--echo "$as_me:$LINENO: checking for ANSI C header files" >&5
--echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
-+
-+{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
- if test "${ac_cv_header_stdc+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -3250,30 +4183,35 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_header_stdc=no
-+ ac_cv_header_stdc=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
- if test $ac_cv_header_stdc = yes; then
- # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -3295,7 +4233,6 @@
- if test $ac_cv_header_stdc = yes; then
- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -3320,21 +4257,21 @@
- :
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- #include <ctype.h>
-+#include <stdlib.h>
- #if ((' ' & 0x0FF) == 0x020)
- # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
- # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
- #else
- # define ISLOWER(c) \
-- (('a' <= (c) && (c) <= 'i') \
-- || ('j' <= (c) && (c) <= 'r') \
-- || ('s' <= (c) && (c) <= 'z'))
-+ (('a' <= (c) && (c) <= 'i') \
-+ || ('j' <= (c) && (c) <= 'r') \
-+ || ('s' <= (c) && (c) <= 'z'))
- # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
- #endif
-
-@@ -3345,19 +4282,28 @@
- int i;
- for (i = 0; i < 256; i++)
- if (XOR (islower (i), ISLOWER (i))
-- || toupper (i) != TOUPPER (i))
-- exit(2);
-- exit (0);
-+ || toupper (i) != TOUPPER (i))
-+ return 2;
-+ return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+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>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (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
-@@ -3370,12 +4316,14 @@
- ( exit $ac_status )
- ac_cv_header_stdc=no
- fi
--rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+
-+
- fi
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
--echo "${ECHO_T}$ac_cv_header_stdc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-+echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
- if test $ac_cv_header_stdc = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -3395,16 +4343,15 @@
-
-
- for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-- inttypes.h stdint.h unistd.h
-+ inttypes.h stdint.h unistd.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -3415,28 +4362,35 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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
- sed 's/^/| /' conftest.$ac_ext >&5
-
--eval "$as_ac_Header=no"
-+ eval "$as_ac_Header=no"
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -3448,10 +4402,9 @@
-
-
-
-- # Check whether --enable-auth or --disable-auth was given.
-+ # Check whether --enable-auth was given.
- if test "${enable_auth+set}" = set; then
-- enableval="$enable_auth"
-- case "${enableval}" in
-+ enableval=$enable_auth; case "${enableval}" in
- yes) auth=true
- must_auth=true ;;
- no) auth=false ;;
-@@ -3462,34 +4415,34 @@
- esac
- else
- auth=false
--fi;
-+fi
-
-
--# Check whether --with-mysql-prefix or --without-mysql-prefix was given.
-+
-+# Check whether --with-mysql-prefix was given.
- if test "${with_mysql_prefix+set}" = set; then
-- withval="$with_mysql_prefix"
-- mysql_prefix="$withval"
-+ withval=$with_mysql_prefix; mysql_prefix="$withval"
- else
- mysql_prefix=""
--fi;
-+fi
-+
-
- if test x$auth = xtrue; then
-
- if test x$mysql_prefix = x; then
- if test "${ac_cv_header_mysql_mysql_h+set}" = set; then
-- echo "$as_me:$LINENO: checking for mysql/mysql.h" >&5
--echo $ECHO_N "checking for mysql/mysql.h... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for mysql/mysql.h" >&5
-+echo $ECHO_N "checking for mysql/mysql.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_mysql_mysql_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_mysql_mysql_h" >&5
--echo "${ECHO_T}$ac_cv_header_mysql_mysql_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_mysql_mysql_h" >&5
-+echo "${ECHO_T}$ac_cv_header_mysql_mysql_h" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking mysql/mysql.h usability" >&5
--echo $ECHO_N "checking mysql/mysql.h usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking mysql/mysql.h usability" >&5
-+echo $ECHO_N "checking mysql/mysql.h usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -3499,33 +4452,38 @@
- #include <mysql/mysql.h>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_header_compiler=no
-+ ac_header_compiler=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+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 mysql/mysql.h presence" >&5
--echo $ECHO_N "checking mysql/mysql.h presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking mysql/mysql.h presence" >&5
-+echo $ECHO_N "checking mysql/mysql.h presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -3533,23 +4491,22 @@
- /* end confdefs.h. */
- #include <mysql/mysql.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+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
-- 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
-@@ -3557,52 +4514,45 @@
-
- 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
-+{ 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 in
-- yes:no )
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+ yes:no: )
- { echo "$as_me:$LINENO: WARNING: mysql/mysql.h: accepted by the compiler, rejected by the preprocessor!" >&5
- echo "$as_me: WARNING: mysql/mysql.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-- { echo "$as_me:$LINENO: WARNING: mysql/mysql.h: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: mysql/mysql.h: proceeding with the preprocessor's result" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------ ##
--## Report this to bug-autoconf at gnu.org. ##
--## ------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+ { echo "$as_me:$LINENO: WARNING: mysql/mysql.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: mysql/mysql.h: proceeding with the compiler's result" >&2;}
-+ ac_header_preproc=yes
- ;;
-- no:yes )
-+ no:yes:* )
- { echo "$as_me:$LINENO: WARNING: mysql/mysql.h: present but cannot be compiled" >&5
- echo "$as_me: WARNING: mysql/mysql.h: present but cannot be compiled" >&2;}
-- { echo "$as_me:$LINENO: WARNING: mysql/mysql.h: check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: mysql/mysql.h: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: mysql/mysql.h: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: mysql/mysql.h: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: mysql/mysql.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: mysql/mysql.h: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: mysql/mysql.h: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: mysql/mysql.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: mysql/mysql.h: proceeding with the preprocessor's result" >&5
- echo "$as_me: WARNING: mysql/mysql.h: proceeding with the preprocessor's result" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------ ##
--## Report this to bug-autoconf at gnu.org. ##
--## ------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+ { echo "$as_me:$LINENO: WARNING: mysql/mysql.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: mysql/mysql.h: in the future, the compiler will take precedence" >&2;}
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for mysql/mysql.h" >&5
--echo $ECHO_N "checking for mysql/mysql.h... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for mysql/mysql.h" >&5
-+echo $ECHO_N "checking for mysql/mysql.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_mysql_mysql_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_cv_header_mysql_mysql_h=$ac_header_preproc
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_mysql_mysql_h" >&5
--echo "${ECHO_T}$ac_cv_header_mysql_mysql_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_mysql_mysql_h" >&5
-+echo "${ECHO_T}$ac_cv_header_mysql_mysql_h" >&6; }
-
- fi
- if test $ac_cv_header_mysql_mysql_h = yes; then
-@@ -3616,60 +4566,67 @@
-
-
-
-- echo "$as_me:$LINENO: checking for mysql_query in -lmysqlclient" >&5
--echo $ECHO_N "checking for mysql_query in -lmysqlclient... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for mysql_query in -lmysqlclient" >&5
-+echo $ECHO_N "checking for mysql_query in -lmysqlclient... $ECHO_C" >&6; }
- if test "${ac_cv_lib_mysqlclient_mysql_query+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lmysqlclient $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char mysql_query ();
- int
- main ()
- {
--mysql_query ();
-+return mysql_query ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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_mysqlclient_mysql_query=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_mysqlclient_mysql_query=no
-+ ac_cv_lib_mysqlclient_mysql_query=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+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
--echo "$as_me:$LINENO: result: $ac_cv_lib_mysqlclient_mysql_query" >&5
--echo "${ECHO_T}$ac_cv_lib_mysqlclient_mysql_query" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_mysqlclient_mysql_query" >&5
-+echo "${ECHO_T}$ac_cv_lib_mysqlclient_mysql_query" >&6; }
- if test $ac_cv_lib_mysqlclient_mysql_query = yes; then
- AUTH_LIBS="-lmysqlclient $AUTH_LIBS"
- else
-@@ -3688,60 +4645,67 @@
- LDFLAGS="$LDFLAGS $__ldpath"
- auth=true
-
-- echo "$as_me:$LINENO: checking for mysql_query in -lmysqlclient" >&5
--echo $ECHO_N "checking for mysql_query in -lmysqlclient... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for mysql_query in -lmysqlclient" >&5
-+echo $ECHO_N "checking for mysql_query in -lmysqlclient... $ECHO_C" >&6; }
- if test "${ac_cv_lib_mysqlclient_mysql_query+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lmysqlclient $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char mysql_query ();
- int
- main ()
- {
--mysql_query ();
-+return mysql_query ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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_mysqlclient_mysql_query=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_mysqlclient_mysql_query=no
-+ ac_cv_lib_mysqlclient_mysql_query=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+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
--echo "$as_me:$LINENO: result: $ac_cv_lib_mysqlclient_mysql_query" >&5
--echo "${ECHO_T}$ac_cv_lib_mysqlclient_mysql_query" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_mysqlclient_mysql_query" >&5
-+echo "${ECHO_T}$ac_cv_lib_mysqlclient_mysql_query" >&6; }
- if test $ac_cv_lib_mysqlclient_mysql_query = yes; then
- AUTH_LIBS="-lmysqlclient $AUTH_LIBS";
- { echo "$as_me:$LINENO: WARNING: had to add $__ldpath to LDFLAGS" >&5
-@@ -3770,19 +4734,18 @@
- CPPFLAGS="$CPPFLAGS $AUTH_CFLAGS"
- LIBS="$LIBS $AUTH_LIBS"
- if test "${ac_cv_header_mysql_mysql_h+set}" = set; then
-- echo "$as_me:$LINENO: checking for mysql/mysql.h" >&5
--echo $ECHO_N "checking for mysql/mysql.h... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for mysql/mysql.h" >&5
-+echo $ECHO_N "checking for mysql/mysql.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_mysql_mysql_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_mysql_mysql_h" >&5
--echo "${ECHO_T}$ac_cv_header_mysql_mysql_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_mysql_mysql_h" >&5
-+echo "${ECHO_T}$ac_cv_header_mysql_mysql_h" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking mysql/mysql.h usability" >&5
--echo $ECHO_N "checking mysql/mysql.h usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking mysql/mysql.h usability" >&5
-+echo $ECHO_N "checking mysql/mysql.h usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -3792,33 +4755,38 @@
- #include <mysql/mysql.h>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_header_compiler=no
-+ ac_header_compiler=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+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 mysql/mysql.h presence" >&5
--echo $ECHO_N "checking mysql/mysql.h presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking mysql/mysql.h presence" >&5
-+echo $ECHO_N "checking mysql/mysql.h presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -3826,23 +4794,22 @@
- /* end confdefs.h. */
- #include <mysql/mysql.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+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
-- 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
-@@ -3850,52 +4817,45 @@
-
- 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
-+{ 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 in
-- yes:no )
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+ yes:no: )
- { echo "$as_me:$LINENO: WARNING: mysql/mysql.h: accepted by the compiler, rejected by the preprocessor!" >&5
- echo "$as_me: WARNING: mysql/mysql.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: mysql/mysql.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: mysql/mysql.h: proceeding with the compiler's result" >&2;}
-+ ac_header_preproc=yes
-+ ;;
-+ no:yes:* )
-+ { echo "$as_me:$LINENO: WARNING: mysql/mysql.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: mysql/mysql.h: present but cannot be compiled" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: mysql/mysql.h: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: mysql/mysql.h: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: mysql/mysql.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: mysql/mysql.h: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: mysql/mysql.h: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: mysql/mysql.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: mysql/mysql.h: proceeding with the preprocessor's result" >&5
- echo "$as_me: WARNING: mysql/mysql.h: proceeding with the preprocessor's result" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------ ##
--## Report this to bug-autoconf at gnu.org. ##
--## ------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-- ;;
-- no:yes )
-- { echo "$as_me:$LINENO: WARNING: mysql/mysql.h: present but cannot be compiled" >&5
--echo "$as_me: WARNING: mysql/mysql.h: present but cannot be compiled" >&2;}
-- { echo "$as_me:$LINENO: WARNING: mysql/mysql.h: check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: mysql/mysql.h: check for missing prerequisite headers?" >&2;}
-- { echo "$as_me:$LINENO: WARNING: mysql/mysql.h: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: mysql/mysql.h: proceeding with the preprocessor's result" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------ ##
--## Report this to bug-autoconf at gnu.org. ##
--## ------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+ { echo "$as_me:$LINENO: WARNING: mysql/mysql.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: mysql/mysql.h: in the future, the compiler will take precedence" >&2;}
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for mysql/mysql.h" >&5
--echo $ECHO_N "checking for mysql/mysql.h... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for mysql/mysql.h" >&5
-+echo $ECHO_N "checking for mysql/mysql.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_mysql_mysql_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_cv_header_mysql_mysql_h=$ac_header_preproc
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_mysql_mysql_h" >&5
--echo "${ECHO_T}$ac_cv_header_mysql_mysql_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_mysql_mysql_h" >&5
-+echo "${ECHO_T}$ac_cv_header_mysql_mysql_h" >&6; }
-
- fi
- if test $ac_cv_header_mysql_mysql_h = yes; then
-@@ -3909,60 +4869,67 @@
-
- if test x$auth = xtrue; then
-
--echo "$as_me:$LINENO: checking for mysql_query in -lmysqlclient" >&5
--echo $ECHO_N "checking for mysql_query in -lmysqlclient... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for mysql_query in -lmysqlclient" >&5
-+echo $ECHO_N "checking for mysql_query in -lmysqlclient... $ECHO_C" >&6; }
- if test "${ac_cv_lib_mysqlclient_mysql_query+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lmysqlclient $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char mysql_query ();
- int
- main ()
- {
--mysql_query ();
-+return mysql_query ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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_mysqlclient_mysql_query=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_mysqlclient_mysql_query=no
-+ ac_cv_lib_mysqlclient_mysql_query=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+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
--echo "$as_me:$LINENO: result: $ac_cv_lib_mysqlclient_mysql_query" >&5
--echo "${ECHO_T}$ac_cv_lib_mysqlclient_mysql_query" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_mysqlclient_mysql_query" >&5
-+echo "${ECHO_T}$ac_cv_lib_mysqlclient_mysql_query" >&6; }
- if test $ac_cv_lib_mysqlclient_mysql_query = yes; then
- cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBMYSQLCLIENT 1
-@@ -4009,10 +4976,9 @@
-
-
-
--# Check whether --enable-server or --disable-server was given.
-+# Check whether --enable-server was given.
- if test "${enable_server+set}" = set; then
-- enableval="$enable_server"
-- case "${enableval}" in
-+ enableval=$enable_server; case "${enableval}" in
- yes) server=true ;;
- no) server=false ;;
- *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --disable-server" >&5
-@@ -4021,10 +4987,9 @@
- esac
- else
- server=true
--fi;
--
-+fi
-
--if test x$server = xtrue; then
-+ if test x$server = xtrue; then
- SERVER_TRUE=
- SERVER_FALSE='#'
- else
-@@ -4034,18 +4999,17 @@
-
-
-
--# Check whether --with-readline or --without-readline was given.
-+# Check whether --with-readline was given.
- if test "${with_readline+set}" = set; then
-- withval="$with_readline"
-- WITH_READLINE=$withval
-+ withval=$with_readline; WITH_READLINE=$withval
- else
- WITH_READLINE="maybe"
--fi;
-+fi
-
--# Check whether --enable-client or --disable-client was given.
-+
-+# Check whether --enable-client was given.
- if test "${enable_client+set}" = set; then
-- enableval="$enable_client"
-- case "${enableval}" in
-+ enableval=$enable_client; case "${enableval}" in
- yes) client=yes ;;
- no) client=no ;;
- xaw3d) client=xaw
-@@ -4064,10 +5028,9 @@
- esac
- else
- client=yes
--fi;
--
-+fi
-
--if test x$client != xno; then
-+ if test x$client != xno; then
- CLIENT_TRUE=
- CLIENT_FALSE='#'
- else
-@@ -4076,10 +5039,9 @@
- fi
-
-
--# Check whether --enable-ftwl or --disable-ftwl was given.
-+# Check whether --enable-ftwl was given.
- if test "${enable_ftwl+set}" = set; then
-- enableval="$enable_ftwl"
-- case "${enableval}" in
-+ enableval=$enable_ftwl; case "${enableval}" in
- x11) ftwl=x11 ;;
- sdl) ftwl=sdl ;;
- opengl) ftwl=opengl ;;
-@@ -4089,10 +5051,9 @@
- esac
- else
- ftwl=no
--fi;
--
-+fi
-
--if test x$ftwl != xno; then
-+ if test x$ftwl != xno; then
- FTWL_TRUE=
- FTWL_FALSE='#'
- else
-@@ -4107,25 +5068,24 @@
- fi
-
-
--# Check whether --with-xaw or --without-xaw was given.
-+# Check whether --with-xaw was given.
- if test "${with_xaw+set}" = set; then
-- withval="$with_xaw"
-- WITH_XAW=1
-+ withval=$with_xaw; WITH_XAW=1
-
--fi;
-+fi
-
-
--# Check whether --with-xaw3d or --without-xaw3d was given.
-+
-+# Check whether --with-xaw3d was given.
- if test "${with_xaw3d+set}" = set; then
-- withval="$with_xaw3d"
-- WITH_XAW3D=1
-+ withval=$with_xaw3d; WITH_XAW3D=1
-+
-+fi
-
--fi;
-
--# Check whether --enable-make_data or --disable-make_data was given.
-+# Check whether --enable-make_data was given.
- if test "${enable_make_data+set}" = set; then
-- enableval="$enable_make_data"
-- case "${enableval}" in
-+ enableval=$enable_make_data; case "${enableval}" in
- yes) make_data=true ;;
- no) make_data=false ;;
- *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --disable-make-data" >&5
-@@ -4134,10 +5094,9 @@
- esac
- else
- make_data=true
--fi;
--
-+fi
-
--if test x$make_data = xtrue; then
-+ if test x$make_data = xtrue; then
- MAKE_DATA_TRUE=
- MAKE_DATA_FALSE='#'
- else
-@@ -4146,10 +5105,9 @@
- fi
-
-
--# Check whether --enable-make_include or --disable-make_include was given.
-+# Check whether --enable-make_include was given.
- if test "${enable_make_include+set}" = set; then
-- enableval="$enable_make_include"
-- case "${enableval}" in
-+ enableval=$enable_make_include; case "${enableval}" in
- yes) make_include=true ;;
- no) make_include=false ;;
- *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-make-include" >&5
-@@ -4158,10 +5116,9 @@
- esac
- else
- make_include=false
--fi;
--
-+fi
-
--if test "$make_include" = "true"; then
-+ if test "$make_include" = "true"; then
- MAKE_CLIENT_INCLUDE_TRUE=
- MAKE_CLIENT_INCLUDE_FALSE='#'
- else
-@@ -4170,10 +5127,9 @@
- fi
-
-
--# Check whether --enable-auto_deps or --disable-auto_deps was given.
-+# Check whether --enable-auto_deps was given.
- if test "${enable_auto_deps+set}" = set; then
-- enableval="$enable_auto_deps"
-- case "${enableval}" in
-+ enableval=$enable_auto_deps; case "${enableval}" in
- yes) enable_auto_deps=true ;;
- no) enable_auto_deps=false;;
- *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-auto-deps" >&5
-@@ -4182,23 +5138,24 @@
- esac
- else
- enable_auto_deps="maybe"
--fi;
-+fi
-+
- AUTO_DEPS=$enable_auto_deps
-
-
--# Check whether --with-efence or --without-efence was given.
-+# Check whether --with-efence was given.
- if test "${with_efence+set}" = set; then
-- withval="$with_efence"
-- WITH_EFENCE=1
-+ withval=$with_efence; WITH_EFENCE=1
-+
-+fi
-
--fi;
-
- for ac_prog in gawk mawk nawk awk
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_AWK+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4211,25 +5168,27 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $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
- fi
- done
- done
-+IFS=$as_save_IFS
-
- fi
- fi
- AWK=$ac_cv_prog_AWK
- if test -n "$AWK"; then
-- echo "$as_me:$LINENO: result: $AWK" >&5
--echo "${ECHO_T}$AWK" >&6
-+ { echo "$as_me:$LINENO: result: $AWK" >&5
-+echo "${ECHO_T}$AWK" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- test -n "$AWK" && break
- done
-
-@@ -4241,8 +5200,8 @@
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
- set dummy ${ac_tool_prefix}gcc; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4255,32 +5214,34 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $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
- fi
- done
- done
-+IFS=$as_save_IFS
-
- fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
-+ { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- fi
- if test -z "$ac_cv_prog_CC"; then
- ac_ct_CC=$CC
- # Extract the first word of "gcc", so it can be a program name with args.
- set dummy gcc; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4293,36 +5254,51 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $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
- fi
- done
- done
-+IFS=$as_save_IFS
-
- fi
- fi
- ac_ct_CC=$ac_cv_prog_ac_ct_CC
- if test -n "$ac_ct_CC"; then
-- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
--echo "${ECHO_T}$ac_ct_CC" >&6
-+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+echo "${ECHO_T}$ac_ct_CC" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-- CC=$ac_ct_CC
-+ if test "x$ac_ct_CC" = x; then
-+ CC=""
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ CC=$ac_ct_CC
-+ fi
- else
- CC="$ac_cv_prog_CC"
- fi
-
- if test -z "$CC"; then
-- if test -n "$ac_tool_prefix"; then
-- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-+ if test -n "$ac_tool_prefix"; then
-+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
- set dummy ${ac_tool_prefix}cc; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4335,74 +5311,34 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $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
- fi
- done
- done
-+IFS=$as_save_IFS
-
- fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
--else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
--
--fi
--if test -z "$ac_cv_prog_CC"; then
-- ac_ct_CC=$CC
-- # Extract the first word of "cc", so it can be a program name with args.
--set dummy cc; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- if test -n "$ac_ct_CC"; then
-- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-- ac_cv_prog_ac_ct_CC="cc"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--
--fi
--fi
--ac_ct_CC=$ac_cv_prog_ac_ct_CC
--if test -n "$ac_ct_CC"; then
-- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
--echo "${ECHO_T}$ac_ct_CC" >&6
-+ { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-- CC=$ac_ct_CC
--else
-- CC="$ac_cv_prog_CC"
--fi
-
-+ fi
- fi
- if test -z "$CC"; then
- # Extract the first word of "cc", so it can be a program name with args.
- set dummy cc; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4416,7 +5352,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $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
-@@ -4427,6 +5363,7 @@
- fi
- done
- done
-+IFS=$as_save_IFS
-
- if test $ac_prog_rejected = yes; then
- # We found a bogon in the path, so make sure we never use it.
-@@ -4444,22 +5381,23 @@
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
-+ { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- fi
- if test -z "$CC"; then
- if test -n "$ac_tool_prefix"; then
-- for ac_prog in cl
-+ for ac_prog in cl.exe
- 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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4472,36 +5410,38 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $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
- fi
- done
- done
-+IFS=$as_save_IFS
-
- fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
-+ { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- test -n "$CC" && break
- done
- fi
- if test -z "$CC"; then
- ac_ct_CC=$CC
-- for ac_prog in cl
-+ for ac_prog in cl.exe
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4514,29 +5454,45 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $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
- fi
- done
- done
-+IFS=$as_save_IFS
-
- fi
- fi
- ac_ct_CC=$ac_cv_prog_ac_ct_CC
- if test -n "$ac_ct_CC"; then
-- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
--echo "${ECHO_T}$ac_ct_CC" >&6
-+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+echo "${ECHO_T}$ac_ct_CC" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- test -n "$ac_ct_CC" && break
- done
-
-- CC=$ac_ct_CC
-+ if test "x$ac_ct_CC" = x; then
-+ CC=""
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ CC=$ac_ct_CC
-+ fi
- fi
-
- fi
-@@ -4549,32 +5505,45 @@
- { (exit 1); exit 1; }; }
-
- # Provide some information about the compiler.
--echo "$as_me:$LINENO:" \
-- "checking for C compiler version" >&5
-+echo "$as_me:$LINENO: checking for C compiler version" >&5
- ac_compiler=`set X $ac_compile; echo $2`
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-- (eval $ac_compiler --version </dev/null >&5) 2>&5
-+{ (ac_try="$ac_compiler --version >&5"
-+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_compiler --version >&5") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-- (eval $ac_compiler -v </dev/null >&5) 2>&5
-+{ (ac_try="$ac_compiler -v >&5"
-+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_compiler -v >&5") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-- (eval $ac_compiler -V </dev/null >&5) 2>&5
-+{ (ac_try="$ac_compiler -V >&5"
-+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_compiler -V >&5") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-
--echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
--echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
- if test "${ac_cv_c_compiler_gnu+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -4593,41 +5562,87 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_compiler_gnu=no
-+ ac_compiler_gnu=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
- fi
--echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
--echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
- GCC=`test $ac_compiler_gnu = yes && echo yes`
- ac_test_CFLAGS=${CFLAGS+set}
- ac_save_CFLAGS=$CFLAGS
--CFLAGS="-g"
--echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
--echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
- if test "${ac_cv_prog_cc_g+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
-+ ac_save_c_werror_flag=$ac_c_werror_flag
-+ ac_c_werror_flag=yes
-+ ac_cv_prog_cc_g=no
-+ CFLAGS="-g"
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+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
-+ ac_cv_prog_cc_g=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ CFLAGS=""
-+ cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -4643,28 +5658,80 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+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 -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&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
-+
-+ ac_c_werror_flag=$ac_save_c_werror_flag
-+ CFLAGS="-g"
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+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); }; }; 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
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_prog_cc_g=no
-+
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ ac_c_werror_flag=$ac_save_c_werror_flag
- fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
--echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
- if test "$ac_test_CFLAGS" = set; then
- CFLAGS=$ac_save_CFLAGS
- elif test $ac_cv_prog_cc_g = yes; then
-@@ -4680,15 +5747,14 @@
- CFLAGS=
- fi
- fi
--echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
--echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
--if test "${ac_cv_prog_cc_stdc+set}" = set; then
-+{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-+echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_cc_c89+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- ac_cv_prog_cc_stdc=no
-+ ac_cv_prog_cc_c89=no
- ac_save_CC=$CC
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -4716,6 +5782,21 @@
- va_end (v);
- return s;
- }
-+
-+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
-+ function prototypes and stuff, but not '\xHH' hex character constants.
-+ These don't provoke an error unfortunately, instead are silently treated
-+ as 'x'. The following induces an error, until -std is added to get
-+ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
-+ array size at least. It's necessary to write '\x00'==0 to get something
-+ that's true only with -std. */
-+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-+
-+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-+ inside strings and character constants. */
-+#define FOO(x) 'x'
-+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-+
- int test (int i, double x);
- struct s1 {int (*f) (int a);};
- struct s2 {int (*f) (double a);};
-@@ -4730,178 +5811,67 @@
- return 0;
- }
- _ACEOF
--# Don't try gcc -ansi; that turns off useful extensions and
--# breaks some systems' header files.
--# AIX -qlanglvl=ansi
--# Ultrix and OSF/1 -std1
--# HP-UX 10.20 and later -Ae
--# HP-UX older versions -Aa -D_HPUX_SOURCE
--# SVR4 -Xc -D__EXTENSIONS__
--for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
- do
- CC="$ac_save_CC $ac_arg"
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; then
-- ac_cv_prog_cc_stdc=$ac_arg
--break
-+ (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
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
- fi
--rm -f conftest.$ac_objext
-+
-+rm -f core conftest.err conftest.$ac_objext
-+ test "x$ac_cv_prog_cc_c89" != "xno" && break
- done
--rm -f conftest.$ac_ext conftest.$ac_objext
-+rm -f conftest.$ac_ext
- CC=$ac_save_CC
-
- fi
--
--case "x$ac_cv_prog_cc_stdc" in
-- x|xno)
-- echo "$as_me:$LINENO: result: none needed" >&5
--echo "${ECHO_T}none needed" >&6 ;;
-+# AC_CACHE_VAL
-+case "x$ac_cv_prog_cc_c89" in
-+ x)
-+ { echo "$as_me:$LINENO: result: none needed" >&5
-+echo "${ECHO_T}none needed" >&6; } ;;
-+ xno)
-+ { echo "$as_me:$LINENO: result: unsupported" >&5
-+echo "${ECHO_T}unsupported" >&6; } ;;
- *)
-- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
--echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
-- CC="$CC $ac_cv_prog_cc_stdc" ;;
-+ CC="$CC $ac_cv_prog_cc_c89"
-+ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
- esac
-
--# Some people use a C++ compiler to compile C. Since we use `exit',
--# in C++ we need to declare it. In case someone uses the same compiler
--# for both compiling C and C++ we need to have the C++ compiler decide
--# the declaration of exit, since it's the most demanding environment.
--cat >conftest.$ac_ext <<_ACEOF
--#ifndef __cplusplus
-- choke me
--#endif
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- for ac_declaration in \
-- ''\
-- '#include <stdlib.h>' \
-- 'extern "C" void std::exit (int) throw (); using std::exit;' \
-- 'extern "C" void std::exit (int); using std::exit;' \
-- 'extern "C" void exit (int) throw ();' \
-- 'extern "C" void exit (int);' \
-- 'void exit (int);'
--do
-- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--#include <stdlib.h>
--$ac_declaration
--int
--main ()
--{
--exit (42);
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- :
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-
--continue
--fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_declaration
--int
--main ()
--{
--exit (42);
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- break
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--fi
--rm -f conftest.$ac_objext conftest.$ac_ext
--done
--rm -f conftest*
--if test -n "$ac_declaration"; then
-- echo '#ifdef __cplusplus' >>confdefs.h
-- echo $ac_declaration >>confdefs.h
-- echo '#endif' >>confdefs.h
--fi
--
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--fi
--rm -f conftest.$ac_objext conftest.$ac_ext
--ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
- depcc="$CC" am_compiler_list=
-
--echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
--echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
- if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4916,18 +5886,34 @@
- # using a relative directory.
- cp "$am_depcomp" conftest.dir
- cd conftest.dir
-+ # We will build objects and dependencies in a subdirectory because
-+ # it helps to detect inapplicable dependency modes. For instance
-+ # both Tru64's cc and ICC support -MD to output dependencies as a
-+ # side effect of compilation, but ICC will put the dependencies in
-+ # the current directory while Tru64 will put them in the object
-+ # directory.
-+ mkdir sub
-
- am_cv_CC_dependencies_compiler_type=none
- if test "$am_compiler_list" = ""; then
- am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
- fi
- for depmode in $am_compiler_list; do
-+ # Setup a source with many dependencies, because some compilers
-+ # like to wrap large dependency lists on column 80 (with \), and
-+ # we should not choose a depcomp mode which is confused by this.
-+ #
- # We need to recreate these files for each test, as the compiler may
- # overwrite some of them when testing with obscure command lines.
- # This happens at least with the AIX C compiler.
-- echo '#include "conftest.h"' > conftest.c
-- echo 'int i;' > conftest.h
-- echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
-+ : > sub/conftest.c
-+ for i in 1 2 3 4 5 6; do
-+ echo '#include "conftst'$i'.h"' >> sub/conftest.c
-+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-+ # Solaris 8's {/usr,}/bin/sh.
-+ touch sub/conftst$i.h
-+ done
-+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
- case $depmode in
- nosideeffect)
-@@ -4945,13 +5931,26 @@
- # mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this.
- if depmode=$depmode \
-- source=conftest.c object=conftest.o \
-- depfile=conftest.Po tmpdepfile=conftest.TPo \
-- $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
-- grep conftest.h conftest.Po > /dev/null 2>&1 &&
-+ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-+ >/dev/null 2>conftest.err &&
-+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-- am_cv_CC_dependencies_compiler_type=$depmode
-- break
-+ # icc doesn't choke on unknown options, it will just issue warnings
-+ # or remarks (even with -Werror). So we grep stderr for any message
-+ # that says an option was ignored or not supported.
-+ # When given -MP, icc 7.0 and 7.1 complain thusly:
-+ # icc: Command line warning: ignoring option '-M'; no argument required
-+ # The diagnosis changed in icc 8.0:
-+ # icc: Command line remark: option '-MP' not supported
-+ if (grep 'ignoring option' conftest.err ||
-+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-+ am_cv_CC_dependencies_compiler_type=$depmode
-+ break
-+ fi
- fi
- done
-
-@@ -4962,18 +5961,28 @@
- fi
-
- fi
--echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
--echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
-+{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
- CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
-+ if
-+ test "x$enable_dependency_tracking" != xno \
-+ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-+ am__fastdepCC_TRUE=
-+ am__fastdepCC_FALSE='#'
-+else
-+ am__fastdepCC_TRUE='#'
-+ am__fastdepCC_FALSE=
-+fi
-+
-
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
--echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
--echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
- # On Suns, sometimes $CPP names a directory.
- if test -n "$CPP" && test -d "$CPP"; then
- CPP=
-@@ -4995,7 +6004,6 @@
- # On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp. "Syntax error" is here to catch this case.
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -5006,25 +6014,24 @@
- #else
- # include <assert.h>
- #endif
-- Syntax error
-+ Syntax error
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+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
-- 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
-@@ -5033,12 +6040,12 @@
- # Broken: fails on valid input.
- continue
- fi
-+
- rm -f conftest.err conftest.$ac_ext
-
-- # OK, works on sane cases. Now check whether non-existent headers
-+ # OK, works on sane cases. Now check whether nonexistent headers
- # can be detected and how.
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -5046,23 +6053,22 @@
- /* end confdefs.h. */
- #include <ac_nonexistent.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+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
-- 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
-@@ -5073,6 +6079,7 @@
- ac_preproc_ok=:
- break
- fi
-+
- rm -f conftest.err conftest.$ac_ext
-
- done
-@@ -5090,8 +6097,8 @@
- else
- ac_cv_prog_CPP=$CPP
- fi
--echo "$as_me:$LINENO: result: $CPP" >&5
--echo "${ECHO_T}$CPP" >&6
-+{ echo "$as_me:$LINENO: result: $CPP" >&5
-+echo "${ECHO_T}$CPP" >&6; }
- ac_preproc_ok=false
- for ac_c_preproc_warn_flag in '' yes
- do
-@@ -5102,7 +6109,6 @@
- # On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp. "Syntax error" is here to catch this case.
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -5113,25 +6119,24 @@
- #else
- # include <assert.h>
- #endif
-- Syntax error
-+ Syntax error
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+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
-- 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
-@@ -5140,12 +6145,12 @@
- # Broken: fails on valid input.
- continue
- fi
-+
- rm -f conftest.err conftest.$ac_ext
-
-- # OK, works on sane cases. Now check whether non-existent headers
-+ # OK, works on sane cases. Now check whether nonexistent headers
- # can be detected and how.
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -5153,23 +6158,22 @@
- /* end confdefs.h. */
- #include <ac_nonexistent.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+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
-- 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
-@@ -5180,6 +6184,7 @@
- ac_preproc_ok=:
- break
- fi
-+
- rm -f conftest.err conftest.$ac_ext
-
- done
-@@ -5201,18 +6206,22 @@
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
--ac_ext=cc
-+ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
--if test -n "$ac_tool_prefix"; then
-- for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
-+if test -z "$CXX"; then
-+ if test -n "$CCC"; then
-+ CXX=$CCC
-+ else
-+ if test -n "$ac_tool_prefix"; then
-+ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
- 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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CXX+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -5225,36 +6234,38 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $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
- fi
- done
- done
-+IFS=$as_save_IFS
-
- fi
- fi
- CXX=$ac_cv_prog_CXX
- if test -n "$CXX"; then
-- echo "$as_me:$LINENO: result: $CXX" >&5
--echo "${ECHO_T}$CXX" >&6
-+ { echo "$as_me:$LINENO: result: $CXX" >&5
-+echo "${ECHO_T}$CXX" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- test -n "$CXX" && break
- done
- fi
- if test -z "$CXX"; then
- ac_ct_CXX=$CXX
-- for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
-+ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -5267,60 +6278,89 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $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
- fi
- done
- done
-+IFS=$as_save_IFS
-
- fi
- fi
- ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
- if test -n "$ac_ct_CXX"; then
-- echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
--echo "${ECHO_T}$ac_ct_CXX" >&6
-+ { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-+echo "${ECHO_T}$ac_ct_CXX" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- test -n "$ac_ct_CXX" && break
- done
--test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
-
-- CXX=$ac_ct_CXX
-+ if test "x$ac_ct_CXX" = x; then
-+ CXX="g++"
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ CXX=$ac_ct_CXX
-+ fi
- fi
-
--
-+ fi
-+fi
- # Provide some information about the compiler.
--echo "$as_me:$LINENO:" \
-- "checking for C++ compiler version" >&5
-+echo "$as_me:$LINENO: checking for C++ compiler version" >&5
- ac_compiler=`set X $ac_compile; echo $2`
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-- (eval $ac_compiler --version </dev/null >&5) 2>&5
-+{ (ac_try="$ac_compiler --version >&5"
-+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_compiler --version >&5") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-- (eval $ac_compiler -v </dev/null >&5) 2>&5
-+{ (ac_try="$ac_compiler -v >&5"
-+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_compiler -v >&5") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-- (eval $ac_compiler -V </dev/null >&5) 2>&5
-+{ (ac_try="$ac_compiler -V >&5"
-+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_compiler -V >&5") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-
--echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
--echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
-+echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }
- if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -5339,41 +6379,49 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_compiler_gnu=no
-+ ac_compiler_gnu=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
-
- fi
--echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
--echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-+echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }
- GXX=`test $ac_compiler_gnu = yes && echo yes`
- ac_test_CXXFLAGS=${CXXFLAGS+set}
- ac_save_CXXFLAGS=$CXXFLAGS
--CXXFLAGS="-g"
--echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
--echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-+echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }
- if test "${ac_cv_prog_cxx_g+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
-+ ac_save_cxx_werror_flag=$ac_cxx_werror_flag
-+ ac_cxx_werror_flag=yes
-+ ac_cv_prog_cxx_g=no
-+ CXXFLAGS="-g"
-+ cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -5389,132 +6437,133 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_prog_cxx_g=no
--fi
--rm -f conftest.$ac_objext conftest.$ac_ext
--fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
--echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
--if test "$ac_test_CXXFLAGS" = set; then
-- CXXFLAGS=$ac_save_CXXFLAGS
--elif test $ac_cv_prog_cxx_g = yes; then
-- if test "$GXX" = yes; then
-- CXXFLAGS="-g -O2"
-- else
-- CXXFLAGS="-g"
-- fi
--else
-- if test "$GXX" = yes; then
-- CXXFLAGS="-O2"
-- else
-- CXXFLAGS=
-- fi
--fi
--for ac_declaration in \
-- ''\
-- '#include <stdlib.h>' \
-- 'extern "C" void std::exit (int) throw (); using std::exit;' \
-- 'extern "C" void std::exit (int); using std::exit;' \
-- 'extern "C" void exit (int) throw ();' \
-- 'extern "C" void exit (int);' \
-- 'void exit (int);'
--do
-- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
-+ CXXFLAGS=""
-+ cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
--#include <stdlib.h>
--$ac_declaration
-+
- int
- main ()
- {
--exit (42);
-+
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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
- sed 's/^/| /' conftest.$ac_ext >&5
-
--continue
--fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
-+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-+ CXXFLAGS="-g"
-+ cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
--$ac_declaration
-+
- int
- main ()
- {
--exit (42);
-+
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; then
-- break
-+ (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
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
--done
--rm -f conftest*
--if test -n "$ac_declaration"; then
-- echo '#ifdef __cplusplus' >>confdefs.h
-- echo $ac_declaration >>confdefs.h
-- echo '#endif' >>confdefs.h
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
-
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
-+echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
-+if test "$ac_test_CXXFLAGS" = set; then
-+ CXXFLAGS=$ac_save_CXXFLAGS
-+elif test $ac_cv_prog_cxx_g = yes; then
-+ if test "$GXX" = yes; then
-+ CXXFLAGS="-g -O2"
-+ else
-+ CXXFLAGS="-g"
-+ fi
-+else
-+ if test "$GXX" = yes; then
-+ CXXFLAGS="-O2"
-+ else
-+ CXXFLAGS=
-+ fi
-+fi
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -5523,8 +6572,8 @@
-
- depcc="$CXX" am_compiler_list=
-
--echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
--echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
- if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -5539,18 +6588,34 @@
- # using a relative directory.
- cp "$am_depcomp" conftest.dir
- cd conftest.dir
-+ # We will build objects and dependencies in a subdirectory because
-+ # it helps to detect inapplicable dependency modes. For instance
-+ # both Tru64's cc and ICC support -MD to output dependencies as a
-+ # side effect of compilation, but ICC will put the dependencies in
-+ # the current directory while Tru64 will put them in the object
-+ # directory.
-+ mkdir sub
-
- am_cv_CXX_dependencies_compiler_type=none
- if test "$am_compiler_list" = ""; then
- am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
- fi
- for depmode in $am_compiler_list; do
-+ # Setup a source with many dependencies, because some compilers
-+ # like to wrap large dependency lists on column 80 (with \), and
-+ # we should not choose a depcomp mode which is confused by this.
-+ #
- # We need to recreate these files for each test, as the compiler may
- # overwrite some of them when testing with obscure command lines.
- # This happens at least with the AIX C compiler.
-- echo '#include "conftest.h"' > conftest.c
-- echo 'int i;' > conftest.h
-- echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
-+ : > sub/conftest.c
-+ for i in 1 2 3 4 5 6; do
-+ echo '#include "conftst'$i'.h"' >> sub/conftest.c
-+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-+ # Solaris 8's {/usr,}/bin/sh.
-+ touch sub/conftst$i.h
-+ done
-+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
- case $depmode in
- nosideeffect)
-@@ -5568,13 +6633,26 @@
- # mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this.
- if depmode=$depmode \
-- source=conftest.c object=conftest.o \
-- depfile=conftest.Po tmpdepfile=conftest.TPo \
-- $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
-- grep conftest.h conftest.Po > /dev/null 2>&1 &&
-+ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-+ >/dev/null 2>conftest.err &&
-+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-- am_cv_CXX_dependencies_compiler_type=$depmode
-- break
-+ # icc doesn't choke on unknown options, it will just issue warnings
-+ # or remarks (even with -Werror). So we grep stderr for any message
-+ # that says an option was ignored or not supported.
-+ # When given -MP, icc 7.0 and 7.1 complain thusly:
-+ # icc: Command line warning: ignoring option '-M'; no argument required
-+ # The diagnosis changed in icc 8.0:
-+ # icc: Command line remark: option '-MP' not supported
-+ if (grep 'ignoring option' conftest.err ||
-+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-+ am_cv_CXX_dependencies_compiler_type=$depmode
-+ break
-+ fi
- fi
- done
-
-@@ -5585,27 +6663,37 @@
- fi
-
- fi
--echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
--echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6
-+{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
-+echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
- CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-
-+ if
-+ test "x$enable_dependency_tracking" != xno \
-+ && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
-+ am__fastdepCXX_TRUE=
-+ am__fastdepCXX_FALSE='#'
-+else
-+ am__fastdepCXX_TRUE='#'
-+ am__fastdepCXX_FALSE=
-+fi
-+
-
--echo "$as_me:$LINENO: checking whether ln -s works" >&5
--echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
-+echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
- LN_S=$as_ln_s
- if test "$LN_S" = "ln -s"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- else
-- echo "$as_me:$LINENO: result: no, using $LN_S" >&5
--echo "${ECHO_T}no, using $LN_S" >&6
-+ { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-+echo "${ECHO_T}no, using $LN_S" >&6; }
- fi
-
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
- set dummy ${ac_tool_prefix}ranlib; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_RANLIB+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -5618,32 +6706,34 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $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
- fi
- done
- done
-+IFS=$as_save_IFS
-
- fi
- fi
- RANLIB=$ac_cv_prog_RANLIB
- if test -n "$RANLIB"; then
-- echo "$as_me:$LINENO: result: $RANLIB" >&5
--echo "${ECHO_T}$RANLIB" >&6
-+ { echo "$as_me:$LINENO: result: $RANLIB" >&5
-+echo "${ECHO_T}$RANLIB" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- fi
- if test -z "$ac_cv_prog_RANLIB"; then
- ac_ct_RANLIB=$RANLIB
- # Extract the first word of "ranlib", so it can be a program name with args.
- set dummy ranlib; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -5656,27 +6746,41 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $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
- fi
- done
- done
-+IFS=$as_save_IFS
-
-- test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
- fi
- fi
- ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
- if test -n "$ac_ct_RANLIB"; then
-- echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
--echo "${ECHO_T}$ac_ct_RANLIB" >&6
-+ { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-+echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-- RANLIB=$ac_ct_RANLIB
-+ if test "x$ac_ct_RANLIB" = x; then
-+ RANLIB=":"
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ RANLIB=$ac_ct_RANLIB
-+ fi
- else
- RANLIB="$ac_cv_prog_RANLIB"
- fi
-@@ -5684,8 +6788,8 @@
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
- set dummy ${ac_tool_prefix}ar; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_AR+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -5698,32 +6802,34 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $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
- fi
- done
- done
-+IFS=$as_save_IFS
-
- fi
- fi
- AR=$ac_cv_prog_AR
- if test -n "$AR"; then
-- echo "$as_me:$LINENO: result: $AR" >&5
--echo "${ECHO_T}$AR" >&6
-+ { echo "$as_me:$LINENO: result: $AR" >&5
-+echo "${ECHO_T}$AR" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- fi
- if test -z "$ac_cv_prog_AR"; then
- ac_ct_AR=$AR
- # Extract the first word of "ar", so it can be a program name with args.
- set dummy ar; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -5736,26 +6842,41 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $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
- fi
- done
- done
-+IFS=$as_save_IFS
-
- fi
- fi
- ac_ct_AR=$ac_cv_prog_ac_ct_AR
- if test -n "$ac_ct_AR"; then
-- echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
--echo "${ECHO_T}$ac_ct_AR" >&6
-+ { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
-+echo "${ECHO_T}$ac_ct_AR" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-- AR=$ac_ct_AR
-+ if test "x$ac_ct_AR" = x; then
-+ AR=""
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ AR=$ac_ct_AR
-+ fi
- else
- AR="$ac_cv_prog_AR"
- fi
-@@ -5768,8 +6889,8 @@
-
- # Extract the first word of "uname", so it can be a program name with args.
- set dummy uname; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_UNAME+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -5782,24 +6903,25 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $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_UNAME="uname"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- test -z "$ac_cv_prog_UNAME" && ac_cv_prog_UNAME=":"
- fi
- fi
- UNAME=$ac_cv_prog_UNAME
- if test -n "$UNAME"; then
-- echo "$as_me:$LINENO: result: $UNAME" >&5
--echo "${ECHO_T}$UNAME" >&6
-+ { echo "$as_me:$LINENO: result: $UNAME" >&5
-+echo "${ECHO_T}$UNAME" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-@@ -5807,19 +6929,20 @@
-
-
-
--# Check whether --with-libiconv-prefix or --without-libiconv-prefix was given.
--if test "${with_libiconv_prefix+set}" = set; then
-- withval="$with_libiconv_prefix"
-
-+# Check whether --with-libiconv-prefix was given.
-+if test "${with_libiconv_prefix+set}" = set; then
-+ withval=$with_libiconv_prefix;
- for dir in `echo "$withval" | tr : ' '`; do
- if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi
- if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi
- done
-
--fi;
-+fi
-
-- echo "$as_me:$LINENO: checking for iconv" >&5
--echo $ECHO_N "checking for iconv... $ECHO_C" >&6
-+
-+ { echo "$as_me:$LINENO: checking for iconv" >&5
-+echo $ECHO_N "checking for iconv... $ECHO_C" >&6; }
- if test "${am_cv_func_iconv+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -5827,7 +6950,6 @@
- am_cv_func_iconv="no, consider installing GNU libiconv"
- am_cv_lib_iconv=no
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -5846,29 +6968,37 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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_func_iconv=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext conftest.$ac_ext
- if test "$am_cv_func_iconv" != yes; then
- am_save_LIBS="$LIBS"
- LIBS="$LIBS -liconv"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -5887,45 +7017,53 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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_lib_iconv=yes
- am_cv_func_iconv=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS="$am_save_LIBS"
- fi
-
- fi
--echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5
--echo "${ECHO_T}$am_cv_func_iconv" >&6
-+{ echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5
-+echo "${ECHO_T}$am_cv_func_iconv" >&6; }
- if test "$am_cv_func_iconv" = yes; then
-
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_ICONV 1
- _ACEOF
-
-- echo "$as_me:$LINENO: checking for iconv declaration" >&5
--echo $ECHO_N "checking for iconv declaration... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for iconv declaration" >&5
-+echo $ECHO_N "checking for iconv declaration... $ECHO_C" >&6; }
- if test "${am_cv_proto_iconv+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -5953,33 +7091,39 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- am_cv_proto_iconv_arg1=""
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--am_cv_proto_iconv_arg1="const"
-+ am_cv_proto_iconv_arg1="const"
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"
- fi
-
- am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
-- echo "$as_me:$LINENO: result: ${ac_t:-
-+ { echo "$as_me:$LINENO: result: ${ac_t:-
- }$am_cv_proto_iconv" >&5
- echo "${ECHO_T}${ac_t:-
-- }$am_cv_proto_iconv" >&6
-+ }$am_cv_proto_iconv" >&6; }
-
- cat >>confdefs.h <<_ACEOF
- #define ICONV_CONST $am_cv_proto_iconv_arg1
-@@ -5993,15 +7137,14 @@
-
-
-
-- echo "$as_me:$LINENO: checking for libcharset" >&5
--echo $ECHO_N "checking for libcharset... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for libcharset" >&5
-+echo $ECHO_N "checking for libcharset... $ECHO_C" >&6; }
- if test "${am_cv_libcharset+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- lc_save_LIBS="$LIBS"
- LIBS="$LIBS $LIBICONV"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -6017,30 +7160,38 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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_libcharset=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--am_cv_libcharset=no
-+ am_cv_libcharset=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS="$lc_save_LIBS"
-
- fi
--echo "$as_me:$LINENO: result: $am_cv_libcharset" >&5
--echo "${ECHO_T}$am_cv_libcharset" >&6
-+{ echo "$as_me:$LINENO: result: $am_cv_libcharset" >&5
-+echo "${ECHO_T}$am_cv_libcharset" >&6; }
- if test $am_cv_libcharset = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -6050,13 +7201,12 @@
- fi
-
-
-- echo "$as_me:$LINENO: checking for nl_langinfo and CODESET" >&5
--echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for nl_langinfo and CODESET" >&5
-+echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6; }
- if test "${am_cv_langinfo_codeset+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -6072,29 +7222,37 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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_langinfo_codeset=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--am_cv_langinfo_codeset=no
-+ am_cv_langinfo_codeset=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+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_langinfo_codeset" >&5
--echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
-+{ echo "$as_me:$LINENO: result: $am_cv_langinfo_codeset" >&5
-+echo "${ECHO_T}$am_cv_langinfo_codeset" >&6; }
- if test $am_cv_langinfo_codeset = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -6119,73 +7277,79 @@
-
- ALL_LINGUAS="ar cs ca da de el en_GB es et fa fi fr he hu it ja ko lt nl nb no pl pt pt_BR ro ru sv tr uk zh_CN"
-
-- echo "$as_me:$LINENO: checking for strerror in -lcposix" >&5
--echo $ECHO_N "checking for strerror in -lcposix... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for strerror in -lcposix" >&5
-+echo $ECHO_N "checking for strerror in -lcposix... $ECHO_C" >&6; }
- if test "${ac_cv_lib_cposix_strerror+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lcposix $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char strerror ();
- int
- main ()
- {
--strerror ();
-+return strerror ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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_cposix_strerror=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_cposix_strerror=no
-+ ac_cv_lib_cposix_strerror=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+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
--echo "$as_me:$LINENO: result: $ac_cv_lib_cposix_strerror" >&5
--echo "${ECHO_T}$ac_cv_lib_cposix_strerror" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_cposix_strerror" >&5
-+echo "${ECHO_T}$ac_cv_lib_cposix_strerror" >&6; }
- if test $ac_cv_lib_cposix_strerror = yes; then
- LIBS="$LIBS -lcposix"
- fi
-
-
-
--echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
--echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
-+echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; }
- if test "${ac_cv_c_const+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -6199,10 +7363,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};
-@@ -6211,16 +7375,17 @@
- 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;
-
- *t++ = 0;
-+ if (s) return 0;
- }
- { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */
- int x[] = {25, 17};
-@@ -6239,7 +7404,9 @@
- }
- { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
- const int foo = 10;
-+ if (!foo) return 0;
- }
-+ return !cs[0] && !zero.x;
- #endif
-
- ;
-@@ -6247,28 +7414,34 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_c_const=no
-+ ac_cv_c_const=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
--echo "${ECHO_T}$ac_cv_c_const" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
-+echo "${ECHO_T}$ac_cv_c_const" >&6; }
- if test $ac_cv_c_const = no; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -6277,15 +7450,14 @@
-
- fi
-
--echo "$as_me:$LINENO: checking for inline" >&5
--echo $ECHO_N "checking for inline... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for inline" >&5
-+echo $ECHO_N "checking for inline... $ECHO_C" >&6; }
- if test "${ac_cv_c_inline+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_cv_c_inline=no
- for ac_kw in inline __inline__ __inline; do
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -6299,165 +7471,188 @@
-
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; then
-- ac_cv_c_inline=$ac_kw; break
-+ (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
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ test "$ac_cv_c_inline" != no && break
- done
-
- fi
--echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
--echo "${ECHO_T}$ac_cv_c_inline" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
-+echo "${ECHO_T}$ac_cv_c_inline" >&6; }
-+
-+
- case $ac_cv_c_inline in
- inline | yes) ;;
-- no)
--cat >>confdefs.h <<\_ACEOF
--#define inline
--_ACEOF
-- ;;
-- *) cat >>confdefs.h <<_ACEOF
--#define inline $ac_cv_c_inline
-+ *)
-+ case $ac_cv_c_inline in
-+ no) ac_val=;;
-+ *) ac_val=$ac_cv_c_inline;;
-+ esac
-+ cat >>confdefs.h <<_ACEOF
-+#ifndef __cplusplus
-+#define inline $ac_val
-+#endif
- _ACEOF
-- ;;
-+ ;;
- esac
-
--echo "$as_me:$LINENO: checking for off_t" >&5
--echo $ECHO_N "checking for off_t... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for off_t" >&5
-+echo $ECHO_N "checking for off_t... $ECHO_C" >&6; }
- if test "${ac_cv_type_off_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+typedef off_t ac__type_new_;
- int
- main ()
- {
--if ((off_t *) 0)
-+if ((ac__type_new_ *) 0)
- return 0;
--if (sizeof (off_t))
-+if (sizeof (ac__type_new_))
- return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_type_off_t=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_type_off_t=no
-+ ac_cv_type_off_t=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
--echo "${ECHO_T}$ac_cv_type_off_t" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
-+echo "${ECHO_T}$ac_cv_type_off_t" >&6; }
- if test $ac_cv_type_off_t = yes; then
- :
- else
-
- cat >>confdefs.h <<_ACEOF
--#define off_t long
-+#define off_t long int
- _ACEOF
-
- fi
-
--echo "$as_me:$LINENO: checking for size_t" >&5
--echo $ECHO_N "checking for size_t... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for size_t" >&5
-+echo $ECHO_N "checking for size_t... $ECHO_C" >&6; }
- if test "${ac_cv_type_size_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+typedef size_t ac__type_new_;
- int
- main ()
- {
--if ((size_t *) 0)
-+if ((ac__type_new_ *) 0)
- return 0;
--if (sizeof (size_t))
-+if (sizeof (ac__type_new_))
- return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_type_size_t=no
-+ ac_cv_type_size_t=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
--echo "${ECHO_T}$ac_cv_type_size_t" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-+echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
- if test $ac_cv_type_size_t = yes; then
- :
- else
-
- cat >>confdefs.h <<_ACEOF
--#define size_t unsigned
-+#define size_t unsigned int
- _ACEOF
-
- fi
-
- # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
- # for constant arguments. Useless!
--echo "$as_me:$LINENO: checking for working alloca.h" >&5
--echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for working alloca.h" >&5
-+echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6; }
- if test "${ac_cv_working_alloca_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -6468,33 +7663,42 @@
- main ()
- {
- char *p = (char *) alloca (2 * sizeof (int));
-+ if (p) return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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_working_alloca_h=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_working_alloca_h=no
-+ ac_cv_working_alloca_h=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+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_working_alloca_h" >&5
--echo "${ECHO_T}$ac_cv_working_alloca_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5
-+echo "${ECHO_T}$ac_cv_working_alloca_h" >&6; }
- if test $ac_cv_working_alloca_h = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -6503,13 +7707,12 @@
-
- fi
-
--echo "$as_me:$LINENO: checking for alloca" >&5
--echo $ECHO_N "checking for alloca... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for alloca" >&5
-+echo $ECHO_N "checking for alloca... $ECHO_C" >&6; }
- if test "${ac_cv_func_alloca_works+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -6522,7 +7725,7 @@
- # include <malloc.h>
- # define alloca _alloca
- # else
--# if HAVE_ALLOCA_H
-+# ifdef HAVE_ALLOCA_H
- # include <alloca.h>
- # else
- # ifdef _AIX
-@@ -6540,33 +7743,42 @@
- main ()
- {
- char *p = (char *) alloca (1);
-+ if (p) return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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_alloca_works=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_func_alloca_works=no
-+ ac_cv_func_alloca_works=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+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_alloca_works" >&5
--echo "${ECHO_T}$ac_cv_func_alloca_works" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5
-+echo "${ECHO_T}$ac_cv_func_alloca_works" >&6; }
-
- if test $ac_cv_func_alloca_works = yes; then
-
-@@ -6580,26 +7792,25 @@
- # contain a buggy version. If you still want to use their alloca,
- # use ar to extract alloca.o from them instead of compiling alloca.c.
-
--ALLOCA=alloca.$ac_objext
-+ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
-
- cat >>confdefs.h <<\_ACEOF
- #define C_ALLOCA 1
- _ACEOF
-
-
--echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5
--echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5
-+echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6; }
- if test "${ac_cv_os_cray+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
--#if defined(CRAY) && ! defined(CRAY2)
-+#if defined CRAY && ! defined CRAY2
- webecray
- #else
- wenotbecray
-@@ -6615,83 +7826,93 @@
- rm -f conftest*
-
- fi
--echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5
--echo "${ECHO_T}$ac_cv_os_cray" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5
-+echo "${ECHO_T}$ac_cv_os_cray" >&6; }
- if test $ac_cv_os_cray = yes; then
- for ac_func in _getb67 GETB67 getb67; do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
-+#define $ac_func innocuous_$ac_func
-+
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+
- #ifdef __STDC__
- # include <limits.h>
- #else
- # include <assert.h>
- #endif
--/* Override any gcc2 internal prototype to avoid an error. */
-+
-+#undef $ac_func
-+
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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
- sed 's/^/| /' conftest.$ac_ext >&5
-
--eval "$as_ac_var=no"
-+ eval "$as_ac_var=no"
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
-
- cat >>confdefs.h <<_ACEOF
-@@ -6704,8 +7925,8 @@
- done
- fi
-
--echo "$as_me:$LINENO: checking stack direction for C alloca" >&5
--echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking stack direction for C alloca" >&5
-+echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6; }
- if test "${ac_cv_c_stack_direction+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6713,12 +7934,12 @@
- ac_cv_c_stack_direction=0
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-+$ac_includes_default
- int
- find_stack_direction ()
- {
-@@ -6736,17 +7957,26 @@
- int
- main ()
- {
-- exit (find_stack_direction () < 0);
-+ return find_stack_direction () < 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+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>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (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
-@@ -6759,11 +7989,13 @@
- ( exit $ac_status )
- ac_cv_c_stack_direction=-1
- fi
--rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+
-+
- fi
--echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
--echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
-+echo "${ECHO_T}$ac_cv_c_stack_direction" >&6; }
-
- cat >>confdefs.h <<_ACEOF
- #define STACK_DIRECTION $ac_cv_c_stack_direction
-@@ -6777,20 +8009,20 @@
- for ac_header in stdlib.h unistd.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-- echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -6800,33 +8032,38 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_header_compiler=no
-+ ac_header_compiler=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+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 $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -6834,23 +8071,22 @@
- /* end confdefs.h. */
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+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
-- 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
-@@ -6858,52 +8094,46 @@
-
- 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
-+{ 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 in
-- yes:no )
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+ yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
- echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------ ##
--## Report this to bug-autoconf at gnu.org. ##
--## ------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+ ac_header_preproc=yes
- ;;
-- no:yes )
-+ no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
- echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------ ##
--## Report this to bug-autoconf at gnu.org. ##
--## ------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- eval "$as_ac_Header=$ac_header_preproc"
-+ eval "$as_ac_Header=\$ac_header_preproc"
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-
- fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -6919,78 +8149,88 @@
- for ac_func in getpagesize
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
-+#define $ac_func innocuous_$ac_func
-+
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+
- #ifdef __STDC__
- # include <limits.h>
- #else
- # include <assert.h>
- #endif
--/* Override any gcc2 internal prototype to avoid an error. */
-+
-+#undef $ac_func
-+
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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
- sed 's/^/| /' conftest.$ac_ext >&5
-
--eval "$as_ac_var=no"
-+ eval "$as_ac_var=no"
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -6999,8 +8239,8 @@
- fi
- done
-
--echo "$as_me:$LINENO: checking for working mmap" >&5
--echo $ECHO_N "checking for working mmap... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for working mmap" >&5
-+echo $ECHO_N "checking for working mmap... $ECHO_C" >&6; }
- if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -7008,7 +8248,6 @@
- ac_cv_func_mmap_fixed_mapped=no
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -7043,21 +8282,21 @@
- #include <fcntl.h>
- #include <sys/mman.h>
-
--#if !STDC_HEADERS && !HAVE_STDLIB_H
-+#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H
- char *malloc ();
- #endif
-
- /* This mess was copied from the GNU getpagesize.h. */
--#if !HAVE_GETPAGESIZE
-+#ifndef HAVE_GETPAGESIZE
- /* Assume that all systems that can run configure have sys/param.h. */
--# if !HAVE_SYS_PARAM_H
-+# ifndef HAVE_SYS_PARAM_H
- # define HAVE_SYS_PARAM_H 1
- # endif
-
- # ifdef _SC_PAGESIZE
- # define getpagesize() sysconf(_SC_PAGESIZE)
- # else /* no _SC_PAGESIZE */
--# if HAVE_SYS_PARAM_H
-+# ifdef HAVE_SYS_PARAM_H
- # include <sys/param.h>
- # ifdef EXEC_PAGESIZE
- # define getpagesize() EXEC_PAGESIZE
-@@ -7096,15 +8335,15 @@
- /* First, make a file with some known garbage in it. */
- data = (char *) malloc (pagesize);
- if (!data)
-- exit (1);
-+ return 1;
- for (i = 0; i < pagesize; ++i)
- *(data + i) = rand ();
- umask (0);
- fd = creat ("conftest.mmap", 0600);
- if (fd < 0)
-- exit (1);
-+ return 1;
- if (write (fd, data, pagesize) != pagesize)
-- exit (1);
-+ return 1;
- close (fd);
-
- /* Next, try to mmap the file at a fixed address which already has
-@@ -7112,17 +8351,17 @@
- we see the same garbage. */
- fd = open ("conftest.mmap", O_RDWR);
- if (fd < 0)
-- exit (1);
-+ return 1;
- data2 = (char *) malloc (2 * pagesize);
- if (!data2)
-- exit (1);
-- data2 += (pagesize - ((int) data2 & (pagesize - 1))) & (pagesize - 1);
-+ return 1;
-+ data2 += (pagesize - ((long int) data2 & (pagesize - 1))) & (pagesize - 1);
- if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE,
-- MAP_PRIVATE | MAP_FIXED, fd, 0L))
-- exit (1);
-+ MAP_PRIVATE | MAP_FIXED, fd, 0L))
-+ return 1;
- for (i = 0; i < pagesize; ++i)
- if (*(data + i) != *(data2 + i))
-- exit (1);
-+ return 1;
-
- /* Finally, make sure that changes to the mapped area do not
- percolate back to the file as seen by read(). (This is a bug on
-@@ -7131,24 +8370,33 @@
- *(data2 + i) = *(data2 + i) + 1;
- data3 = (char *) malloc (pagesize);
- if (!data3)
-- exit (1);
-+ return 1;
- if (read (fd, data3, pagesize) != pagesize)
-- exit (1);
-+ return 1;
- for (i = 0; i < pagesize; ++i)
- if (*(data + i) != *(data3 + i))
-- exit (1);
-+ return 1;
- close (fd);
-- exit (0);
-+ return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+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>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (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
-@@ -7161,11 +8409,13 @@
- ( exit $ac_status )
- ac_cv_func_mmap_fixed_mapped=no
- fi
--rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+
-+
- fi
--echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5
--echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5
-+echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6; }
- if test $ac_cv_func_mmap_fixed_mapped = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -7176,13 +8426,12 @@
- rm -f conftest.mmap
-
-
-- echo "$as_me:$LINENO: checking whether we are using the GNU C Library 2.1 or newer" >&5
--echo $ECHO_N "checking whether we are using the GNU C Library 2.1 or newer... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking whether we are using the GNU C Library 2.1 or newer" >&5
-+echo $ECHO_N "checking whether we are using the GNU C Library 2.1 or newer... $ECHO_C" >&6; }
- if test "${ac_cv_gnu_library_2_1+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -7208,8 +8457,8 @@
-
-
- fi
--echo "$as_me:$LINENO: result: $ac_cv_gnu_library_2_1" >&5
--echo "${ECHO_T}$ac_cv_gnu_library_2_1" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_gnu_library_2_1" >&5
-+echo "${ECHO_T}$ac_cv_gnu_library_2_1" >&6; }
-
- GLIBC21="$ac_cv_gnu_library_2_1"
-
-@@ -7229,20 +8478,20 @@
- stdlib.h string.h unistd.h sys/param.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-- echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -7252,33 +8501,38 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_header_compiler=no
-+ ac_header_compiler=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+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 $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -7286,23 +8540,22 @@
- /* end confdefs.h. */
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+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
-- 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
-@@ -7310,52 +8563,46 @@
-
- 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
-+{ 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 in
-- yes:no )
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+ yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
- echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------ ##
--## Report this to bug-autoconf at gnu.org. ##
--## ------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+ ac_header_preproc=yes
- ;;
-- no:yes )
-+ no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
- echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------ ##
--## Report this to bug-autoconf at gnu.org. ##
--## ------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- eval "$as_ac_Header=$ac_header_preproc"
-+ eval "$as_ac_Header=\$ac_header_preproc"
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-
- fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -7393,78 +8640,88 @@
- strdup strtoul tsearch __argz_count __argz_stringify __argz_next
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
-+#define $ac_func innocuous_$ac_func
-+
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+
- #ifdef __STDC__
- # include <limits.h>
- #else
- # include <assert.h>
- #endif
--/* Override any gcc2 internal prototype to avoid an error. */
-+
-+#undef $ac_func
-+
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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
- sed 's/^/| /' conftest.$ac_ext >&5
-
--eval "$as_ac_var=no"
-+ eval "$as_ac_var=no"
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -7477,19 +8734,19 @@
-
-
-
--# Check whether --with-libiconv-prefix or --without-libiconv-prefix was given.
-+# Check whether --with-libiconv-prefix was given.
- if test "${with_libiconv_prefix+set}" = set; then
-- withval="$with_libiconv_prefix"
--
-+ withval=$with_libiconv_prefix;
- for dir in `echo "$withval" | tr : ' '`; do
- if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi
- if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi
- done
-
--fi;
-+fi
-+
-
-- echo "$as_me:$LINENO: checking for iconv" >&5
--echo $ECHO_N "checking for iconv... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for iconv" >&5
-+echo $ECHO_N "checking for iconv... $ECHO_C" >&6; }
- if test "${am_cv_func_iconv+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -7497,7 +8754,6 @@
- am_cv_func_iconv="no, consider installing GNU libiconv"
- am_cv_lib_iconv=no
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -7516,29 +8772,37 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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_func_iconv=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext conftest.$ac_ext
- if test "$am_cv_func_iconv" != yes; then
- am_save_LIBS="$LIBS"
- LIBS="$LIBS -liconv"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -7557,45 +8821,53 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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_lib_iconv=yes
- am_cv_func_iconv=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS="$am_save_LIBS"
- fi
-
- fi
--echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5
--echo "${ECHO_T}$am_cv_func_iconv" >&6
-+{ echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5
-+echo "${ECHO_T}$am_cv_func_iconv" >&6; }
- if test "$am_cv_func_iconv" = yes; then
-
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_ICONV 1
- _ACEOF
-
-- echo "$as_me:$LINENO: checking for iconv declaration" >&5
--echo $ECHO_N "checking for iconv declaration... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for iconv declaration" >&5
-+echo $ECHO_N "checking for iconv declaration... $ECHO_C" >&6; }
- if test "${am_cv_proto_iconv+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -7623,33 +8895,39 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- am_cv_proto_iconv_arg1=""
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--am_cv_proto_iconv_arg1="const"
-+ am_cv_proto_iconv_arg1="const"
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"
- fi
-
- am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
-- echo "$as_me:$LINENO: result: ${ac_t:-
-+ { echo "$as_me:$LINENO: result: ${ac_t:-
- }$am_cv_proto_iconv" >&5
- echo "${ECHO_T}${ac_t:-
-- }$am_cv_proto_iconv" >&6
-+ }$am_cv_proto_iconv" >&6; }
-
- cat >>confdefs.h <<_ACEOF
- #define ICONV_CONST $am_cv_proto_iconv_arg1
-@@ -7663,13 +8941,12 @@
-
-
-
-- echo "$as_me:$LINENO: checking for nl_langinfo and CODESET" >&5
--echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for nl_langinfo and CODESET" >&5
-+echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6; }
- if test "${am_cv_langinfo_codeset+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -7685,29 +8962,37 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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_langinfo_codeset=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--am_cv_langinfo_codeset=no
-+ am_cv_langinfo_codeset=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+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_langinfo_codeset" >&5
--echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
-+{ echo "$as_me:$LINENO: result: $am_cv_langinfo_codeset" >&5
-+echo "${ECHO_T}$am_cv_langinfo_codeset" >&6; }
- if test $am_cv_langinfo_codeset = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -7717,13 +9002,12 @@
- fi
-
- if test $ac_cv_header_locale_h = yes; then
-- echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
--echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
-+echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6; }
- if test "${am_cv_val_LC_MESSAGES+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -7739,28 +9023,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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
- sed 's/^/| /' conftest.$ac_ext >&5
-
--am_cv_val_LC_MESSAGES=no
-+ am_cv_val_LC_MESSAGES=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+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
--echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6
-+{ echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
-+echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6; }
- if test $am_cv_val_LC_MESSAGES = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -7769,17 +9061,17 @@
-
- fi
- fi
-- echo "$as_me:$LINENO: checking whether NLS is requested" >&5
--echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6
-- # Check whether --enable-nls or --disable-nls was given.
-+ { echo "$as_me:$LINENO: checking whether NLS is requested" >&5
-+echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6; }
-+ # Check whether --enable-nls was given.
- if test "${enable_nls+set}" = set; then
-- enableval="$enable_nls"
-- USE_NLS=$enableval
-+ enableval=$enable_nls; USE_NLS=$enableval
- else
- USE_NLS=yes
--fi;
-- echo "$as_me:$LINENO: result: $USE_NLS" >&5
--echo "${ECHO_T}$USE_NLS" >&6
-+fi
-+
-+ { echo "$as_me:$LINENO: result: $USE_NLS" >&5
-+echo "${ECHO_T}$USE_NLS" >&6; }
-
-
- BUILD_INCLUDED_LIBINTL=no
-@@ -7792,18 +9084,18 @@
- #define ENABLE_NLS 1
- _ACEOF
-
-- echo "$as_me:$LINENO: checking whether included gettext is requested" >&5
--echo $ECHO_N "checking whether included gettext is requested... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking whether included gettext is requested" >&5
-+echo $ECHO_N "checking whether included gettext is requested... $ECHO_C" >&6; }
-
--# Check whether --with-included-gettext or --without-included-gettext was given.
-+# Check whether --with-included-gettext was given.
- if test "${with_included_gettext+set}" = set; then
-- withval="$with_included_gettext"
-- nls_cv_force_use_gnu_gettext=$withval
-+ withval=$with_included_gettext; nls_cv_force_use_gnu_gettext=$withval
- else
- nls_cv_force_use_gnu_gettext=no
--fi;
-- echo "$as_me:$LINENO: result: $nls_cv_force_use_gnu_gettext" >&5
--echo "${ECHO_T}$nls_cv_force_use_gnu_gettext" >&6
-+fi
-+
-+ { echo "$as_me:$LINENO: result: $nls_cv_force_use_gnu_gettext" >&5
-+echo "${ECHO_T}$nls_cv_force_use_gnu_gettext" >&6; }
-
- nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
- if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
-@@ -7813,19 +9105,18 @@
-
-
- if test "${ac_cv_header_libintl_h+set}" = set; then
-- echo "$as_me:$LINENO: checking for libintl.h" >&5
--echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for libintl.h" >&5
-+echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_libintl_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
--echo "${ECHO_T}$ac_cv_header_libintl_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
-+echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking libintl.h usability" >&5
--echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking libintl.h usability" >&5
-+echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -7835,33 +9126,38 @@
- #include <libintl.h>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_header_compiler=no
-+ ac_header_compiler=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+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 libintl.h presence" >&5
--echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking libintl.h presence" >&5
-+echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -7869,23 +9165,22 @@
- /* end confdefs.h. */
- #include <libintl.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+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
-- 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
-@@ -7893,62 +9188,54 @@
-
- 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
-+{ 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 in
-- yes:no )
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+ yes:no: )
- { echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5
- echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-- { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------ ##
--## Report this to bug-autoconf at gnu.org. ##
--## ------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+ { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;}
-+ ac_header_preproc=yes
- ;;
-- no:yes )
-+ no:yes:* )
- { echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5
- echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;}
-- { echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5
- echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------ ##
--## Report this to bug-autoconf at gnu.org. ##
--## ------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+ { echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;}
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for libintl.h" >&5
--echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for libintl.h" >&5
-+echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_libintl_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_cv_header_libintl_h=$ac_header_preproc
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
--echo "${ECHO_T}$ac_cv_header_libintl_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
-+echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; }
-
- fi
- if test $ac_cv_header_libintl_h = yes; then
-- echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5
--echo $ECHO_N "checking for GNU gettext in libc... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5
-+echo $ECHO_N "checking for GNU gettext in libc... $ECHO_C" >&6; }
- if test "${gt_cv_func_gnugettext2_libc+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -7966,39 +9253,46 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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_gnugettext2_libc=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--gt_cv_func_gnugettext2_libc=no
-+ gt_cv_func_gnugettext2_libc=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext2_libc" >&5
--echo "${ECHO_T}$gt_cv_func_gnugettext2_libc" >&6
-+{ echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext2_libc" >&5
-+echo "${ECHO_T}$gt_cv_func_gnugettext2_libc" >&6; }
-
- if test "$gt_cv_func_gnugettext2_libc" != "yes"; then
-- echo "$as_me:$LINENO: checking for GNU gettext in libintl" >&5
--echo $ECHO_N "checking for GNU gettext in libintl... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for GNU gettext in libintl" >&5
-+echo $ECHO_N "checking for GNU gettext in libintl... $ECHO_C" >&6; }
- if test "${gt_cv_func_gnugettext2_libintl+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- gt_save_LIBS="$LIBS"
- LIBS="$LIBS -lintl $LIBICONV"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -8016,29 +9310,37 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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_gnugettext2_libintl=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--gt_cv_func_gnugettext2_libintl=no
-+ gt_cv_func_gnugettext2_libintl=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS="$gt_save_LIBS"
- fi
--echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext2_libintl" >&5
--echo "${ECHO_T}$gt_cv_func_gnugettext2_libintl" >&6
-+{ echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext2_libintl" >&5
-+echo "${ECHO_T}$gt_cv_func_gnugettext2_libintl" >&6; }
- fi
-
- if test "$gt_cv_func_gnugettext2_libc" = "yes" \
-@@ -8060,78 +9362,88 @@
- for ac_func in dcgettext
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
-+#define $ac_func innocuous_$ac_func
-+
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+
- #ifdef __STDC__
- # include <limits.h>
- #else
- # include <assert.h>
- #endif
--/* Override any gcc2 internal prototype to avoid an error. */
-+
-+#undef $ac_func
-+
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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
- sed 's/^/| /' conftest.$ac_ext >&5
-
--eval "$as_ac_var=no"
-+ eval "$as_ac_var=no"
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -8144,8 +9456,8 @@
-
- # Extract the first word of "msgfmt", so it can be a program name with args.
- set dummy msgfmt; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_MSGFMT+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -8171,17 +9483,17 @@
- fi
- MSGFMT="$ac_cv_path_MSGFMT"
- if test "$MSGFMT" != ":"; then
-- echo "$as_me:$LINENO: result: $MSGFMT" >&5
--echo "${ECHO_T}$MSGFMT" >&6
-+ { echo "$as_me:$LINENO: result: $MSGFMT" >&5
-+echo "${ECHO_T}$MSGFMT" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
- # Extract the first word of "gmsgfmt", so it can be a program name with args.
- set dummy gmsgfmt; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_GMSGFMT+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -8196,33 +9508,34 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $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
- fi
- done
- done
-+IFS=$as_save_IFS
-
- test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
- ;;
- esac
- fi
- GMSGFMT=$ac_cv_path_GMSGFMT
--
- if test -n "$GMSGFMT"; then
-- echo "$as_me:$LINENO: result: $GMSGFMT" >&5
--echo "${ECHO_T}$GMSGFMT" >&6
-+ { echo "$as_me:$LINENO: result: $GMSGFMT" >&5
-+echo "${ECHO_T}$GMSGFMT" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-+
- # Extract the first word of "xgettext", so it can be a program name with args.
- set dummy xgettext; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_XGETTEXT+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -8248,11 +9561,11 @@
- fi
- XGETTEXT="$ac_cv_path_XGETTEXT"
- if test "$XGETTEXT" != ":"; then
-- echo "$as_me:$LINENO: result: $XGETTEXT" >&5
--echo "${ECHO_T}$XGETTEXT" >&6
-+ { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
-+echo "${ECHO_T}$XGETTEXT" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-@@ -8272,8 +9585,8 @@
- INTLOBJS="\$(GETTOBJS)"
- # Extract the first word of "msgfmt", so it can be a program name with args.
- set dummy msgfmt; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_MSGFMT+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -8299,17 +9612,17 @@
- fi
- MSGFMT="$ac_cv_path_MSGFMT"
- if test "$MSGFMT" != ":"; then
-- echo "$as_me:$LINENO: result: $MSGFMT" >&5
--echo "${ECHO_T}$MSGFMT" >&6
-+ { echo "$as_me:$LINENO: result: $MSGFMT" >&5
-+echo "${ECHO_T}$MSGFMT" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
- # Extract the first word of "gmsgfmt", so it can be a program name with args.
- set dummy gmsgfmt; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_GMSGFMT+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -8324,32 +9637,33 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $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
- fi
- done
- done
-+IFS=$as_save_IFS
-
- test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
- ;;
- esac
- fi
- GMSGFMT=$ac_cv_path_GMSGFMT
--
- if test -n "$GMSGFMT"; then
-- echo "$as_me:$LINENO: result: $GMSGFMT" >&5
--echo "${ECHO_T}$GMSGFMT" >&6
-+ { echo "$as_me:$LINENO: result: $GMSGFMT" >&5
-+echo "${ECHO_T}$GMSGFMT" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- # Extract the first word of "xgettext", so it can be a program name with args.
- set dummy xgettext; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_XGETTEXT+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -8375,11 +9689,11 @@
- fi
- XGETTEXT="$ac_cv_path_XGETTEXT"
- if test "$XGETTEXT" != ":"; then
-- echo "$as_me:$LINENO: result: $XGETTEXT" >&5
--echo "${ECHO_T}$XGETTEXT" >&6
-+ { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
-+echo "${ECHO_T}$XGETTEXT" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-@@ -8394,8 +9708,8 @@
- if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then
- : ;
- else
-- echo "$as_me:$LINENO: result: found msgfmt program is not GNU msgfmt; ignore it" >&5
--echo "${ECHO_T}found msgfmt program is not GNU msgfmt; ignore it" >&6
-+ { echo "$as_me:$LINENO: result: found msgfmt program is not GNU msgfmt; ignore it" >&5
-+echo "${ECHO_T}found msgfmt program is not GNU msgfmt; ignore it" >&6; }
- GMSGFMT=":"
- fi
- fi
-@@ -8404,15 +9718,15 @@
- if $XGETTEXT --omit-header /dev/null >/dev/null 2>&1; then
- : ;
- else
-- echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
--echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6
-+ { echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
-+echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6; }
- XGETTEXT=":"
- fi
- fi
-
- POSUB=po
- fi
-- ac_config_commands="$ac_config_commands default-1"
-+ ac_config_commands="$ac_config_commands default-1"
-
-
-
-@@ -8424,8 +9738,8 @@
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_INTLBISON+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -8438,33 +9752,35 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $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_INTLBISON="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- fi
- fi
- INTLBISON=$ac_cv_prog_INTLBISON
- if test -n "$INTLBISON"; then
-- echo "$as_me:$LINENO: result: $INTLBISON" >&5
--echo "${ECHO_T}$INTLBISON" >&6
-+ { echo "$as_me:$LINENO: result: $INTLBISON" >&5
-+echo "${ECHO_T}$INTLBISON" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- test -n "$INTLBISON" && break
- done
-
- if test -z "$INTLBISON"; then
- ac_verc_fail=yes
- else
-- echo "$as_me:$LINENO: checking version of bison" >&5
--echo $ECHO_N "checking version of bison... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking version of bison" >&5
-+echo $ECHO_N "checking version of bison... $ECHO_C" >&6; }
- ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
- case $ac_prog_version in
- '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
-@@ -8472,8 +9788,8 @@
- ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
- *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
- esac
-- echo "$as_me:$LINENO: result: $ac_prog_version" >&5
--echo "${ECHO_T}$ac_prog_version" >&6
-+ { echo "$as_me:$LINENO: result: $ac_prog_version" >&5
-+echo "${ECHO_T}$ac_prog_version" >&6; }
- fi
- if test $ac_verc_fail = yes; then
- INTLBISON=:
-@@ -8511,8 +9827,8 @@
- if test "x$ALL_LINGUAS" = "x"; then
- LINGUAS=
- else
-- echo "$as_me:$LINENO: checking for catalogs to be installed" >&5
--echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for catalogs to be installed" >&5
-+echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6; }
- NEW_LINGUAS=
- for presentlang in $ALL_LINGUAS; do
- useit=no
-@@ -8531,8 +9847,8 @@
- fi
- done
- LINGUAS=$NEW_LINGUAS
-- echo "$as_me:$LINENO: result: $LINGUAS" >&5
--echo "${ECHO_T}$LINGUAS" >&6
-+ { echo "$as_me:$LINENO: result: $LINGUAS" >&5
-+echo "${ECHO_T}$LINGUAS" >&6; }
- fi
-
- if test -n "$LINGUAS"; then
-@@ -8558,75 +9874,81 @@
-
- if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
- have_working_ngettext=0
-- echo "$as_me:$LINENO: checking for ngettext in -lc" >&5
--echo $ECHO_N "checking for ngettext in -lc... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for ngettext in -lc" >&5
-+echo $ECHO_N "checking for ngettext in -lc... $ECHO_C" >&6; }
- if test "${ac_cv_lib_c_ngettext+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lc $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char ngettext ();
- int
- main ()
- {
--ngettext ();
-+return ngettext ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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_ngettext=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_c_ngettext=no
-+ ac_cv_lib_c_ngettext=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+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
--echo "$as_me:$LINENO: result: $ac_cv_lib_c_ngettext" >&5
--echo "${ECHO_T}$ac_cv_lib_c_ngettext" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_c_ngettext" >&5
-+echo "${ECHO_T}$ac_cv_lib_c_ngettext" >&6; }
- if test $ac_cv_lib_c_ngettext = yes; then
-- echo "$as_me:$LINENO: checking whether libc's ngettext works at runtime" >&5
--echo $ECHO_N "checking whether libc's ngettext works at runtime... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking whether libc's ngettext works at runtime" >&5
-+echo $ECHO_N "checking whether libc's ngettext works at runtime... $ECHO_C" >&6; }
-
- templibs="$LIBS"
- LIBS=" $LIBS"
- templang="$LANG"
- LANG="de_DE"
- if test "$cross_compiling" = yes; then
-- echo "$as_me:$LINENO: result: unknown: cross-compiling" >&5
--echo "${ECHO_T}unknown: cross-compiling" >&6
-+ { echo "$as_me:$LINENO: result: unknown: cross-compiling" >&5
-+echo "${ECHO_T}unknown: cross-compiling" >&6; }
- have_working_ngettext=1
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -8657,18 +9979,27 @@
-
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+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>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (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
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- have_working_ngettext=1
- else
- echo "$as_me: program exited with status $ac_status" >&5
-@@ -8676,12 +10007,14 @@
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ( exit $ac_status )
--echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-
- fi
--rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+
-+
- LIBS="$templibs"
- LANG="$templang"
-
-@@ -8689,75 +10022,81 @@
-
-
- if test "$have_working_ngettext" = "0"; then
-- echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
--echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
-+echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6; }
- if test "${ac_cv_lib_intl_ngettext+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lintl $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char ngettext ();
- int
- main ()
- {
--ngettext ();
-+return ngettext ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_intl_ngettext=no
-+ ac_cv_lib_intl_ngettext=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+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
--echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
--echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
-+echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; }
- if test $ac_cv_lib_intl_ngettext = yes; then
-- echo "$as_me:$LINENO: checking whether libintl's ngettext works at runtime" >&5
--echo $ECHO_N "checking whether libintl's ngettext works at runtime... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking whether libintl's ngettext works at runtime" >&5
-+echo $ECHO_N "checking whether libintl's ngettext works at runtime... $ECHO_C" >&6; }
-
- templibs="$LIBS"
- LIBS=""-lintl" $LIBS"
- templang="$LANG"
- LANG="de_DE"
- if test "$cross_compiling" = yes; then
-- echo "$as_me:$LINENO: result: unknown: cross-compiling" >&5
--echo "${ECHO_T}unknown: cross-compiling" >&6
-+ { echo "$as_me:$LINENO: result: unknown: cross-compiling" >&5
-+echo "${ECHO_T}unknown: cross-compiling" >&6; }
- have_working_ngettext=1
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -8788,18 +10127,27 @@
-
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+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>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (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
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- have_working_ngettext=1
- else
- echo "$as_me: program exited with status $ac_status" >&5
-@@ -8807,12 +10155,14 @@
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ( exit $ac_status )
--echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-
- fi
--rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+
-+
- LIBS="$templibs"
- LANG="$templang"
-
-@@ -8830,15 +10180,14 @@
- fi
-
- if test "$IS_BETA_VERSION" = "1" || test "$IS_DEVEL_VERSION" = "1"; then
-- echo "$as_me:$LINENO: checking for GNU xgettext version >= 0.10.36" >&5
--echo $ECHO_N "checking for GNU xgettext version >= 0.10.36... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for GNU xgettext version >= 0.10.36" >&5
-+echo $ECHO_N "checking for GNU xgettext version >= 0.10.36... $ECHO_C" >&6; }
- xgettext_version=`$XGETTEXT --version 2>&1 | grep GNU | sed 's/"/ /g'`
- if test "$cross_compiling" = yes; then
- echo error
-
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -8868,18 +10217,27 @@
-
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+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>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (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
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-
- else
- echo "$as_me: program exited with status $ac_status" >&5
-@@ -8888,8 +10246,8 @@
-
- ( exit $ac_status )
-
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- { echo "$as_me:$LINENO: WARNING: You may have problems with creating pox files. \
- Please update your gettext package." >&5
- echo "$as_me: WARNING: You may have problems with creating pox files. \
-@@ -8897,18 +10255,19 @@
-
-
- fi
--rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-
-- echo "$as_me:$LINENO: checking for GNU msgfmt version >= 0.10.35" >&5
--echo $ECHO_N "checking for GNU msgfmt version >= 0.10.35... $ECHO_C" >&6
-+
-+
-+ { echo "$as_me:$LINENO: checking for GNU msgfmt version >= 0.10.35" >&5
-+echo $ECHO_N "checking for GNU msgfmt version >= 0.10.35... $ECHO_C" >&6; }
- msgfmt_version=`$MSGFMT --version 2>&1 | grep GNU | sed 's/"/ /g'`
- if test "$cross_compiling" = yes; then
- echo error
-
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -8939,18 +10298,27 @@
-
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+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>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (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
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-
- else
- echo "$as_me: program exited with status $ac_status" >&5
-@@ -8959,8 +10327,8 @@
-
- ( exit $ac_status )
-
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- { { echo "$as_me:$LINENO: error: You are unable to create *.gmo files.
- This is development version which doesn't include them. Please update your
- gettext package. We recommend you versions >= 0.10.38. Or use
-@@ -8973,8 +10341,10 @@
-
-
- fi
--rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+
-+
- fi
- fi
-
-@@ -8989,10 +10359,9 @@
- fi
-
-
--# Check whether --enable-debug or --disable-debug was given.
-+# Check whether --enable-debug was given.
- if test "${enable_debug+set}" = set; then
-- enableval="$enable_debug"
-- case "${enableval}" in
-+ enableval=$enable_debug; case "${enableval}" in
- yes) enable_debug=yes ;;
- some) enable_debug=some ;;
- no) enable_debug=no ;;
-@@ -9002,7 +10371,8 @@
- esac
- else
- enable_debug=some
--fi;
-+fi
-+
-
- if test "x$enable_debug" = "xyes"; then
-
-@@ -9023,13 +10393,12 @@
- fi
-
-
-- echo "$as_me:$LINENO: checking for C99 variadic macros" >&5
--echo $ECHO_N "checking for C99 variadic macros... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for C99 variadic macros" >&5
-+echo $ECHO_N "checking for C99 variadic macros... $ECHO_C" >&6; }
- if test "${ac_cv_c99_variadic_macros+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -9049,28 +10418,34 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_c99_variadic_macros=no
-+ ac_cv_c99_variadic_macros=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_c99_variadic_macros" >&5
--echo "${ECHO_T}$ac_cv_c99_variadic_macros" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_c99_variadic_macros" >&5
-+echo "${ECHO_T}$ac_cv_c99_variadic_macros" >&6; }
- if test "x${ac_cv_c99_variadic_macros}" != "xyes"; then
- { { echo "$as_me:$LINENO: error: A compiler supporting C99 variadic macros is required" >&5
- echo "$as_me: error: A compiler supporting C99 variadic macros is required" >&2;}
-@@ -9078,13 +10453,12 @@
- fi
-
-
-- echo "$as_me:$LINENO: checking for C99 variable arrays" >&5
--echo $ECHO_N "checking for C99 variable arrays... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for C99 variable arrays" >&5
-+echo $ECHO_N "checking for C99 variable arrays... $ECHO_C" >&6; }
- if test "${ac_cv_c99_variable_arrays+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -9102,28 +10476,34 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_c99_variable_arrays=no
-+ ac_cv_c99_variable_arrays=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_c99_variable_arrays" >&5
--echo "${ECHO_T}$ac_cv_c99_variable_arrays" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_c99_variable_arrays" >&5
-+echo "${ECHO_T}$ac_cv_c99_variable_arrays" >&6; }
- if test "x${ac_cv_c99_variable_arrays}" != "xyes"; then
- { { echo "$as_me:$LINENO: error: A compiler supporting C99 variable arrays is required" >&5
- echo "$as_me: error: A compiler supporting C99 variable arrays is required" >&2;}
-@@ -9131,13 +10511,12 @@
- fi
-
-
-- echo "$as_me:$LINENO: checking for C99 initializers" >&5
--echo $ECHO_N "checking for C99 initializers... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for C99 initializers" >&5
-+echo $ECHO_N "checking for C99 initializers... $ECHO_C" >&6; }
- if test "${ac_cv_c99_initializers+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -9162,28 +10541,34 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_c99_initializers=no
-+ ac_cv_c99_initializers=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_c99_initializers" >&5
--echo "${ECHO_T}$ac_cv_c99_initializers" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_c99_initializers" >&5
-+echo "${ECHO_T}$ac_cv_c99_initializers" >&6; }
- if test "${ac_cv_c99_initializers}" != "yes"; then
- { { echo "$as_me:$LINENO: error: A compiler supporting C99 initializers is required" >&5
- echo "$as_me: error: A compiler supporting C99 initializers is required" >&2;}
-@@ -9195,20 +10580,20 @@
- for ac_header in stdint.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-- echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -9218,33 +10603,38 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_header_compiler=no
-+ ac_header_compiler=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+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 $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -9252,23 +10642,22 @@
- /* end confdefs.h. */
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+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
-- 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
-@@ -9276,52 +10665,46 @@
-
- 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
-+{ 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 in
-- yes:no )
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+ yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
- echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------ ##
--## Report this to bug-autoconf at gnu.org. ##
--## ------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+ ac_header_preproc=yes
- ;;
-- no:yes )
-+ no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
- echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------ ##
--## Report this to bug-autoconf at gnu.org. ##
--## ------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- eval "$as_ac_Header=$ac_header_preproc"
-+ eval "$as_ac_Header=\$ac_header_preproc"
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-
- fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -9333,15 +10716,15 @@
-
- done
-
-- echo "$as_me:$LINENO: checking for C99 stdint.h" >&5
--echo $ECHO_N "checking for C99 stdint.h... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for C99 stdint.h" >&5
-+echo $ECHO_N "checking for C99 stdint.h... $ECHO_C" >&6; }
- if test "${ac_cv_c99_stdint_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_cv_c99_stdint_h=$ac_cv_header_stdint_h
- fi
--echo "$as_me:$LINENO: result: $ac_cv_c99_stdint_h" >&5
--echo "${ECHO_T}$ac_cv_c99_stdint_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_c99_stdint_h" >&5
-+echo "${ECHO_T}$ac_cv_c99_stdint_h" >&6; }
- if test "${ac_cv_c99_stdint_h}" != "yes"; then
- { { echo "$as_me:$LINENO: error: A compiler supporting C99's stdint.h is required" >&5
- echo "$as_me: error: A compiler supporting C99's stdint.h is required" >&2;}
-@@ -9385,8 +10768,8 @@
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
- set dummy ${ac_tool_prefix}windres; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_WINDRES+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -9399,32 +10782,34 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $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_WINDRES="${ac_tool_prefix}windres"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- fi
- fi
- WINDRES=$ac_cv_prog_WINDRES
- if test -n "$WINDRES"; then
-- echo "$as_me:$LINENO: result: $WINDRES" >&5
--echo "${ECHO_T}$WINDRES" >&6
-+ { echo "$as_me:$LINENO: result: $WINDRES" >&5
-+echo "${ECHO_T}$WINDRES" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- fi
- if test -z "$ac_cv_prog_WINDRES"; then
- ac_ct_WINDRES=$WINDRES
- # Extract the first word of "windres", so it can be a program name with args.
- set dummy windres; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_WINDRES+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -9437,26 +10822,41 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $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_WINDRES="windres"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- fi
- fi
- ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES
- if test -n "$ac_ct_WINDRES"; then
-- echo "$as_me:$LINENO: result: $ac_ct_WINDRES" >&5
--echo "${ECHO_T}$ac_ct_WINDRES" >&6
-+ { echo "$as_me:$LINENO: result: $ac_ct_WINDRES" >&5
-+echo "${ECHO_T}$ac_ct_WINDRES" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-- WINDRES=$ac_ct_WINDRES
-+ if test "x$ac_ct_WINDRES" = x; then
-+ WINDRES=""
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ WINDRES=$ac_ct_WINDRES
-+ fi
- else
- WINDRES="$ac_cv_prog_WINDRES"
- fi
-@@ -9525,60 +10925,67 @@
- fi
-
-
--echo "$as_me:$LINENO: checking for gzgets in -lz" >&5
--echo $ECHO_N "checking for gzgets in -lz... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for gzgets in -lz" >&5
-+echo $ECHO_N "checking for gzgets in -lz... $ECHO_C" >&6; }
- if test "${ac_cv_lib_z_gzgets+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lz $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char gzgets ();
- int
- main ()
- {
--gzgets ();
-+return gzgets ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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_z_gzgets=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_z_gzgets=no
-+ ac_cv_lib_z_gzgets=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+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
--echo "$as_me:$LINENO: result: $ac_cv_lib_z_gzgets" >&5
--echo "${ECHO_T}$ac_cv_lib_z_gzgets" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_z_gzgets" >&5
-+echo "${ECHO_T}$ac_cv_lib_z_gzgets" >&6; }
- if test $ac_cv_lib_z_gzgets = yes; then
- cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBZ 1
-@@ -9593,19 +11000,18 @@
- fi
-
- if test "${ac_cv_header_zlib_h+set}" = set; then
-- echo "$as_me:$LINENO: checking for zlib.h" >&5
--echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for zlib.h" >&5
-+echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_zlib_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
--echo "${ECHO_T}$ac_cv_header_zlib_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
-+echo "${ECHO_T}$ac_cv_header_zlib_h" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking zlib.h usability" >&5
--echo $ECHO_N "checking zlib.h usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking zlib.h usability" >&5
-+echo $ECHO_N "checking zlib.h usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -9615,33 +11021,38 @@
- #include <zlib.h>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_header_compiler=no
-+ ac_header_compiler=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+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 zlib.h presence" >&5
--echo $ECHO_N "checking zlib.h presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking zlib.h presence" >&5
-+echo $ECHO_N "checking zlib.h presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -9649,23 +11060,22 @@
- /* end confdefs.h. */
- #include <zlib.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+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
-- 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
-@@ -9673,52 +11083,45 @@
-
- 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
-+{ 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 in
-- yes:no )
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+ yes:no: )
- { echo "$as_me:$LINENO: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&5
- echo "$as_me: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-- { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------ ##
--## Report this to bug-autoconf at gnu.org. ##
--## ------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+ { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: zlib.h: proceeding with the compiler's result" >&2;}
-+ ac_header_preproc=yes
- ;;
-- no:yes )
-+ no:yes:* )
- { echo "$as_me:$LINENO: WARNING: zlib.h: present but cannot be compiled" >&5
- echo "$as_me: WARNING: zlib.h: present but cannot be compiled" >&2;}
-- { echo "$as_me:$LINENO: WARNING: zlib.h: check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: zlib.h: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: zlib.h: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: zlib.h: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: zlib.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: zlib.h: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: zlib.h: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: zlib.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the preprocessor's result" >&5
- echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------ ##
--## Report this to bug-autoconf at gnu.org. ##
--## ------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+ { echo "$as_me:$LINENO: WARNING: zlib.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: zlib.h: in the future, the compiler will take precedence" >&2;}
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for zlib.h" >&5
--echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for zlib.h" >&5
-+echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_zlib_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_cv_header_zlib_h=$ac_header_preproc
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
--echo "${ECHO_T}$ac_cv_header_zlib_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
-+echo "${ECHO_T}$ac_cv_header_zlib_h" >&6; }
-
- fi
- if test $ac_cv_header_zlib_h = yes; then
-@@ -9734,8 +11137,8 @@
-
- # Extract the first word of "gzip", so it can be a program name with args.
- set dummy gzip; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_GZIP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -9750,28 +11153,29 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $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_GZIP="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- test -z "$ac_cv_path_GZIP" && ac_cv_path_GZIP=""no""
- ;;
- esac
- fi
- GZIP=$ac_cv_path_GZIP
--
- if test -n "$GZIP"; then
-- echo "$as_me:$LINENO: result: $GZIP" >&5
--echo "${ECHO_T}$GZIP" >&6
-+ { echo "$as_me:$LINENO: result: $GZIP" >&5
-+echo "${ECHO_T}$GZIP" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- if test "$GZIP" = "no"; then
- { { echo "$as_me:$LINENO: error: You need the gzip program for compilation." >&5
- echo "$as_me: error: You need the gzip program for compilation." >&2;}
-@@ -9813,13 +11217,13 @@
-
-
- if test "$client" = "gtk-2.0" || test "$client" = yes ; then
-- # Check whether --enable-gtktest or --disable-gtktest was given.
-+ # Check whether --enable-gtktest was given.
- if test "${enable_gtktest+set}" = set; then
-- enableval="$enable_gtktest"
--
-+ enableval=$enable_gtktest;
- else
- enable_gtktest=yes
--fi;
-+fi
-+
-
- pkg_config_args=gtk+-2.0
- for module in .
-@@ -9835,8 +11239,8 @@
-
- # Extract the first word of "pkg-config", so it can be a program name with args.
- set dummy pkg-config; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -9851,29 +11255,30 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $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
- fi
- done
- done
-+IFS=$as_save_IFS
-
- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
- ;;
- esac
- fi
- PKG_CONFIG=$ac_cv_path_PKG_CONFIG
--
- if test -n "$PKG_CONFIG"; then
-- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
--echo "${ECHO_T}$PKG_CONFIG" >&6
-+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-+echo "${ECHO_T}$PKG_CONFIG" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-+
- if test x$PKG_CONFIG != xno ; then
- if pkg-config --atleast-pkgconfig-version 0.7 ; then
- :
-@@ -9887,8 +11292,8 @@
- fi
-
- min_gtk_version=2.4.0
-- echo "$as_me:$LINENO: checking for GTK+ - version >= $min_gtk_version" >&5
--echo $ECHO_N "checking for GTK+ - version >= $min_gtk_version... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for GTK+ - version >= $min_gtk_version" >&5
-+echo $ECHO_N "checking for GTK+ - version >= $min_gtk_version... $ECHO_C" >&6; }
-
- if test x$PKG_CONFIG != xno ; then
- ## don't try to run the test against uninstalled libtool libs
-@@ -9923,7 +11328,6 @@
- echo $ac_n "cross compiling; assumed OK... $ac_c"
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -10003,13 +11407,22 @@
-
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+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>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (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
-@@ -10022,15 +11435,17 @@
- ( exit $ac_status )
- no_gtk=yes
- fi
--rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+
-+
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- fi
- if test "x$no_gtk" = x ; then
-- echo "$as_me:$LINENO: result: yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&5
--echo "${ECHO_T}yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&6
-+ { echo "$as_me:$LINENO: result: yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&5
-+echo "${ECHO_T}yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&6; }
-
- client="gtk-2.0"
- CLIENT_CFLAGS="$GTK_CFLAGS"
-@@ -10041,8 +11456,8 @@
- fi
-
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- if test "$PKG_CONFIG" = "no" ; then
- echo "*** A new enough version of pkg-config was not found."
- echo "*** See http://pkgconfig.sourceforge.net"
-@@ -10056,7 +11471,6 @@
- CFLAGS="$CFLAGS $GTK_CFLAGS"
- LIBS="$LIBS $GTK_LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -10075,17 +11489,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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 "*** The test program compiled, but did not run. This usually means"
- echo "*** that the run-time linker is not finding GTK+ or finding the wrong"
- echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your"
-@@ -10099,10 +11519,12 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- echo "*** The test program failed to compile or link. See the file config.log for the"
-+ echo "*** The test program failed to compile or link. See the file config.log for the"
- echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext conftest.$ac_ext
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
-@@ -10132,28 +11554,28 @@
- echo "$as_me: WARNING: Not checking for SDL; use --enable-client=sdl to enable" >&2;}
- elif test "$client" = sdl ; then
-
--# Check whether --with-sdl-prefix or --without-sdl-prefix was given.
-+# Check whether --with-sdl-prefix was given.
- if test "${with_sdl_prefix+set}" = set; then
-- withval="$with_sdl_prefix"
-- sdl_prefix="$withval"
-+ withval=$with_sdl_prefix; sdl_prefix="$withval"
- else
- sdl_prefix=""
--fi;
-+fi
-+
-
--# Check whether --with-sdl-exec-prefix or --without-sdl-exec-prefix was given.
-+# Check whether --with-sdl-exec-prefix was given.
- if test "${with_sdl_exec_prefix+set}" = set; then
-- withval="$with_sdl_exec_prefix"
-- sdl_exec_prefix="$withval"
-+ withval=$with_sdl_exec_prefix; sdl_exec_prefix="$withval"
- else
- sdl_exec_prefix=""
--fi;
--# Check whether --enable-sdltest or --disable-sdltest was given.
--if test "${enable_sdltest+set}" = set; then
-- enableval="$enable_sdltest"
-+fi
-
-+# Check whether --enable-sdltest was given.
-+if test "${enable_sdltest+set}" = set; then
-+ enableval=$enable_sdltest;
- else
- enable_sdltest=yes
--fi;
-+fi
-+
-
- if test x$sdl_exec_prefix != x ; then
- sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
-@@ -10173,8 +11595,8 @@
- fi
- # Extract the first word of "sdl-config", so it can be a program name with args.
- set dummy sdl-config; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_SDL_CONFIG+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -10189,31 +11611,32 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $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_SDL_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- test -z "$ac_cv_path_SDL_CONFIG" && ac_cv_path_SDL_CONFIG="no"
- ;;
- esac
- fi
- SDL_CONFIG=$ac_cv_path_SDL_CONFIG
--
- if test -n "$SDL_CONFIG"; then
-- echo "$as_me:$LINENO: result: $SDL_CONFIG" >&5
--echo "${ECHO_T}$SDL_CONFIG" >&6
-+ { echo "$as_me:$LINENO: result: $SDL_CONFIG" >&5
-+echo "${ECHO_T}$SDL_CONFIG" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- min_sdl_version=1.1.4
-- echo "$as_me:$LINENO: checking for SDL - version >= $min_sdl_version" >&5
--echo $ECHO_N "checking for SDL - version >= $min_sdl_version... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for SDL - version >= $min_sdl_version" >&5
-+echo $ECHO_N "checking for SDL - version >= $min_sdl_version... $ECHO_C" >&6; }
- no_sdl=""
- if test "$SDL_CONFIG" = "no" ; then
- no_sdl=yes
-@@ -10239,7 +11662,6 @@
- echo $ac_n "cross compiling; assumed OK... $ac_c"
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -10305,13 +11727,22 @@
-
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+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>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (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
-@@ -10324,20 +11755,22 @@
- ( exit $ac_status )
- no_sdl=yes
- fi
--rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+
-+
- CFLAGS="$ac_save_CFLAGS"
- CXXFLAGS="$ac_save_CXXFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- fi
- if test "x$no_sdl" = x ; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- sdl_found="yes"
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- if test "$SDL_CONFIG" = "no" ; then
- echo "*** The sdl-config script installed by SDL could not be found"
- echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
-@@ -10352,7 +11785,6 @@
- CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
- LIBS="$LIBS $SDL_LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -10376,17 +11808,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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 "*** The test program compiled, but did not run. This usually means"
- echo "*** that the run-time linker is not finding SDL or finding the wrong"
- echo "*** version of SDL. If it is not finding SDL, you'll need to set your"
-@@ -10400,12 +11838,14 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- echo "*** The test program failed to compile or link. See the file config.log for the"
-+ echo "*** The test program failed to compile or link. See the file config.log for the"
- echo "*** exact error that occured. This usually means SDL was incorrectly installed"
- echo "*** or that you have moved SDL since it was installed. In the latter case, you"
- echo "*** may want to edit the sdl-config script: $SDL_CONFIG"
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext conftest.$ac_ext
- CFLAGS="$ac_save_CFLAGS"
- CXXFLAGS="$ac_save_CXXFLAGS"
- LIBS="$ac_save_LIBS"
-@@ -10426,60 +11866,67 @@
- CPPFLAGS="$CPPFLAGS $SDL_CFLAGS"
- CFLAGS="$CFLAGS $SDL_CFLAGS"
- LIBS="$LIBS $SDL_LIBS"
-- echo "$as_me:$LINENO: checking for IMG_Load in -lSDL_image" >&5
--echo $ECHO_N "checking for IMG_Load in -lSDL_image... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for IMG_Load in -lSDL_image" >&5
-+echo $ECHO_N "checking for IMG_Load in -lSDL_image... $ECHO_C" >&6; }
- if test "${ac_cv_lib_SDL_image_IMG_Load+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lSDL_image $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char IMG_Load ();
- int
- main ()
- {
--IMG_Load ();
-+return IMG_Load ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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_SDL_image_IMG_Load=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_SDL_image_IMG_Load=no
-+ ac_cv_lib_SDL_image_IMG_Load=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+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
--echo "$as_me:$LINENO: result: $ac_cv_lib_SDL_image_IMG_Load" >&5
--echo "${ECHO_T}$ac_cv_lib_SDL_image_IMG_Load" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_SDL_image_IMG_Load" >&5
-+echo "${ECHO_T}$ac_cv_lib_SDL_image_IMG_Load" >&6; }
- if test $ac_cv_lib_SDL_image_IMG_Load = yes; then
- sdl_image_found="yes"
- else
-@@ -10488,19 +11935,18 @@
-
- if test "$sdl_image_found" = "yes"; then
- if test "${ac_cv_header_SDL_SDL_image_h+set}" = set; then
-- echo "$as_me:$LINENO: checking for SDL/SDL_image.h" >&5
--echo $ECHO_N "checking for SDL/SDL_image.h... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for SDL/SDL_image.h" >&5
-+echo $ECHO_N "checking for SDL/SDL_image.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_SDL_SDL_image_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_SDL_SDL_image_h" >&5
--echo "${ECHO_T}$ac_cv_header_SDL_SDL_image_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_SDL_SDL_image_h" >&5
-+echo "${ECHO_T}$ac_cv_header_SDL_SDL_image_h" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking SDL/SDL_image.h usability" >&5
--echo $ECHO_N "checking SDL/SDL_image.h usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking SDL/SDL_image.h usability" >&5
-+echo $ECHO_N "checking SDL/SDL_image.h usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -10510,33 +11956,38 @@
- #include <SDL/SDL_image.h>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_header_compiler=no
-+ ac_header_compiler=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+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 SDL/SDL_image.h presence" >&5
--echo $ECHO_N "checking SDL/SDL_image.h presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking SDL/SDL_image.h presence" >&5
-+echo $ECHO_N "checking SDL/SDL_image.h presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -10544,23 +11995,22 @@
- /* end confdefs.h. */
- #include <SDL/SDL_image.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+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
-- 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
-@@ -10568,52 +12018,45 @@
-
- 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
-+{ 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 in
-- yes:no )
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+ yes:no: )
- { echo "$as_me:$LINENO: WARNING: SDL/SDL_image.h: accepted by the compiler, rejected by the preprocessor!" >&5
- echo "$as_me: WARNING: SDL/SDL_image.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-- { echo "$as_me:$LINENO: WARNING: SDL/SDL_image.h: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: SDL/SDL_image.h: proceeding with the preprocessor's result" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------ ##
--## Report this to bug-autoconf at gnu.org. ##
--## ------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+ { echo "$as_me:$LINENO: WARNING: SDL/SDL_image.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: SDL/SDL_image.h: proceeding with the compiler's result" >&2;}
-+ ac_header_preproc=yes
- ;;
-- no:yes )
-+ no:yes:* )
- { echo "$as_me:$LINENO: WARNING: SDL/SDL_image.h: present but cannot be compiled" >&5
- echo "$as_me: WARNING: SDL/SDL_image.h: present but cannot be compiled" >&2;}
-- { echo "$as_me:$LINENO: WARNING: SDL/SDL_image.h: check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: SDL/SDL_image.h: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: SDL/SDL_image.h: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: SDL/SDL_image.h: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: SDL/SDL_image.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: SDL/SDL_image.h: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: SDL/SDL_image.h: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: SDL/SDL_image.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: SDL/SDL_image.h: proceeding with the preprocessor's result" >&5
- echo "$as_me: WARNING: SDL/SDL_image.h: proceeding with the preprocessor's result" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------ ##
--## Report this to bug-autoconf at gnu.org. ##
--## ------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+ { echo "$as_me:$LINENO: WARNING: SDL/SDL_image.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: SDL/SDL_image.h: in the future, the compiler will take precedence" >&2;}
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for SDL/SDL_image.h" >&5
--echo $ECHO_N "checking for SDL/SDL_image.h... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for SDL/SDL_image.h" >&5
-+echo $ECHO_N "checking for SDL/SDL_image.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_SDL_SDL_image_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_cv_header_SDL_SDL_image_h=$ac_header_preproc
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_SDL_SDL_image_h" >&5
--echo "${ECHO_T}$ac_cv_header_SDL_SDL_image_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_SDL_SDL_image_h" >&5
-+echo "${ECHO_T}$ac_cv_header_SDL_SDL_image_h" >&6; }
-
- fi
- if test $ac_cv_header_SDL_SDL_image_h = yes; then
-@@ -10628,28 +12071,28 @@
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
-
--# Check whether --with-ft-prefix or --without-ft-prefix was given.
-+# Check whether --with-ft-prefix was given.
- if test "${with_ft_prefix+set}" = set; then
-- withval="$with_ft_prefix"
-- ft_config_prefix="$withval"
-+ withval=$with_ft_prefix; ft_config_prefix="$withval"
- else
- ft_config_prefix=""
--fi;
-+fi
-
--# Check whether --with-ft-exec-prefix or --without-ft-exec-prefix was given.
-+
-+# Check whether --with-ft-exec-prefix was given.
- if test "${with_ft_exec_prefix+set}" = set; then
-- withval="$with_ft_exec_prefix"
-- ft_config_exec_prefix="$withval"
-+ withval=$with_ft_exec_prefix; ft_config_exec_prefix="$withval"
- else
- ft_config_exec_prefix=""
--fi;
--# Check whether --enable-freetypetest or --disable-freetypetest was given.
--if test "${enable_freetypetest+set}" = set; then
-- enableval="$enable_freetypetest"
-+fi
-
-+# Check whether --enable-freetypetest was given.
-+if test "${enable_freetypetest+set}" = set; then
-+ enableval=$enable_freetypetest;
- else
- enable_fttest=yes
--fi;
-+fi
-+
-
- if test x$ft_config_exec_prefix != x ; then
- ft_config_args="$ft_config_args --exec-prefix=$ft_config_exec_prefix"
-@@ -10665,8 +12108,8 @@
- fi
- # Extract the first word of "freetype-config", so it can be a program name with args.
- set dummy freetype-config; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_FT2_CONFIG+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -10681,32 +12124,33 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $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_FT2_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- test -z "$ac_cv_path_FT2_CONFIG" && ac_cv_path_FT2_CONFIG="no"
- ;;
- esac
- fi
- FT2_CONFIG=$ac_cv_path_FT2_CONFIG
--
- if test -n "$FT2_CONFIG"; then
-- echo "$as_me:$LINENO: result: $FT2_CONFIG" >&5
--echo "${ECHO_T}$FT2_CONFIG" >&6
-+ { echo "$as_me:$LINENO: result: $FT2_CONFIG" >&5
-+echo "${ECHO_T}$FT2_CONFIG" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-+
- min_ft_version=2.1.3
--echo "$as_me:$LINENO: checking for FreeType - version >= $min_ft_version" >&5
--echo $ECHO_N "checking for FreeType - version >= $min_ft_version... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for FreeType - version >= $min_ft_version" >&5
-+echo $ECHO_N "checking for FreeType - version >= $min_ft_version... $ECHO_C" >&6; }
- no_ft=""
- if test "$FT2_CONFIG" = "no" ; then
- no_ft=yes
-@@ -10753,7 +12197,6 @@
- echo $ac_n "cross compiling; assumed OK... $ac_c"
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -10784,13 +12227,22 @@
-
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+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>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (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
-@@ -10803,20 +12255,22 @@
- ( exit $ac_status )
- no_ft=yes
- fi
--rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+
-+
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi # test $ft_config_version -lt $ft_min_version
- fi # test x$enable_fttest = xyes
- fi # test "$FT2_CONFIG" = "no"
- if test x$no_ft = x ; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- freetype_found="yes"
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- if test "$FT2_CONFIG" = "no" ; then
- echo "*** The freetype-config script installed by FreeType 2 could not be found."
- echo "*** If FreeType 2 was installed in PREFIX, make sure PREFIX/bin is in"
-@@ -10875,19 +12329,19 @@
-
-
-
--# Check whether --with-libiconv-prefix or --without-libiconv-prefix was given.
-+# Check whether --with-libiconv-prefix was given.
- if test "${with_libiconv_prefix+set}" = set; then
-- withval="$with_libiconv_prefix"
--
-+ withval=$with_libiconv_prefix;
- for dir in `echo "$withval" | tr : ' '`; do
- if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi
- if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi
- done
-
--fi;
-+fi
-+
-
-- echo "$as_me:$LINENO: checking for iconv" >&5
--echo $ECHO_N "checking for iconv... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for iconv" >&5
-+echo $ECHO_N "checking for iconv... $ECHO_C" >&6; }
- if test "${am_cv_func_iconv+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -10895,7 +12349,6 @@
- am_cv_func_iconv="no, consider installing GNU libiconv"
- am_cv_lib_iconv=no
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -10914,29 +12367,37 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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_func_iconv=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext conftest.$ac_ext
- if test "$am_cv_func_iconv" != yes; then
- am_save_LIBS="$LIBS"
- LIBS="$LIBS -liconv"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -10955,45 +12416,53 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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_lib_iconv=yes
- am_cv_func_iconv=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS="$am_save_LIBS"
- fi
-
- fi
--echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5
--echo "${ECHO_T}$am_cv_func_iconv" >&6
-+{ echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5
-+echo "${ECHO_T}$am_cv_func_iconv" >&6; }
- if test "$am_cv_func_iconv" = yes; then
-
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_ICONV 1
- _ACEOF
-
-- echo "$as_me:$LINENO: checking for iconv declaration" >&5
--echo $ECHO_N "checking for iconv declaration... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for iconv declaration" >&5
-+echo $ECHO_N "checking for iconv declaration... $ECHO_C" >&6; }
- if test "${am_cv_proto_iconv+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -11021,33 +12490,39 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- am_cv_proto_iconv_arg1=""
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--am_cv_proto_iconv_arg1="const"
-+ am_cv_proto_iconv_arg1="const"
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"
- fi
-
- am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
-- echo "$as_me:$LINENO: result: ${ac_t:-
-+ { echo "$as_me:$LINENO: result: ${ac_t:-
- }$am_cv_proto_iconv" >&5
- echo "${ECHO_T}${ac_t:-
-- }$am_cv_proto_iconv" >&6
-+ }$am_cv_proto_iconv" >&6; }
-
- cat >>confdefs.h <<_ACEOF
- #define ICONV_CONST $am_cv_proto_iconv_arg1
-@@ -11061,15 +12536,14 @@
-
-
-
-- echo "$as_me:$LINENO: checking for libcharset" >&5
--echo $ECHO_N "checking for libcharset... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for libcharset" >&5
-+echo $ECHO_N "checking for libcharset... $ECHO_C" >&6; }
- if test "${am_cv_libcharset+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- lc_save_LIBS="$LIBS"
- LIBS="$LIBS $LIBICONV"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -11085,30 +12559,38 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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_libcharset=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--am_cv_libcharset=no
-+ am_cv_libcharset=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS="$lc_save_LIBS"
-
- fi
--echo "$as_me:$LINENO: result: $am_cv_libcharset" >&5
--echo "${ECHO_T}$am_cv_libcharset" >&6
-+{ echo "$as_me:$LINENO: result: $am_cv_libcharset" >&5
-+echo "${ECHO_T}$am_cv_libcharset" >&6; }
- if test $am_cv_libcharset = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -11118,13 +12600,12 @@
- fi
-
-
-- echo "$as_me:$LINENO: checking for nl_langinfo and CODESET" >&5
--echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for nl_langinfo and CODESET" >&5
-+echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6; }
- if test "${am_cv_langinfo_codeset+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -11140,29 +12621,37 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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_langinfo_codeset=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--am_cv_langinfo_codeset=no
-+ am_cv_langinfo_codeset=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+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_langinfo_codeset" >&5
--echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
-+{ echo "$as_me:$LINENO: result: $am_cv_langinfo_codeset" >&5
-+echo "${ECHO_T}$am_cv_langinfo_codeset" >&6; }
- if test $am_cv_langinfo_codeset = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -11173,118 +12662,132 @@
-
- CLIENT_LIBS="$LIBICONV $CLIENT_LIBS"
-
-- echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
--echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
-+echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; }
- if test "${ac_cv_lib_socket_connect+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lsocket $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char connect ();
- int
- main ()
- {
--connect ();
-+return connect ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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_connect=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_socket_connect=no
-+ ac_cv_lib_socket_connect=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+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
--echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
--echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
-+echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6; }
- if test $ac_cv_lib_socket_connect = yes; then
- CLIENT_LIBS="-lsocket $CLIENT_LIBS"
- fi
-
-- echo "$as_me:$LINENO: checking for gethostbyaddr in -lbind" >&5
--echo $ECHO_N "checking for gethostbyaddr in -lbind... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for gethostbyaddr in -lbind" >&5
-+echo $ECHO_N "checking for gethostbyaddr in -lbind... $ECHO_C" >&6; }
- if test "${ac_cv_lib_bind_gethostbyaddr+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lbind $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char gethostbyaddr ();
- int
- main ()
- {
--gethostbyaddr ();
-+return gethostbyaddr ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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_bind_gethostbyaddr=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_bind_gethostbyaddr=no
-+ ac_cv_lib_bind_gethostbyaddr=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+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
--echo "$as_me:$LINENO: result: $ac_cv_lib_bind_gethostbyaddr" >&5
--echo "${ECHO_T}$ac_cv_lib_bind_gethostbyaddr" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_bind_gethostbyaddr" >&5
-+echo "${ECHO_T}$ac_cv_lib_bind_gethostbyaddr" >&6; }
- if test $ac_cv_lib_bind_gethostbyaddr = yes; then
- CLIENT_LIBS="-lbind $CLIENT_LIBS"
- fi
-@@ -11298,52 +12801,57 @@
- fi
-
-
-- echo "$as_me:$LINENO: checking for X" >&5
--echo $ECHO_N "checking for X... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for X" >&5
-+echo $ECHO_N "checking for X... $ECHO_C" >&6; }
-
-
--# Check whether --with-x or --without-x was given.
-+# Check whether --with-x was given.
- if test "${with_x+set}" = set; then
-- withval="$with_x"
-+ withval=$with_x;
-+fi
-
--fi;
- # $have_x is `yes', `no', `disabled', or empty when we do not yet know.
- if test "x$with_x" = xno; then
- # The user explicitly disabled X.
- have_x=disabled
- else
-- if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then
-- # Both variables are already set.
-- have_x=yes
-- else
-- if test "${ac_cv_have_x+set}" = set; then
-+ case $x_includes,$x_libraries in #(
-+ *\'*) { { echo "$as_me:$LINENO: error: Cannot use X directory names containing '" >&5
-+echo "$as_me: error: Cannot use X directory names containing '" >&2;}
-+ { (exit 1); exit 1; }; };; #(
-+ *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- # One or both of the vars are not set, and there is no cached value.
- ac_x_includes=no ac_x_libraries=no
--rm -fr conftest.dir
-+rm -f -r conftest.dir
- if mkdir conftest.dir; then
- cd conftest.dir
-- # Make sure to not put "make" in the Imakefile rules, since we grep it out.
- cat >Imakefile <<'_ACEOF'
--acfindx:
-- @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
-+incroot:
-+ @echo incroot='${INCROOT}'
-+usrlibdir:
-+ @echo usrlibdir='${USRLIBDIR}'
-+libdir:
-+ @echo libdir='${LIBDIR}'
- _ACEOF
-- if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
-+ if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
- # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-- eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
-+ for ac_var in incroot usrlibdir libdir; do
-+ eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
-+ done
- # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
- for ac_extension in a so sl; do
-- if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
-- test -f $ac_im_libdir/libX11.$ac_extension; then
-- ac_im_usrlibdir=$ac_im_libdir; break
-+ if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&
-+ test -f "$ac_im_libdir/libX11.$ac_extension"; then
-+ ac_im_usrlibdir=$ac_im_libdir; break
- fi
- done
- # Screen out bogus values from the imake configuration. They are
- # bogus both because they are the default anyway, and because
- # using them would break gcc on systems where it needs fixed includes.
- case $ac_im_incroot in
-- /usr/include) ;;
-+ /usr/include) ac_x_includes= ;;
- *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
- esac
- case $ac_im_usrlibdir in
-@@ -11352,7 +12860,7 @@
- esac
- fi
- cd ..
-- rm -fr conftest.dir
-+ rm -f -r conftest.dir
- fi
-
- # Standard set of common directories for X headers.
-@@ -11393,34 +12901,32 @@
- /usr/openwin/share/include'
-
- if test "$ac_x_includes" = no; then
-- # Guess where to find include files, by looking for Intrinsic.h.
-+ # Guess where to find include files, by looking for Xlib.h.
- # First, try using that file with no special directory specified.
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
--#include <X11/Intrinsic.h>
-+#include <X11/Xlib.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+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
-- 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
- # We can compile using X headers with no special include directory.
- ac_x_includes=
- else
-@@ -11428,12 +12934,13 @@
- sed 's/^/| /' conftest.$ac_ext >&5
-
- for ac_dir in $ac_x_header_dirs; do
-- if test -r "$ac_dir/X11/Intrinsic.h"; then
-+ if test -r "$ac_dir/X11/Xlib.h"; then
- ac_x_includes=$ac_dir
- break
- fi
- done
- fi
-+
- rm -f conftest.err conftest.$ac_ext
- fi # $ac_x_includes = no
-
-@@ -11442,35 +12949,40 @@
- # See if we find them without any special options.
- # Don't add to $LIBS permanently.
- ac_save_LIBS=$LIBS
-- LIBS="-lXt $LIBS"
-+ LIBS="-lX11 $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
--#include <X11/Intrinsic.h>
-+#include <X11/Xlib.h>
- int
- main ()
- {
--XtMalloc (0)
-+XrmInitialize ()
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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
- LIBS=$ac_save_LIBS
- # We can link X programs with no special library path.
- ac_x_libraries=
-@@ -11478,58 +12990,64 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--LIBS=$ac_save_LIBS
-+ LIBS=$ac_save_LIBS
- for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
- do
- # Don't even attempt the hair of trying to link an X program!
- for ac_extension in a so sl; do
-- if test -r $ac_dir/libXt.$ac_extension; then
-+ if test -r "$ac_dir/libX11.$ac_extension"; then
- ac_x_libraries=$ac_dir
- break 2
- fi
- done
- done
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext conftest.$ac_ext
- fi # $ac_x_libraries = no
-
--if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then
-- # Didn't find X anywhere. Cache the known absence of X.
-- ac_cv_have_x="have_x=no"
--else
-- # Record where we found X for the cache.
-- ac_cv_have_x="have_x=yes \
-- ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries"
--fi
-+case $ac_x_includes,$ac_x_libraries in #(
-+ no,* | *,no | *\'*)
-+ # Didn't find X, or a directory has "'" in its name.
-+ ac_cv_have_x="have_x=no";; #(
-+ *)
-+ # Record where we found X for the cache.
-+ ac_cv_have_x="have_x=yes\
-+ ac_x_includes='$ac_x_includes'\
-+ ac_x_libraries='$ac_x_libraries'"
-+esac
- fi
--
-- fi
-+;; #(
-+ *) have_x=yes;;
-+ esac
- eval "$ac_cv_have_x"
- fi # $with_x != no
-
- if test "$have_x" != yes; then
-- echo "$as_me:$LINENO: result: $have_x" >&5
--echo "${ECHO_T}$have_x" >&6
-+ { echo "$as_me:$LINENO: result: $have_x" >&5
-+echo "${ECHO_T}$have_x" >&6; }
- no_x=yes
- else
- # If each of the values was on the command line, it overrides each guess.
- test "x$x_includes" = xNONE && x_includes=$ac_x_includes
- test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
- # Update the cache value to reflect the command line values.
-- ac_cv_have_x="have_x=yes \
-- ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
-- echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
--echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
-+ ac_cv_have_x="have_x=yes\
-+ ac_x_includes='$x_includes'\
-+ ac_x_libraries='$x_libraries'"
-+ { echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
-+echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6; }
- fi
-
--echo "$as_me:$LINENO: checking whether Xfuncproto was supplied" >&5
--echo $ECHO_N "checking whether Xfuncproto was supplied... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether Xfuncproto was supplied" >&5
-+echo $ECHO_N "checking whether Xfuncproto was supplied... $ECHO_C" >&6; }
-
--# Check whether --with-x-funcproto or --without-x-funcproto was given.
-+# Check whether --with-x-funcproto was given.
- if test "${with_x_funcproto+set}" = set; then
-- withval="$with_x_funcproto"
-+ withval=$with_x_funcproto;
-+fi
-
--fi;
- if test "x$with_x_funcproto" = "x"; then
- fc_x_proto_defines=
- rm -fr conftestdir
-@@ -11543,20 +13061,19 @@
- if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
- # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
- eval `${MAKE-make} fcfindpd 2>/dev/null | grep -v make | sed -e 's/ -D/ /g'`
-- echo "$as_me:$LINENO: result: no, found: $fc_x_proto_defines" >&5
--echo "${ECHO_T}no, found: $fc_x_proto_defines" >&6
-+ { echo "$as_me:$LINENO: result: no, found: $fc_x_proto_defines" >&5
-+echo "${ECHO_T}no, found: $fc_x_proto_defines" >&6; }
- cd ..
- rm -fr conftestdir
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- cd ..
- rm -fr conftestdir
-- echo "$as_me:$LINENO: checking for compilable FUNCPROTO definition" >&5
--echo $ECHO_N "checking for compilable FUNCPROTO definition... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for compilable FUNCPROTO definition" >&5
-+echo $ECHO_N "checking for compilable FUNCPROTO definition... $ECHO_C" >&6; }
- for fc_x_value in 15 11 3 1 ""; do
-
--
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -11572,7 +13089,6 @@
- fc_x_save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS $X_CFLAGS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -11593,24 +13109,31 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- fc_x_proto_FUNCPROTO=$fc_x_value
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- CFLAGS="$fc_x_save_CFLAGS"
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -11625,17 +13148,16 @@
- done
- if test "x$fc_x_proto_FUNCPROTO" != "xno"; then
- fc_x_proto_defines="$fc_x_proto_defines FUNCPROTO=$fc_x_proto_FUNCPROTO"
-- echo "$as_me:$LINENO: result: yes, determined: $fc_x_proto_FUNCPROTO" >&5
--echo "${ECHO_T}yes, determined: $fc_x_proto_FUNCPROTO" >&6
-+ { echo "$as_me:$LINENO: result: yes, determined: $fc_x_proto_FUNCPROTO" >&5
-+echo "${ECHO_T}yes, determined: $fc_x_proto_FUNCPROTO" >&6; }
- else
-- echo "$as_me:$LINENO: result: no, cannot determine" >&5
--echo "${ECHO_T}no, cannot determine" >&6
-+ { echo "$as_me:$LINENO: result: no, cannot determine" >&5
-+echo "${ECHO_T}no, cannot determine" >&6; }
- fi
-- echo "$as_me:$LINENO: checking for workable NARROWPROTO definition" >&5
--echo $ECHO_N "checking for workable NARROWPROTO definition... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for workable NARROWPROTO definition" >&5
-+echo $ECHO_N "checking for workable NARROWPROTO definition... $ECHO_C" >&6; }
- for fc_x_value in 1 ""; do
-
--
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -11659,7 +13181,6 @@
- :
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -11722,13 +13243,22 @@
-
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+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>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (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
-@@ -11739,8 +13269,10 @@
- sed 's/^/| /' conftest.$ac_ext >&5
-
- fi
--rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+
-+
- CFLAGS="$fc_x_save_CFLAGS"
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -11755,30 +13287,30 @@
- done
- if test "x$fc_x_proto_NARROWPROTO" != "xno"; then
- fc_x_proto_defines="$fc_x_proto_defines NARROWPROTO=$fc_x_proto_NARROWPROTO"
-- echo "$as_me:$LINENO: result: yes, determined: $fc_x_proto_NARROWPROTO" >&5
--echo "${ECHO_T}yes, determined: $fc_x_proto_NARROWPROTO" >&6
-+ { echo "$as_me:$LINENO: result: yes, determined: $fc_x_proto_NARROWPROTO" >&5
-+echo "${ECHO_T}yes, determined: $fc_x_proto_NARROWPROTO" >&6; }
- else
-- echo "$as_me:$LINENO: result: no, cannot determine" >&5
--echo "${ECHO_T}no, cannot determine" >&6
-+ { echo "$as_me:$LINENO: result: no, cannot determine" >&5
-+echo "${ECHO_T}no, cannot determine" >&6; }
- fi
-- echo "$as_me:$LINENO: checking whether Xfuncproto was determined" >&5
--echo $ECHO_N "checking whether Xfuncproto was determined... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking whether Xfuncproto was determined" >&5
-+echo $ECHO_N "checking whether Xfuncproto was determined... $ECHO_C" >&6; }
- if test -n "$fc_x_proto_defines"; then
-- echo "$as_me:$LINENO: result: yes: $fc_x_proto_defines" >&5
--echo "${ECHO_T}yes: $fc_x_proto_defines" >&6
-+ { echo "$as_me:$LINENO: result: yes: $fc_x_proto_defines" >&5
-+echo "${ECHO_T}yes: $fc_x_proto_defines" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- fi
- else
-- echo "$as_me:$LINENO: result: no, examination failed" >&5
--echo "${ECHO_T}no, examination failed" >&6
-+ { echo "$as_me:$LINENO: result: no, examination failed" >&5
-+echo "${ECHO_T}no, examination failed" >&6; }
- fi
- else
- fc_x_proto_defines=$with_x_funcproto
-- echo "$as_me:$LINENO: result: yes, given: $fc_x_proto_defines" >&5
--echo "${ECHO_T}yes, given: $fc_x_proto_defines" >&6
-+ { echo "$as_me:$LINENO: result: yes, given: $fc_x_proto_defines" >&5
-+echo "${ECHO_T}yes, given: $fc_x_proto_defines" >&6; }
- fi
-
-
-@@ -11787,8 +13319,8 @@
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
- set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -11803,34 +13335,35 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $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
- fi
- done
- done
-+IFS=$as_save_IFS
-
- ;;
- esac
- fi
- PKG_CONFIG=$ac_cv_path_PKG_CONFIG
--
- if test -n "$PKG_CONFIG"; then
-- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
--echo "${ECHO_T}$PKG_CONFIG" >&6
-+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-+echo "${ECHO_T}$PKG_CONFIG" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- fi
- if test -z "$ac_cv_path_PKG_CONFIG"; then
- ac_pt_PKG_CONFIG=$PKG_CONFIG
- # Extract the first word of "pkg-config", so it can be a program name with args.
- set dummy pkg-config; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -11845,28 +13378,42 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $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
- fi
- done
- done
-+IFS=$as_save_IFS
-
- ;;
- esac
- fi
- ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
--
- if test -n "$ac_pt_PKG_CONFIG"; then
-- echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
--echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
-+ { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
-+echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-- PKG_CONFIG=$ac_pt_PKG_CONFIG
-+ if test "x$ac_pt_PKG_CONFIG" = x; then
-+ PKG_CONFIG=""
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ PKG_CONFIG=$ac_pt_PKG_CONFIG
-+ fi
- else
- PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
- fi
-@@ -11874,14 +13421,14 @@
- fi
- if test -n "$PKG_CONFIG"; then
- _pkg_min_version=0.9.0
-- echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
--echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
-+echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }
- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- PKG_CONFIG=""
- fi
-
-@@ -11909,13 +13456,12 @@
- X_LIBS="$X_LIBS -L$x_libraries"
- # For Solaris; some versions of Sun CC require a space after -R and
- # others require no space. Words are not sufficient . . . .
-- case `(uname -sr) 2>/dev/null` in
-- "SunOS 5"*)
-- echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
--echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
-- ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
-- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
-+ { echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
-+echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6; }
-+ ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
-+ ac_xsave_c_werror_flag=$ac_c_werror_flag
-+ ac_c_werror_flag=yes
-+ cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -11931,33 +13477,32 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; then
-- ac_R_nospace=yes
-+ (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: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+ X_LIBS="$X_LIBS -R$x_libraries"
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_R_nospace=no
--fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-- if test $ac_R_nospace = yes; then
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-- X_LIBS="$X_LIBS -R$x_libraries"
-- else
- LIBS="$ac_xsave_LIBS -R $x_libraries"
-- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
-+ cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -11973,36 +13518,42 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; then
-- ac_R_space=yes
-+ (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; }
-+ X_LIBS="$X_LIBS -R $x_libraries"
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_R_space=no
-+ { echo "$as_me:$LINENO: result: neither works" >&5
-+echo "${ECHO_T}neither works" >&6; }
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-- if test $ac_R_space = yes; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-- X_LIBS="$X_LIBS -R $x_libraries"
-- else
-- echo "$as_me:$LINENO: result: neither works" >&5
--echo "${ECHO_T}neither works" >&6
-- fi
-- fi
-- LIBS=$ac_xsave_LIBS
-- esac
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext conftest.$ac_ext
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext conftest.$ac_ext
-+ ac_c_werror_flag=$ac_xsave_c_werror_flag
-+ LIBS=$ac_xsave_LIBS
- fi
-
- # Check for system-dependent libraries X programs must link with.
-@@ -12017,165 +13568,186 @@
- # the Alpha needs dnet_stub (dnet does not exist).
- ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char XOpenDisplay ();
- int
- main ()
- {
--XOpenDisplay ();
-+return XOpenDisplay ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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
- :
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
--echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
-+echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6; }
- if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldnet $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char dnet_ntoa ();
- int
- main ()
- {
--dnet_ntoa ();
-+return dnet_ntoa ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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_dnet_dnet_ntoa=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_dnet_dnet_ntoa=no
-+ ac_cv_lib_dnet_dnet_ntoa=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+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
--echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
--echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
-+echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6; }
- if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
- X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
- fi
-
- if test $ac_cv_lib_dnet_dnet_ntoa = no; then
-- echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
--echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
-+echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6; }
- if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldnet_stub $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char dnet_ntoa ();
- int
- main ()
- {
--dnet_ntoa ();
-+return dnet_ntoa ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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_dnet_stub_dnet_ntoa=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_dnet_stub_dnet_ntoa=no
-+ ac_cv_lib_dnet_stub_dnet_ntoa=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+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
--echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
--echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
-+echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
- if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
- X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
- fi
-
- fi
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS="$ac_xsave_LIBS"
-
- # msh at cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
-@@ -12186,193 +13758,216 @@
- # on Irix 5.2, according to T.E. Dickey.
- # The functions gethostbyname, getservbyname, and inet_addr are
- # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
-- echo "$as_me:$LINENO: checking for gethostbyname" >&5
--echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for gethostbyname" >&5
-+echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6; }
- if test "${ac_cv_func_gethostbyname+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-+/* Define gethostbyname to an innocuous variant, in case <limits.h> declares gethostbyname.
-+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
-+#define gethostbyname innocuous_gethostbyname
-+
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char gethostbyname (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+
- #ifdef __STDC__
- # include <limits.h>
- #else
- # include <assert.h>
- #endif
--/* Override any gcc2 internal prototype to avoid an error. */
-+
-+#undef gethostbyname
-+
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char gethostbyname ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_gethostbyname) || defined (__stub___gethostbyname)
-+#if defined __stub_gethostbyname || defined __stub___gethostbyname
- choke me
--#else
--char (*f) () = gethostbyname;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != gethostbyname;
-+return gethostbyname ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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_gethostbyname=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_func_gethostbyname=no
-+ ac_cv_func_gethostbyname=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+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_gethostbyname" >&5
--echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
-+echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6; }
-
- if test $ac_cv_func_gethostbyname = no; then
-- echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
--echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
-+echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6; }
- if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lnsl $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char gethostbyname ();
- int
- main ()
- {
--gethostbyname ();
-+return gethostbyname ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_nsl_gethostbyname=no
-+ ac_cv_lib_nsl_gethostbyname=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+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
--echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
--echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
-+echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6; }
- if test $ac_cv_lib_nsl_gethostbyname = yes; then
- X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
- fi
-
- if test $ac_cv_lib_nsl_gethostbyname = no; then
-- echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
--echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
-+echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6; }
- if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lbsd $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char gethostbyname ();
- int
- main ()
- {
--gethostbyname ();
-+return gethostbyname ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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_bsd_gethostbyname=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_bsd_gethostbyname=no
-+ ac_cv_lib_bsd_gethostbyname=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+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
--echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
--echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
-+echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6; }
- if test $ac_cv_lib_bsd_gethostbyname = yes; then
- X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
- fi
-@@ -12387,134 +13982,150 @@
- # variants that don't use the name server (or something). -lsocket
- # must be given before -lnsl if both are needed. We assume that
- # if connect needs -lnsl, so does gethostbyname.
-- echo "$as_me:$LINENO: checking for connect" >&5
--echo $ECHO_N "checking for connect... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for connect" >&5
-+echo $ECHO_N "checking for connect... $ECHO_C" >&6; }
- if test "${ac_cv_func_connect+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-+/* Define connect to an innocuous variant, in case <limits.h> declares connect.
-+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
-+#define connect innocuous_connect
-+
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char connect (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+
- #ifdef __STDC__
- # include <limits.h>
- #else
- # include <assert.h>
- #endif
--/* Override any gcc2 internal prototype to avoid an error. */
-+
-+#undef connect
-+
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char connect ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_connect) || defined (__stub___connect)
-+#if defined __stub_connect || defined __stub___connect
- choke me
--#else
--char (*f) () = connect;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != connect;
-+return connect ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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_connect=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_func_connect=no
-+ ac_cv_func_connect=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+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_connect" >&5
--echo "${ECHO_T}$ac_cv_func_connect" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
-+echo "${ECHO_T}$ac_cv_func_connect" >&6; }
-
- if test $ac_cv_func_connect = no; then
-- echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
--echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
-+echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; }
- if test "${ac_cv_lib_socket_connect+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char connect ();
- int
- main ()
- {
--connect ();
-+return connect ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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_connect=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_socket_connect=no
-+ ac_cv_lib_socket_connect=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+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
--echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
--echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
-+echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6; }
- if test $ac_cv_lib_socket_connect = yes; then
- X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
- fi
-@@ -12522,134 +14133,150 @@
- fi
-
- # Guillermo Gomez says -lposix is necessary on A/UX.
-- echo "$as_me:$LINENO: checking for remove" >&5
--echo $ECHO_N "checking for remove... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for remove" >&5
-+echo $ECHO_N "checking for remove... $ECHO_C" >&6; }
- if test "${ac_cv_func_remove+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-+/* Define remove to an innocuous variant, in case <limits.h> declares remove.
-+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
-+#define remove innocuous_remove
-+
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char remove (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+
- #ifdef __STDC__
- # include <limits.h>
- #else
- # include <assert.h>
- #endif
--/* Override any gcc2 internal prototype to avoid an error. */
-+
-+#undef remove
-+
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char remove ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_remove) || defined (__stub___remove)
-+#if defined __stub_remove || defined __stub___remove
- choke me
--#else
--char (*f) () = remove;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != remove;
-+return remove ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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_remove=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_func_remove=no
-+ ac_cv_func_remove=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+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_remove" >&5
--echo "${ECHO_T}$ac_cv_func_remove" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
-+echo "${ECHO_T}$ac_cv_func_remove" >&6; }
-
- if test $ac_cv_func_remove = no; then
-- echo "$as_me:$LINENO: checking for remove in -lposix" >&5
--echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for remove in -lposix" >&5
-+echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6; }
- if test "${ac_cv_lib_posix_remove+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lposix $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char remove ();
- int
- main ()
- {
--remove ();
-+return remove ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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_posix_remove=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_posix_remove=no
-+ ac_cv_lib_posix_remove=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+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
--echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
--echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
-+echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6; }
- if test $ac_cv_lib_posix_remove = yes; then
- X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
- fi
-@@ -12657,134 +14284,150 @@
- fi
-
- # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-- echo "$as_me:$LINENO: checking for shmat" >&5
--echo $ECHO_N "checking for shmat... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for shmat" >&5
-+echo $ECHO_N "checking for shmat... $ECHO_C" >&6; }
- if test "${ac_cv_func_shmat+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-+/* Define shmat to an innocuous variant, in case <limits.h> declares shmat.
-+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
-+#define shmat innocuous_shmat
-+
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char shmat (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+
- #ifdef __STDC__
- # include <limits.h>
- #else
- # include <assert.h>
- #endif
--/* Override any gcc2 internal prototype to avoid an error. */
-+
-+#undef shmat
-+
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char shmat ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_shmat) || defined (__stub___shmat)
-+#if defined __stub_shmat || defined __stub___shmat
- choke me
--#else
--char (*f) () = shmat;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != shmat;
-+return shmat ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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_shmat=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_func_shmat=no
-+ ac_cv_func_shmat=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+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_shmat" >&5
--echo "${ECHO_T}$ac_cv_func_shmat" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
-+echo "${ECHO_T}$ac_cv_func_shmat" >&6; }
-
- if test $ac_cv_func_shmat = no; then
-- echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
--echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
-+echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6; }
- if test "${ac_cv_lib_ipc_shmat+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lipc $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char shmat ();
- int
- main ()
- {
--shmat ();
-+return shmat ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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_ipc_shmat=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_ipc_shmat=no
-+ ac_cv_lib_ipc_shmat=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+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
--echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
--echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
-+echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6; }
- if test $ac_cv_lib_ipc_shmat = yes; then
- X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
- fi
-@@ -12801,60 +14444,67 @@
- # These have to be linked with before -lX11, unlike the other
- # libraries we check for below, so use a different variable.
- # John Interrante, Karl Berry
-- echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
--echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
-+echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6; }
- if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lICE $X_EXTRA_LIBS $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char IceConnectionNumber ();
- int
- main ()
- {
--IceConnectionNumber ();
-+return IceConnectionNumber ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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_ICE_IceConnectionNumber=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_ICE_IceConnectionNumber=no
-+ ac_cv_lib_ICE_IceConnectionNumber=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+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
--echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
--echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
-+echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
- if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
- X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
- fi
-@@ -12864,8 +14514,8 @@
- fi
-
-
-- echo "$as_me:$LINENO: checking for Xfuncproto control definition FUNCPROTO" >&5
--echo $ECHO_N "checking for Xfuncproto control definition FUNCPROTO... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for Xfuncproto control definition FUNCPROTO" >&5
-+echo $ECHO_N "checking for Xfuncproto control definition FUNCPROTO... $ECHO_C" >&6; }
- # Search for the requested defined variable; return it's value:
- fc_x_proto_value=
- for fc_x_define in $fc_x_proto_defines; do
-@@ -12877,11 +14527,11 @@
- fi
- done
- if test -n "$fc_x_proto_value"; then
-- echo "$as_me:$LINENO: result: yes: $fc_x_proto_value" >&5
--echo "${ECHO_T}yes: $fc_x_proto_value" >&6
-+ { echo "$as_me:$LINENO: result: yes: $fc_x_proto_value" >&5
-+echo "${ECHO_T}yes: $fc_x_proto_value" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
- if test -n "$fc_x_proto_value"; then
-@@ -12891,8 +14541,8 @@
- _ACEOF
-
- fi
-- echo "$as_me:$LINENO: checking for Xfuncproto control definition NARROWPROTO" >&5
--echo $ECHO_N "checking for Xfuncproto control definition NARROWPROTO... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for Xfuncproto control definition NARROWPROTO" >&5
-+echo $ECHO_N "checking for Xfuncproto control definition NARROWPROTO... $ECHO_C" >&6; }
- # Search for the requested defined variable; return it's value:
- fc_x_proto_value=
- for fc_x_define in $fc_x_proto_defines; do
-@@ -12904,11 +14554,11 @@
- fi
- done
- if test -n "$fc_x_proto_value"; then
-- echo "$as_me:$LINENO: result: yes: $fc_x_proto_value" >&5
--echo "${ECHO_T}yes: $fc_x_proto_value" >&6
-+ { echo "$as_me:$LINENO: result: yes: $fc_x_proto_value" >&5
-+echo "${ECHO_T}yes: $fc_x_proto_value" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
- if test -n "$fc_x_proto_value"; then
-@@ -12921,8 +14571,8 @@
-
-
- pkg_failed=no
--echo "$as_me:$LINENO: checking for PNG" >&5
--echo $ECHO_N "checking for PNG... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for PNG" >&5
-+echo $ECHO_N "checking for PNG... $ECHO_C" >&6; }
-
- if test -n "$PKG_CONFIG"; then
- if test -n "$PNG_CFLAGS"; then
-@@ -12978,121 +14628,135 @@
- # Put the nasty error message in config.log where it belongs
- echo "$PNG_PKG_ERRORS" >&5
-
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-
-- echo "$as_me:$LINENO: checking for png_read_image in -lpng12" >&5
--echo $ECHO_N "checking for png_read_image in -lpng12... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for png_read_image in -lpng12" >&5
-+echo $ECHO_N "checking for png_read_image in -lpng12... $ECHO_C" >&6; }
- if test "${ac_cv_lib_png12_png_read_image+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lpng12 $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char png_read_image ();
- int
- main ()
- {
--png_read_image ();
-+return png_read_image ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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_png12_png_read_image=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_png12_png_read_image=no
-+ ac_cv_lib_png12_png_read_image=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+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
--echo "$as_me:$LINENO: result: $ac_cv_lib_png12_png_read_image" >&5
--echo "${ECHO_T}$ac_cv_lib_png12_png_read_image" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_png12_png_read_image" >&5
-+echo "${ECHO_T}$ac_cv_lib_png12_png_read_image" >&6; }
- if test $ac_cv_lib_png12_png_read_image = yes; then
- X_LIBS="$X_LIBS -lpng12 -lm"
- else
-
-- echo "$as_me:$LINENO: checking for png_read_image in -lpng" >&5
--echo $ECHO_N "checking for png_read_image in -lpng... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for png_read_image in -lpng" >&5
-+echo $ECHO_N "checking for png_read_image in -lpng... $ECHO_C" >&6; }
- if test "${ac_cv_lib_png_png_read_image+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lpng $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char png_read_image ();
- int
- main ()
- {
--png_read_image ();
-+return png_read_image ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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_png_png_read_image=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_png_png_read_image=no
-+ ac_cv_lib_png_png_read_image=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+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
--echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_read_image" >&5
--echo "${ECHO_T}$ac_cv_lib_png_png_read_image" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_read_image" >&5
-+echo "${ECHO_T}$ac_cv_lib_png_png_read_image" >&6; }
- if test $ac_cv_lib_png_png_read_image = yes; then
- X_LIBS="$X_LIBS -lpng -lm"
- else
-@@ -13107,19 +14771,18 @@
- fi
-
- if test "${ac_cv_header_png_h+set}" = set; then
-- echo "$as_me:$LINENO: checking for png.h" >&5
--echo $ECHO_N "checking for png.h... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for png.h" >&5
-+echo $ECHO_N "checking for png.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_png_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5
--echo "${ECHO_T}$ac_cv_header_png_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5
-+echo "${ECHO_T}$ac_cv_header_png_h" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking png.h usability" >&5
--echo $ECHO_N "checking png.h usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking png.h usability" >&5
-+echo $ECHO_N "checking png.h usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -13129,33 +14792,38 @@
- #include <png.h>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_header_compiler=no
-+ ac_header_compiler=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+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 png.h presence" >&5
--echo $ECHO_N "checking png.h presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking png.h presence" >&5
-+echo $ECHO_N "checking png.h presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -13163,23 +14831,22 @@
- /* end confdefs.h. */
- #include <png.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+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
-- 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
-@@ -13187,52 +14854,45 @@
-
- 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
-+{ 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 in
-- yes:no )
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+ yes:no: )
- { echo "$as_me:$LINENO: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&5
- echo "$as_me: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-- { echo "$as_me:$LINENO: WARNING: png.h: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: png.h: proceeding with the preprocessor's result" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------ ##
--## Report this to bug-autoconf at gnu.org. ##
--## ------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+ { echo "$as_me:$LINENO: WARNING: png.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: png.h: proceeding with the compiler's result" >&2;}
-+ ac_header_preproc=yes
- ;;
-- no:yes )
-+ no:yes:* )
- { echo "$as_me:$LINENO: WARNING: png.h: present but cannot be compiled" >&5
- echo "$as_me: WARNING: png.h: present but cannot be compiled" >&2;}
-- { echo "$as_me:$LINENO: WARNING: png.h: check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: png.h: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: png.h: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: png.h: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: png.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: png.h: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: png.h: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: png.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: png.h: proceeding with the preprocessor's result" >&5
- echo "$as_me: WARNING: png.h: proceeding with the preprocessor's result" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------ ##
--## Report this to bug-autoconf at gnu.org. ##
--## ------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+ { echo "$as_me:$LINENO: WARNING: png.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: png.h: in the future, the compiler will take precedence" >&2;}
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for png.h" >&5
--echo $ECHO_N "checking for png.h... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for png.h" >&5
-+echo $ECHO_N "checking for png.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_png_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_cv_header_png_h=$ac_header_preproc
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5
--echo "${ECHO_T}$ac_cv_header_png_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5
-+echo "${ECHO_T}$ac_cv_header_png_h" >&6; }
-
- fi
- if test $ac_cv_header_png_h = yes; then
-@@ -13251,118 +14911,132 @@
-
- elif test $pkg_failed = untried; then
-
-- echo "$as_me:$LINENO: checking for png_read_image in -lpng12" >&5
--echo $ECHO_N "checking for png_read_image in -lpng12... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for png_read_image in -lpng12" >&5
-+echo $ECHO_N "checking for png_read_image in -lpng12... $ECHO_C" >&6; }
- if test "${ac_cv_lib_png12_png_read_image+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lpng12 $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char png_read_image ();
- int
- main ()
- {
--png_read_image ();
-+return png_read_image ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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_png12_png_read_image=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_png12_png_read_image=no
-+ ac_cv_lib_png12_png_read_image=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+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
--echo "$as_me:$LINENO: result: $ac_cv_lib_png12_png_read_image" >&5
--echo "${ECHO_T}$ac_cv_lib_png12_png_read_image" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_png12_png_read_image" >&5
-+echo "${ECHO_T}$ac_cv_lib_png12_png_read_image" >&6; }
- if test $ac_cv_lib_png12_png_read_image = yes; then
- X_LIBS="$X_LIBS -lpng12 -lm"
- else
-
-- echo "$as_me:$LINENO: checking for png_read_image in -lpng" >&5
--echo $ECHO_N "checking for png_read_image in -lpng... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for png_read_image in -lpng" >&5
-+echo $ECHO_N "checking for png_read_image in -lpng... $ECHO_C" >&6; }
- if test "${ac_cv_lib_png_png_read_image+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lpng $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char png_read_image ();
- int
- main ()
- {
--png_read_image ();
-+return png_read_image ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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_png_png_read_image=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_png_png_read_image=no
-+ ac_cv_lib_png_png_read_image=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+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
--echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_read_image" >&5
--echo "${ECHO_T}$ac_cv_lib_png_png_read_image" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_read_image" >&5
-+echo "${ECHO_T}$ac_cv_lib_png_png_read_image" >&6; }
- if test $ac_cv_lib_png_png_read_image = yes; then
- X_LIBS="$X_LIBS -lpng -lm"
- else
-@@ -13377,19 +15051,18 @@
- fi
-
- if test "${ac_cv_header_png_h+set}" = set; then
-- echo "$as_me:$LINENO: checking for png.h" >&5
--echo $ECHO_N "checking for png.h... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for png.h" >&5
-+echo $ECHO_N "checking for png.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_png_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5
--echo "${ECHO_T}$ac_cv_header_png_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5
-+echo "${ECHO_T}$ac_cv_header_png_h" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking png.h usability" >&5
--echo $ECHO_N "checking png.h usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking png.h usability" >&5
-+echo $ECHO_N "checking png.h usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -13399,33 +15072,38 @@
- #include <png.h>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_header_compiler=no
-+ ac_header_compiler=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+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 png.h presence" >&5
--echo $ECHO_N "checking png.h presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking png.h presence" >&5
-+echo $ECHO_N "checking png.h presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -13433,23 +15111,22 @@
- /* end confdefs.h. */
- #include <png.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+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
-- 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
-@@ -13457,52 +15134,45 @@
-
- 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
-+{ 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 in
-- yes:no )
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+ yes:no: )
- { echo "$as_me:$LINENO: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&5
- echo "$as_me: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-- { echo "$as_me:$LINENO: WARNING: png.h: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: png.h: proceeding with the preprocessor's result" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------ ##
--## Report this to bug-autoconf at gnu.org. ##
--## ------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+ { echo "$as_me:$LINENO: WARNING: png.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: png.h: proceeding with the compiler's result" >&2;}
-+ ac_header_preproc=yes
- ;;
-- no:yes )
-+ no:yes:* )
- { echo "$as_me:$LINENO: WARNING: png.h: present but cannot be compiled" >&5
- echo "$as_me: WARNING: png.h: present but cannot be compiled" >&2;}
-- { echo "$as_me:$LINENO: WARNING: png.h: check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: png.h: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: png.h: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: png.h: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: png.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: png.h: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: png.h: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: png.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: png.h: proceeding with the preprocessor's result" >&5
- echo "$as_me: WARNING: png.h: proceeding with the preprocessor's result" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------ ##
--## Report this to bug-autoconf at gnu.org. ##
--## ------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+ { echo "$as_me:$LINENO: WARNING: png.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: png.h: in the future, the compiler will take precedence" >&2;}
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for png.h" >&5
--echo $ECHO_N "checking for png.h... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for png.h" >&5
-+echo $ECHO_N "checking for png.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_png_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_cv_header_png_h=$ac_header_preproc
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5
--echo "${ECHO_T}$ac_cv_header_png_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5
-+echo "${ECHO_T}$ac_cv_header_png_h" >&6; }
-
- fi
- if test $ac_cv_header_png_h = yes; then
-@@ -13522,25 +15192,25 @@
- else
- PNG_CFLAGS=$pkg_cv_PNG_CFLAGS
- PNG_LIBS=$pkg_cv_PNG_LIBS
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-
- X_LIBS="$X_LIBS $PNG_LIBS"
- X_CFLAGS="$X_CFLAGS $PNG_CFLAGS"
-
- fi
-
-- echo "$as_me:$LINENO: checking extra paths for Xpm" >&5
--echo $ECHO_N "checking extra paths for Xpm... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking extra paths for Xpm" >&5
-+echo $ECHO_N "checking extra paths for Xpm... $ECHO_C" >&6; }
-
--# Check whether --with-xpm-prefix or --without-xpm-prefix was given.
-+# Check whether --with-xpm-prefix was given.
- if test "${with_xpm_prefix+set}" = set; then
-- withval="$with_xpm_prefix"
-- xpm_prefix="$withval"
-+ withval=$with_xpm_prefix; xpm_prefix="$withval"
- else
- xpm_prefix="yes"
-
--fi;
-+fi
-+
- if test "$xpm_prefix" = "yes" || test "$xpm_prefix" = "no"; then
- xpm_libdir="$xpm_prefix"
- xpm_incdir="$xpm_prefix"
-@@ -13549,19 +15219,19 @@
- xpm_incdir="$xpm_prefix/include"
- fi
-
--# Check whether --with-xpm-lib or --without-xpm-lib was given.
-+# Check whether --with-xpm-lib was given.
- if test "${with_xpm_lib+set}" = set; then
-- withval="$with_xpm_lib"
-- xpm_libdir="$withval"
-+ withval=$with_xpm_lib; xpm_libdir="$withval"
-+
-+fi
-
--fi;
-
--# Check whether --with-xpm-include or --without-xpm-include was given.
-+# Check whether --with-xpm-include was given.
- if test "${with_xpm_include+set}" = set; then
-- withval="$with_xpm_include"
-- xpm_incdir="$withval"
-+ withval=$with_xpm_include; xpm_incdir="$withval"
-+
-+fi
-
--fi;
- fc_xpm_default=/usr/local
- if test "$xpm_libdir" = "yes"; then
- xpm_libdir="no"
-@@ -13583,8 +15253,8 @@
- xpm_h_no_x11=yes
- fi
- fi
--echo "$as_me:$LINENO: result: library $xpm_libdir, include $xpm_incdir" >&5
--echo "${ECHO_T}library $xpm_libdir, include $xpm_incdir" >&6
-+{ echo "$as_me:$LINENO: result: library $xpm_libdir, include $xpm_incdir" >&5
-+echo "${ECHO_T}library $xpm_libdir, include $xpm_incdir" >&6; }
-
-
- if test "$xpm_incdir" != "no"; then
-@@ -13609,18 +15279,17 @@
- fc_save_X_LIBS="$X_LIBS"
- X_LIBS="$X_LIBS $X_PRE_LIBS"
-
-- echo "$as_me:$LINENO: checking for XOpenDisplay in X library -lX11" >&5
--echo $ECHO_N "checking for XOpenDisplay in X library -lX11... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for XOpenDisplay in X library -lX11" >&5
-+echo $ECHO_N "checking for XOpenDisplay in X library -lX11... $ECHO_C" >&6; }
-
-
- ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'`
-- if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
-+ if { as_var=ac_cv_lib_$ac_lib_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_save_LIBS="$LIBS"
- LIBS="$X_LIBS -lX11 $X_EXTRA_LIBS $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -13643,31 +15312,39 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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 "ac_cv_lib_$ac_lib_var=yes"
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--eval "ac_cv_lib_$ac_lib_var=no"
-+ eval "ac_cv_lib_$ac_lib_var=no"
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS="$ac_save_LIBS"
-
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- ac_tr_lib=HAVE_LIB`echo X11 | sed -e 's/[^a-zA-Z0-9_]/_/g' \
- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-
-@@ -13706,25 +15383,24 @@
- fi
-
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- haveX11=no
- fi
-
- if test "x$haveX11" != "xno"; then
-
-- echo "$as_me:$LINENO: checking for XShapeCombineMask in X library -lXext" >&5
--echo $ECHO_N "checking for XShapeCombineMask in X library -lXext... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for XShapeCombineMask in X library -lXext" >&5
-+echo $ECHO_N "checking for XShapeCombineMask in X library -lXext... $ECHO_C" >&6; }
-
-
- ac_lib_var=`echo Xext'_'XShapeCombineMask | sed 'y%./+-%__p_%'`
-- if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
-+ if { as_var=ac_cv_lib_$ac_lib_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_save_LIBS="$LIBS"
- LIBS="$X_LIBS -lXext $X_EXTRA_LIBS $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -13747,31 +15423,39 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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 "ac_cv_lib_$ac_lib_var=yes"
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--eval "ac_cv_lib_$ac_lib_var=no"
-+ eval "ac_cv_lib_$ac_lib_var=no"
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS="$ac_save_LIBS"
-
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- ac_tr_lib=HAVE_LIB`echo Xext | sed -e 's/[^a-zA-Z0-9_]/_/g' \
- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-
-@@ -13810,8 +15494,8 @@
- fi
-
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-@@ -13819,18 +15503,17 @@
- X_LIBS="$fc_save_X_LIBS"
-
-
-- echo "$as_me:$LINENO: checking for main in X library -lXt" >&5
--echo $ECHO_N "checking for main in X library -lXt... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for main in X library -lXt" >&5
-+echo $ECHO_N "checking for main in X library -lXt... $ECHO_C" >&6; }
-
-
- ac_lib_var=`echo Xt'_'main | sed 'y%./+-%__p_%'`
-- if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
-+ if { as_var=ac_cv_lib_$ac_lib_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_save_LIBS="$LIBS"
- LIBS="$X_LIBS -lXt $X_EXTRA_LIBS $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -13847,31 +15530,39 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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 "ac_cv_lib_$ac_lib_var=yes"
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--eval "ac_cv_lib_$ac_lib_var=no"
-+ eval "ac_cv_lib_$ac_lib_var=no"
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS="$ac_save_LIBS"
-
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- ac_tr_lib=HAVE_LIB`echo Xt | sed -e 's/[^a-zA-Z0-9_]/_/g' \
- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-
-@@ -13910,23 +15601,22 @@
- fi
-
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-- echo "$as_me:$LINENO: checking for main in X library -lXmu" >&5
--echo $ECHO_N "checking for main in X library -lXmu... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for main in X library -lXmu" >&5
-+echo $ECHO_N "checking for main in X library -lXmu... $ECHO_C" >&6; }
-
-
- ac_lib_var=`echo Xmu'_'main | sed 'y%./+-%__p_%'`
-- if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
-+ if { as_var=ac_cv_lib_$ac_lib_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_save_LIBS="$LIBS"
- LIBS="$X_LIBS -lXmu $X_EXTRA_LIBS $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -13943,31 +15633,39 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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 "ac_cv_lib_$ac_lib_var=yes"
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--eval "ac_cv_lib_$ac_lib_var=no"
-+ eval "ac_cv_lib_$ac_lib_var=no"
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS="$ac_save_LIBS"
-
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- ac_tr_lib=HAVE_LIB`echo Xmu | sed -e 's/[^a-zA-Z0-9_]/_/g' \
- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-
-@@ -14006,23 +15704,22 @@
- fi
-
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-- echo "$as_me:$LINENO: checking for XpmReadFileToPixmap in X library -lXpm" >&5
--echo $ECHO_N "checking for XpmReadFileToPixmap in X library -lXpm... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for XpmReadFileToPixmap in X library -lXpm" >&5
-+echo $ECHO_N "checking for XpmReadFileToPixmap in X library -lXpm... $ECHO_C" >&6; }
-
-
- ac_lib_var=`echo Xpm'_'XpmReadFileToPixmap | sed 'y%./+-%__p_%'`
-- if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
-+ if { as_var=ac_cv_lib_$ac_lib_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_save_LIBS="$LIBS"
- LIBS="$X_LIBS -lXpm $X_EXTRA_LIBS $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -14045,31 +15742,39 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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 "ac_cv_lib_$ac_lib_var=yes"
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--eval "ac_cv_lib_$ac_lib_var=no"
-+ eval "ac_cv_lib_$ac_lib_var=no"
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS="$ac_save_LIBS"
-
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- ac_tr_lib=HAVE_LIB`echo Xpm | sed -e 's/[^a-zA-Z0-9_]/_/g' \
- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-
-@@ -14108,26 +15813,25 @@
- fi
-
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- haveXpm=no
- fi
-
- if test "x$haveXpm" != "xno"; then
- if test -n "$WITH_XAW3D"; then
-
-- echo "$as_me:$LINENO: checking for main in X library -lXaw3d" >&5
--echo $ECHO_N "checking for main in X library -lXaw3d... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for main in X library -lXaw3d" >&5
-+echo $ECHO_N "checking for main in X library -lXaw3d... $ECHO_C" >&6; }
-
-
- ac_lib_var=`echo Xaw3d'_'main | sed 'y%./+-%__p_%'`
-- if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
-+ if { as_var=ac_cv_lib_$ac_lib_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_save_LIBS="$LIBS"
- LIBS="$X_LIBS -lXaw3d $X_EXTRA_LIBS $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -14144,31 +15848,39 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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 "ac_cv_lib_$ac_lib_var=yes"
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--eval "ac_cv_lib_$ac_lib_var=no"
-+ eval "ac_cv_lib_$ac_lib_var=no"
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS="$ac_save_LIBS"
-
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- ac_tr_lib=HAVE_LIB`echo Xaw3d | sed -e 's/[^a-zA-Z0-9_]/_/g' \
- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-
-@@ -14207,8 +15919,8 @@
- fi
-
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- { { echo "$as_me:$LINENO: error: did not find Xaw3d library" >&5
- echo "$as_me: error: did not find Xaw3d library" >&2;}
- { (exit 1); exit 1; }; }
-@@ -14216,18 +15928,17 @@
-
- elif test "$client" = "xaw"; then
-
-- echo "$as_me:$LINENO: checking for main in X library -lXaw" >&5
--echo $ECHO_N "checking for main in X library -lXaw... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for main in X library -lXaw" >&5
-+echo $ECHO_N "checking for main in X library -lXaw... $ECHO_C" >&6; }
-
-
- ac_lib_var=`echo Xaw'_'main | sed 'y%./+-%__p_%'`
-- if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
-+ if { as_var=ac_cv_lib_$ac_lib_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_save_LIBS="$LIBS"
- LIBS="$X_LIBS -lXaw $X_EXTRA_LIBS $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -14244,31 +15955,39 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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 "ac_cv_lib_$ac_lib_var=yes"
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--eval "ac_cv_lib_$ac_lib_var=no"
-+ eval "ac_cv_lib_$ac_lib_var=no"
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS="$ac_save_LIBS"
-
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- ac_tr_lib=HAVE_LIB`echo Xaw | sed -e 's/[^a-zA-Z0-9_]/_/g' \
- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-
-@@ -14307,8 +16026,8 @@
- fi
-
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- { { echo "$as_me:$LINENO: error: did not find Xaw library" >&5
- echo "$as_me: error: did not find Xaw library" >&2;}
- { (exit 1); exit 1; }; }
-@@ -14316,18 +16035,17 @@
-
- else
-
-- echo "$as_me:$LINENO: checking for main in X library -lXaw3d" >&5
--echo $ECHO_N "checking for main in X library -lXaw3d... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for main in X library -lXaw3d" >&5
-+echo $ECHO_N "checking for main in X library -lXaw3d... $ECHO_C" >&6; }
-
-
- ac_lib_var=`echo Xaw3d'_'main | sed 'y%./+-%__p_%'`
-- if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
-+ if { as_var=ac_cv_lib_$ac_lib_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_save_LIBS="$LIBS"
- LIBS="$X_LIBS -lXaw3d $X_EXTRA_LIBS $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -14344,31 +16062,39 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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 "ac_cv_lib_$ac_lib_var=yes"
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--eval "ac_cv_lib_$ac_lib_var=no"
-+ eval "ac_cv_lib_$ac_lib_var=no"
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS="$ac_save_LIBS"
-
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- ac_tr_lib=HAVE_LIB`echo Xaw3d | sed -e 's/[^a-zA-Z0-9_]/_/g' \
- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-
-@@ -14407,25 +16133,24 @@
- fi
-
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- noXaw3d=1
- fi
-
- if test -n "$noXaw3d"; then
-
-- echo "$as_me:$LINENO: checking for main in X library -lXaw" >&5
--echo $ECHO_N "checking for main in X library -lXaw... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for main in X library -lXaw" >&5
-+echo $ECHO_N "checking for main in X library -lXaw... $ECHO_C" >&6; }
-
-
- ac_lib_var=`echo Xaw'_'main | sed 'y%./+-%__p_%'`
-- if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
-+ if { as_var=ac_cv_lib_$ac_lib_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_save_LIBS="$LIBS"
- LIBS="$X_LIBS -lXaw $X_EXTRA_LIBS $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -14442,31 +16167,39 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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 "ac_cv_lib_$ac_lib_var=yes"
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--eval "ac_cv_lib_$ac_lib_var=no"
-+ eval "ac_cv_lib_$ac_lib_var=no"
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS="$ac_save_LIBS"
-
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- ac_tr_lib=HAVE_LIB`echo Xaw | sed -e 's/[^a-zA-Z0-9_]/_/g' \
- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-
-@@ -14505,8 +16238,8 @@
- fi
-
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- { { echo "$as_me:$LINENO: error: did not find either Xaw or Xaw3d library" >&5
- echo "$as_me: error: did not find either Xaw or Xaw3d library" >&2;}
- { (exit 1); exit 1; }; }
-@@ -14539,10 +16272,10 @@
-
-
- if test "$client" = ftwl ; then
-- echo "$as_me:$LINENO: checking will compile gui-ftwl" >&5
--echo $ECHO_N "checking will compile gui-ftwl... $ECHO_C" >&6
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: checking will compile gui-ftwl" >&5
-+echo $ECHO_N "checking will compile gui-ftwl... $ECHO_C" >&6; }
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- CLIENT_CFLAGS="$CLIENT_CFLAGS $FTWL_CFLAGS"
- CLIENT_LIBS="$CLIENT_LIBS $FTWL_LIBS"
- fi
-@@ -14568,8 +16301,8 @@
- if test "$MINGW32" = "yes"; then
-
- pkg_failed=no
--echo "$as_me:$LINENO: checking for PNG" >&5
--echo $ECHO_N "checking for PNG... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for PNG" >&5
-+echo $ECHO_N "checking for PNG... $ECHO_C" >&6; }
-
- if test -n "$PKG_CONFIG"; then
- if test -n "$PNG_CFLAGS"; then
-@@ -14625,79 +16358,85 @@
- # Put the nasty error message in config.log where it belongs
- echo "$PNG_PKG_ERRORS" >&5
-
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-
-- echo "$as_me:$LINENO: checking for gzgets in -lz" >&5
--echo $ECHO_N "checking for gzgets in -lz... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for gzgets in -lz" >&5
-+echo $ECHO_N "checking for gzgets in -lz... $ECHO_C" >&6; }
- if test "${ac_cv_lib_z_gzgets+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lz $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char gzgets ();
- int
- main ()
- {
--gzgets ();
-+return gzgets ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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_z_gzgets=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_z_gzgets=no
-+ ac_cv_lib_z_gzgets=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+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
--echo "$as_me:$LINENO: result: $ac_cv_lib_z_gzgets" >&5
--echo "${ECHO_T}$ac_cv_lib_z_gzgets" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_z_gzgets" >&5
-+echo "${ECHO_T}$ac_cv_lib_z_gzgets" >&6; }
- if test $ac_cv_lib_z_gzgets = yes; then
-
- if test "${ac_cv_header_zlib_h+set}" = set; then
-- echo "$as_me:$LINENO: checking for zlib.h" >&5
--echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for zlib.h" >&5
-+echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_zlib_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
--echo "${ECHO_T}$ac_cv_header_zlib_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
-+echo "${ECHO_T}$ac_cv_header_zlib_h" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking zlib.h usability" >&5
--echo $ECHO_N "checking zlib.h usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking zlib.h usability" >&5
-+echo $ECHO_N "checking zlib.h usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -14707,33 +16446,38 @@
- #include <zlib.h>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_header_compiler=no
-+ ac_header_compiler=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+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 zlib.h presence" >&5
--echo $ECHO_N "checking zlib.h presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking zlib.h presence" >&5
-+echo $ECHO_N "checking zlib.h presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -14741,23 +16485,22 @@
- /* end confdefs.h. */
- #include <zlib.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+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
-- 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
-@@ -14765,111 +16508,111 @@
-
- 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
-+{ 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 in
-- yes:no )
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+ yes:no: )
- { echo "$as_me:$LINENO: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&5
- echo "$as_me: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-- { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------ ##
--## Report this to bug-autoconf at gnu.org. ##
--## ------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+ { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: zlib.h: proceeding with the compiler's result" >&2;}
-+ ac_header_preproc=yes
- ;;
-- no:yes )
-+ no:yes:* )
- { echo "$as_me:$LINENO: WARNING: zlib.h: present but cannot be compiled" >&5
- echo "$as_me: WARNING: zlib.h: present but cannot be compiled" >&2;}
-- { echo "$as_me:$LINENO: WARNING: zlib.h: check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: zlib.h: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: zlib.h: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: zlib.h: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: zlib.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: zlib.h: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: zlib.h: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: zlib.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the preprocessor's result" >&5
- echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------ ##
--## Report this to bug-autoconf at gnu.org. ##
--## ------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+ { echo "$as_me:$LINENO: WARNING: zlib.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: zlib.h: in the future, the compiler will take precedence" >&2;}
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for zlib.h" >&5
--echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for zlib.h" >&5
-+echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_zlib_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_cv_header_zlib_h=$ac_header_preproc
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
--echo "${ECHO_T}$ac_cv_header_zlib_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
-+echo "${ECHO_T}$ac_cv_header_zlib_h" >&6; }
-
- fi
- if test $ac_cv_header_zlib_h = yes; then
-
-
--echo "$as_me:$LINENO: checking for png_read_image in -lpng12" >&5
--echo $ECHO_N "checking for png_read_image in -lpng12... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for png_read_image in -lpng12" >&5
-+echo $ECHO_N "checking for png_read_image in -lpng12... $ECHO_C" >&6; }
- if test "${ac_cv_lib_png12_png_read_image+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lpng12 $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char png_read_image ();
- int
- main ()
- {
--png_read_image ();
-+return png_read_image ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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_png12_png_read_image=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_png12_png_read_image=no
-+ ac_cv_lib_png12_png_read_image=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+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
--echo "$as_me:$LINENO: result: $ac_cv_lib_png12_png_read_image" >&5
--echo "${ECHO_T}$ac_cv_lib_png12_png_read_image" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_png12_png_read_image" >&5
-+echo "${ECHO_T}$ac_cv_lib_png12_png_read_image" >&6; }
- if test $ac_cv_lib_png12_png_read_image = yes; then
- cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBPNG12 1
-@@ -14880,60 +16623,67 @@
- else
-
-
--echo "$as_me:$LINENO: checking for png_read_image in -lpng" >&5
--echo $ECHO_N "checking for png_read_image in -lpng... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for png_read_image in -lpng" >&5
-+echo $ECHO_N "checking for png_read_image in -lpng... $ECHO_C" >&6; }
- if test "${ac_cv_lib_png_png_read_image+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lpng $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char png_read_image ();
- int
- main ()
- {
--png_read_image ();
-+return png_read_image ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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_png_png_read_image=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_png_png_read_image=no
-+ ac_cv_lib_png_png_read_image=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+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
--echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_read_image" >&5
--echo "${ECHO_T}$ac_cv_lib_png_png_read_image" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_read_image" >&5
-+echo "${ECHO_T}$ac_cv_lib_png_png_read_image" >&6; }
- if test $ac_cv_lib_png_png_read_image = yes; then
- cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBPNG 1
-@@ -14958,19 +16708,18 @@
-
-
- if test "${ac_cv_header_png_h+set}" = set; then
-- echo "$as_me:$LINENO: checking for png.h" >&5
--echo $ECHO_N "checking for png.h... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for png.h" >&5
-+echo $ECHO_N "checking for png.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_png_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5
--echo "${ECHO_T}$ac_cv_header_png_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5
-+echo "${ECHO_T}$ac_cv_header_png_h" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking png.h usability" >&5
--echo $ECHO_N "checking png.h usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking png.h usability" >&5
-+echo $ECHO_N "checking png.h usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -14980,33 +16729,38 @@
- #include <png.h>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_header_compiler=no
-+ ac_header_compiler=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+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 png.h presence" >&5
--echo $ECHO_N "checking png.h presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking png.h presence" >&5
-+echo $ECHO_N "checking png.h presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -15014,23 +16768,22 @@
- /* end confdefs.h. */
- #include <png.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+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
-- 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
-@@ -15038,52 +16791,45 @@
-
- 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
-+{ 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 in
-- yes:no )
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+ yes:no: )
- { echo "$as_me:$LINENO: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&5
- echo "$as_me: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-- { echo "$as_me:$LINENO: WARNING: png.h: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: png.h: proceeding with the preprocessor's result" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------ ##
--## Report this to bug-autoconf at gnu.org. ##
--## ------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+ { echo "$as_me:$LINENO: WARNING: png.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: png.h: proceeding with the compiler's result" >&2;}
-+ ac_header_preproc=yes
- ;;
-- no:yes )
-+ no:yes:* )
- { echo "$as_me:$LINENO: WARNING: png.h: present but cannot be compiled" >&5
- echo "$as_me: WARNING: png.h: present but cannot be compiled" >&2;}
-- { echo "$as_me:$LINENO: WARNING: png.h: check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: png.h: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: png.h: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: png.h: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: png.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: png.h: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: png.h: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: png.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: png.h: proceeding with the preprocessor's result" >&5
- echo "$as_me: WARNING: png.h: proceeding with the preprocessor's result" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------ ##
--## Report this to bug-autoconf at gnu.org. ##
--## ------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+ { echo "$as_me:$LINENO: WARNING: png.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: png.h: in the future, the compiler will take precedence" >&2;}
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for png.h" >&5
--echo $ECHO_N "checking for png.h... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for png.h" >&5
-+echo $ECHO_N "checking for png.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_png_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_cv_header_png_h=$ac_header_preproc
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5
--echo "${ECHO_T}$ac_cv_header_png_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5
-+echo "${ECHO_T}$ac_cv_header_png_h" >&6; }
-
- fi
- if test $ac_cv_header_png_h = yes; then
-@@ -15135,76 +16881,82 @@
-
- elif test $pkg_failed = untried; then
-
-- echo "$as_me:$LINENO: checking for gzgets in -lz" >&5
--echo $ECHO_N "checking for gzgets in -lz... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for gzgets in -lz" >&5
-+echo $ECHO_N "checking for gzgets in -lz... $ECHO_C" >&6; }
- if test "${ac_cv_lib_z_gzgets+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lz $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char gzgets ();
- int
- main ()
- {
--gzgets ();
-+return gzgets ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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_z_gzgets=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_z_gzgets=no
-+ ac_cv_lib_z_gzgets=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+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
--echo "$as_me:$LINENO: result: $ac_cv_lib_z_gzgets" >&5
--echo "${ECHO_T}$ac_cv_lib_z_gzgets" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_z_gzgets" >&5
-+echo "${ECHO_T}$ac_cv_lib_z_gzgets" >&6; }
- if test $ac_cv_lib_z_gzgets = yes; then
-
- if test "${ac_cv_header_zlib_h+set}" = set; then
-- echo "$as_me:$LINENO: checking for zlib.h" >&5
--echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for zlib.h" >&5
-+echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_zlib_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
--echo "${ECHO_T}$ac_cv_header_zlib_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
-+echo "${ECHO_T}$ac_cv_header_zlib_h" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking zlib.h usability" >&5
--echo $ECHO_N "checking zlib.h usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking zlib.h usability" >&5
-+echo $ECHO_N "checking zlib.h usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -15214,33 +16966,38 @@
- #include <zlib.h>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_header_compiler=no
-+ ac_header_compiler=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+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 zlib.h presence" >&5
--echo $ECHO_N "checking zlib.h presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking zlib.h presence" >&5
-+echo $ECHO_N "checking zlib.h presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -15248,23 +17005,22 @@
- /* end confdefs.h. */
- #include <zlib.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+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
-- 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
-@@ -15272,111 +17028,111 @@
-
- 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
-+{ 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 in
-- yes:no )
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+ yes:no: )
- { echo "$as_me:$LINENO: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&5
- echo "$as_me: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-- { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------ ##
--## Report this to bug-autoconf at gnu.org. ##
--## ------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+ { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: zlib.h: proceeding with the compiler's result" >&2;}
-+ ac_header_preproc=yes
- ;;
-- no:yes )
-+ no:yes:* )
- { echo "$as_me:$LINENO: WARNING: zlib.h: present but cannot be compiled" >&5
- echo "$as_me: WARNING: zlib.h: present but cannot be compiled" >&2;}
-- { echo "$as_me:$LINENO: WARNING: zlib.h: check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: zlib.h: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: zlib.h: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: zlib.h: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: zlib.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: zlib.h: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: zlib.h: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: zlib.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the preprocessor's result" >&5
- echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------ ##
--## Report this to bug-autoconf at gnu.org. ##
--## ------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+ { echo "$as_me:$LINENO: WARNING: zlib.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: zlib.h: in the future, the compiler will take precedence" >&2;}
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for zlib.h" >&5
--echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for zlib.h" >&5
-+echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_zlib_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_cv_header_zlib_h=$ac_header_preproc
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
--echo "${ECHO_T}$ac_cv_header_zlib_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
-+echo "${ECHO_T}$ac_cv_header_zlib_h" >&6; }
-
- fi
- if test $ac_cv_header_zlib_h = yes; then
-
-
--echo "$as_me:$LINENO: checking for png_read_image in -lpng12" >&5
--echo $ECHO_N "checking for png_read_image in -lpng12... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for png_read_image in -lpng12" >&5
-+echo $ECHO_N "checking for png_read_image in -lpng12... $ECHO_C" >&6; }
- if test "${ac_cv_lib_png12_png_read_image+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lpng12 $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char png_read_image ();
- int
- main ()
- {
--png_read_image ();
-+return png_read_image ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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_png12_png_read_image=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_png12_png_read_image=no
-+ ac_cv_lib_png12_png_read_image=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+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
--echo "$as_me:$LINENO: result: $ac_cv_lib_png12_png_read_image" >&5
--echo "${ECHO_T}$ac_cv_lib_png12_png_read_image" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_png12_png_read_image" >&5
-+echo "${ECHO_T}$ac_cv_lib_png12_png_read_image" >&6; }
- if test $ac_cv_lib_png12_png_read_image = yes; then
- cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBPNG12 1
-@@ -15387,60 +17143,67 @@
- else
-
-
--echo "$as_me:$LINENO: checking for png_read_image in -lpng" >&5
--echo $ECHO_N "checking for png_read_image in -lpng... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for png_read_image in -lpng" >&5
-+echo $ECHO_N "checking for png_read_image in -lpng... $ECHO_C" >&6; }
- if test "${ac_cv_lib_png_png_read_image+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lpng $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char png_read_image ();
- int
- main ()
- {
--png_read_image ();
-+return png_read_image ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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_png_png_read_image=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_png_png_read_image=no
-+ ac_cv_lib_png_png_read_image=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+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
--echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_read_image" >&5
--echo "${ECHO_T}$ac_cv_lib_png_png_read_image" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_read_image" >&5
-+echo "${ECHO_T}$ac_cv_lib_png_png_read_image" >&6; }
- if test $ac_cv_lib_png_png_read_image = yes; then
- cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBPNG 1
-@@ -15465,19 +17228,18 @@
-
-
- if test "${ac_cv_header_png_h+set}" = set; then
-- echo "$as_me:$LINENO: checking for png.h" >&5
--echo $ECHO_N "checking for png.h... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for png.h" >&5
-+echo $ECHO_N "checking for png.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_png_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5
--echo "${ECHO_T}$ac_cv_header_png_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5
-+echo "${ECHO_T}$ac_cv_header_png_h" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking png.h usability" >&5
--echo $ECHO_N "checking png.h usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking png.h usability" >&5
-+echo $ECHO_N "checking png.h usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -15487,33 +17249,38 @@
- #include <png.h>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_header_compiler=no
-+ ac_header_compiler=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+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 png.h presence" >&5
--echo $ECHO_N "checking png.h presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking png.h presence" >&5
-+echo $ECHO_N "checking png.h presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -15521,23 +17288,22 @@
- /* end confdefs.h. */
- #include <png.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+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
-- 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
-@@ -15545,52 +17311,45 @@
-
- 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
-+{ 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 in
-- yes:no )
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+ yes:no: )
- { echo "$as_me:$LINENO: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&5
- echo "$as_me: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-- { echo "$as_me:$LINENO: WARNING: png.h: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: png.h: proceeding with the preprocessor's result" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------ ##
--## Report this to bug-autoconf at gnu.org. ##
--## ------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+ { echo "$as_me:$LINENO: WARNING: png.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: png.h: proceeding with the compiler's result" >&2;}
-+ ac_header_preproc=yes
- ;;
-- no:yes )
-+ no:yes:* )
- { echo "$as_me:$LINENO: WARNING: png.h: present but cannot be compiled" >&5
- echo "$as_me: WARNING: png.h: present but cannot be compiled" >&2;}
-- { echo "$as_me:$LINENO: WARNING: png.h: check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: png.h: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: png.h: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: png.h: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: png.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: png.h: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: png.h: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: png.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: png.h: proceeding with the preprocessor's result" >&5
- echo "$as_me: WARNING: png.h: proceeding with the preprocessor's result" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------ ##
--## Report this to bug-autoconf at gnu.org. ##
--## ------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+ { echo "$as_me:$LINENO: WARNING: png.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: png.h: in the future, the compiler will take precedence" >&2;}
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for png.h" >&5
--echo $ECHO_N "checking for png.h... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for png.h" >&5
-+echo $ECHO_N "checking for png.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_png_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_cv_header_png_h=$ac_header_preproc
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5
--echo "${ECHO_T}$ac_cv_header_png_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5
-+echo "${ECHO_T}$ac_cv_header_png_h" >&6; }
-
- fi
- if test $ac_cv_header_png_h = yes; then
-@@ -15643,8 +17402,8 @@
- else
- PNG_CFLAGS=$pkg_cv_PNG_CFLAGS
- PNG_LIBS=$pkg_cv_PNG_LIBS
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-
- CLIENT_LIBS="-lwsock32 -lcomctl32 -mwindows $PNG_LIBS"
- CLIENT_CFLAGS="$PNG_CFLAGS"
-@@ -15681,39 +17440,39 @@
- fi
-
-
-- # Check whether --enable-sdl-mixer or --disable-sdl-mixer was given.
-+ # Check whether --enable-sdl-mixer was given.
- if test "${enable_sdl_mixer+set}" = set; then
-- enableval="$enable_sdl_mixer"
-- USE_SOUND=no
-+ enableval=$enable_sdl_mixer; USE_SOUND=no
- else
- USE_SOUND_SDL=yes
--fi;
-+fi
-+
-
- if test "x$USE_SOUND_SDL" = "xyes"; then
- SDL_VERSION=1.0.0
-
--# Check whether --with-sdl-prefix or --without-sdl-prefix was given.
-+# Check whether --with-sdl-prefix was given.
- if test "${with_sdl_prefix+set}" = set; then
-- withval="$with_sdl_prefix"
-- sdl_prefix="$withval"
-+ withval=$with_sdl_prefix; sdl_prefix="$withval"
- else
- sdl_prefix=""
--fi;
-+fi
-
--# Check whether --with-sdl-exec-prefix or --without-sdl-exec-prefix was given.
-+
-+# Check whether --with-sdl-exec-prefix was given.
- if test "${with_sdl_exec_prefix+set}" = set; then
-- withval="$with_sdl_exec_prefix"
-- sdl_exec_prefix="$withval"
-+ withval=$with_sdl_exec_prefix; sdl_exec_prefix="$withval"
- else
- sdl_exec_prefix=""
--fi;
--# Check whether --enable-sdltest or --disable-sdltest was given.
--if test "${enable_sdltest+set}" = set; then
-- enableval="$enable_sdltest"
-+fi
-
-+# Check whether --enable-sdltest was given.
-+if test "${enable_sdltest+set}" = set; then
-+ enableval=$enable_sdltest;
- else
- enable_sdltest=yes
--fi;
-+fi
-+
-
- if test x$sdl_exec_prefix != x ; then
- sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
-@@ -15733,8 +17492,8 @@
- fi
- # Extract the first word of "sdl-config", so it can be a program name with args.
- set dummy sdl-config; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_SDL_CONFIG+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -15749,31 +17508,32 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $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_SDL_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- test -z "$ac_cv_path_SDL_CONFIG" && ac_cv_path_SDL_CONFIG="no"
- ;;
- esac
- fi
- SDL_CONFIG=$ac_cv_path_SDL_CONFIG
--
- if test -n "$SDL_CONFIG"; then
-- echo "$as_me:$LINENO: result: $SDL_CONFIG" >&5
--echo "${ECHO_T}$SDL_CONFIG" >&6
-+ { echo "$as_me:$LINENO: result: $SDL_CONFIG" >&5
-+echo "${ECHO_T}$SDL_CONFIG" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- min_sdl_version=$SDL_VERSION
-- echo "$as_me:$LINENO: checking for SDL - version >= $min_sdl_version" >&5
--echo $ECHO_N "checking for SDL - version >= $min_sdl_version... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for SDL - version >= $min_sdl_version" >&5
-+echo $ECHO_N "checking for SDL - version >= $min_sdl_version... $ECHO_C" >&6; }
- no_sdl=""
- if test "$SDL_CONFIG" = "no" ; then
- no_sdl=yes
-@@ -15799,7 +17559,6 @@
- echo $ac_n "cross compiling; assumed OK... $ac_c"
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -15865,13 +17624,22 @@
-
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+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>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (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
-@@ -15884,20 +17652,22 @@
- ( exit $ac_status )
- no_sdl=yes
- fi
--rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+
-+
- CFLAGS="$ac_save_CFLAGS"
- CXXFLAGS="$ac_save_CXXFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- fi
- if test "x$no_sdl" = x ; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- SDL=yes
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- if test "$SDL_CONFIG" = "no" ; then
- echo "*** The sdl-config script installed by SDL could not be found"
- echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
-@@ -15912,7 +17682,6 @@
- CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
- LIBS="$LIBS $SDL_LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -15936,17 +17705,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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 "*** The test program compiled, but did not run. This usually means"
- echo "*** that the run-time linker is not finding SDL or finding the wrong"
- echo "*** version of SDL. If it is not finding SDL, you'll need to set your"
-@@ -15960,12 +17735,14 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- echo "*** The test program failed to compile or link. See the file config.log for the"
-+ echo "*** The test program failed to compile or link. See the file config.log for the"
- echo "*** exact error that occured. This usually means SDL was incorrectly installed"
- echo "*** or that you have moved SDL since it was installed. In the latter case, you"
- echo "*** may want to edit the sdl-config script: $SDL_CONFIG"
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext conftest.$ac_ext
- CFLAGS="$ac_save_CFLAGS"
- CXXFLAGS="$ac_save_CXXFLAGS"
- LIBS="$ac_save_LIBS"
-@@ -15981,19 +17758,18 @@
-
- if test "x$SDL" != "xno"; then
- if test "${ac_cv_header_SDL_SDL_mixer_h+set}" = set; then
-- echo "$as_me:$LINENO: checking for SDL/SDL_mixer.h" >&5
--echo $ECHO_N "checking for SDL/SDL_mixer.h... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for SDL/SDL_mixer.h" >&5
-+echo $ECHO_N "checking for SDL/SDL_mixer.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_SDL_SDL_mixer_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_SDL_SDL_mixer_h" >&5
--echo "${ECHO_T}$ac_cv_header_SDL_SDL_mixer_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_SDL_SDL_mixer_h" >&5
-+echo "${ECHO_T}$ac_cv_header_SDL_SDL_mixer_h" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking SDL/SDL_mixer.h usability" >&5
--echo $ECHO_N "checking SDL/SDL_mixer.h usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking SDL/SDL_mixer.h usability" >&5
-+echo $ECHO_N "checking SDL/SDL_mixer.h usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -16003,33 +17779,38 @@
- #include <SDL/SDL_mixer.h>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_header_compiler=no
-+ ac_header_compiler=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+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 SDL/SDL_mixer.h presence" >&5
--echo $ECHO_N "checking SDL/SDL_mixer.h presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking SDL/SDL_mixer.h presence" >&5
-+echo $ECHO_N "checking SDL/SDL_mixer.h presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -16037,23 +17818,22 @@
- /* end confdefs.h. */
- #include <SDL/SDL_mixer.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+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
-- 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
-@@ -16061,52 +17841,45 @@
-
- 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
-+{ 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 in
-- yes:no )
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+ yes:no: )
- { echo "$as_me:$LINENO: WARNING: SDL/SDL_mixer.h: accepted by the compiler, rejected by the preprocessor!" >&5
- echo "$as_me: WARNING: SDL/SDL_mixer.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-- { echo "$as_me:$LINENO: WARNING: SDL/SDL_mixer.h: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: SDL/SDL_mixer.h: proceeding with the preprocessor's result" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------ ##
--## Report this to bug-autoconf at gnu.org. ##
--## ------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+ { echo "$as_me:$LINENO: WARNING: SDL/SDL_mixer.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: SDL/SDL_mixer.h: proceeding with the compiler's result" >&2;}
-+ ac_header_preproc=yes
- ;;
-- no:yes )
-+ no:yes:* )
- { echo "$as_me:$LINENO: WARNING: SDL/SDL_mixer.h: present but cannot be compiled" >&5
- echo "$as_me: WARNING: SDL/SDL_mixer.h: present but cannot be compiled" >&2;}
-- { echo "$as_me:$LINENO: WARNING: SDL/SDL_mixer.h: check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: SDL/SDL_mixer.h: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: SDL/SDL_mixer.h: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: SDL/SDL_mixer.h: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: SDL/SDL_mixer.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: SDL/SDL_mixer.h: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: SDL/SDL_mixer.h: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: SDL/SDL_mixer.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: SDL/SDL_mixer.h: proceeding with the preprocessor's result" >&5
- echo "$as_me: WARNING: SDL/SDL_mixer.h: proceeding with the preprocessor's result" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------ ##
--## Report this to bug-autoconf at gnu.org. ##
--## ------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+ { echo "$as_me:$LINENO: WARNING: SDL/SDL_mixer.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: SDL/SDL_mixer.h: in the future, the compiler will take precedence" >&2;}
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for SDL/SDL_mixer.h" >&5
--echo $ECHO_N "checking for SDL/SDL_mixer.h... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for SDL/SDL_mixer.h" >&5
-+echo $ECHO_N "checking for SDL/SDL_mixer.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_SDL_SDL_mixer_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_cv_header_SDL_SDL_mixer_h=$ac_header_preproc
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_SDL_SDL_mixer_h" >&5
--echo "${ECHO_T}$ac_cv_header_SDL_SDL_mixer_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_SDL_SDL_mixer_h" >&5
-+echo "${ECHO_T}$ac_cv_header_SDL_SDL_mixer_h" >&6; }
-
- fi
- if test $ac_cv_header_SDL_SDL_mixer_h = yes; then
-@@ -16116,66 +17889,73 @@
- fi
-
-
-- echo "$as_me:$LINENO: checking for Mix_OpenAudio in -lSDL_mixer" >&5
--echo $ECHO_N "checking for Mix_OpenAudio in -lSDL_mixer... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for Mix_OpenAudio in -lSDL_mixer" >&5
-+echo $ECHO_N "checking for Mix_OpenAudio in -lSDL_mixer... $ECHO_C" >&6; }
- if test "${ac_cv_lib_SDL_mixer_Mix_OpenAudio+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lSDL_mixer $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char Mix_OpenAudio ();
- int
- main ()
- {
--Mix_OpenAudio ();
-+return Mix_OpenAudio ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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_SDL_mixer_Mix_OpenAudio=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_SDL_mixer_Mix_OpenAudio=no
-+ ac_cv_lib_SDL_mixer_Mix_OpenAudio=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+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
--echo "$as_me:$LINENO: result: $ac_cv_lib_SDL_mixer_Mix_OpenAudio" >&5
--echo "${ECHO_T}$ac_cv_lib_SDL_mixer_Mix_OpenAudio" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_SDL_mixer_Mix_OpenAudio" >&5
-+echo "${ECHO_T}$ac_cv_lib_SDL_mixer_Mix_OpenAudio" >&6; }
- if test $ac_cv_lib_SDL_mixer_Mix_OpenAudio = yes; then
- SDL_mixer=yes
- fi
-
-- echo "$as_me:$LINENO: checking building SDL_mixer support" >&5
--echo $ECHO_N "checking building SDL_mixer support... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking building SDL_mixer support" >&5
-+echo $ECHO_N "checking building SDL_mixer support... $ECHO_C" >&6; }
- if test "x$SDL_mixer_h" = "x1"; then
- if test "x$SDL_mixer" = "xyes"; then
- SOUND_CFLAGS="$SOUND_CFLAGS $SDL_CFLAGS"
-@@ -16190,15 +17970,15 @@
- #define SDL 1
- _ACEOF
-
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- else
-- echo "$as_me:$LINENO: result: no, found header but not library!" >&5
--echo "${ECHO_T}no, found header but not library!" >&6
-+ { echo "$as_me:$LINENO: result: no, found header but not library!" >&5
-+echo "${ECHO_T}no, found header but not library!" >&6; }
- fi
- else
-- echo "$as_me:$LINENO: result: no, install SDL_mixer first: http://www.libsdl.org/projects/SDL_mixer/index.html" >&5
--echo "${ECHO_T}no, install SDL_mixer first: http://www.libsdl.org/projects/SDL_mixer/index.html" >&6
-+ { echo "$as_me:$LINENO: result: no, install SDL_mixer first: http://www.libsdl.org/projects/SDL_mixer/index.html" >&5
-+echo "${ECHO_T}no, install SDL_mixer first: http://www.libsdl.org/projects/SDL_mixer/index.html" >&6; }
- SDL_mixer="xno"
- fi
- fi
-@@ -16220,66 +18000,64 @@
-
- ac_ggz_prefix=""
-
--# Check whether --with-ggz-dir or --without-ggz-dir was given.
-+# Check whether --with-ggz-dir was given.
- if test "${with_ggz_dir+set}" = set; then
-- withval="$with_ggz_dir"
-- ac_ggz_prefix="$withval"
-+ withval=$with_ggz_dir; ac_ggz_prefix="$withval"
-
--fi;
-+fi
-
--if test "x$ac_ggz_prefix" != "xno" ; then
-- 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 "xdefaults" = "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 "xdefaults" = "xexport" || test "x" = "xexport"; then
-- CPPFLAGS="$CPPFLAGS -I ${ac_ggz_prefix_incdir} -I /usr/local/include"
-- LDFLAGS="$LDFLAGS -L${ac_ggz_prefix_libdir} -L/usr/local/lib"
-- fi
--
-- save_cflags=$CFLAGS
-- save_cxxflags=$CXXFLAGS
-- if test "x$GCC" = xyes; then
-+
-+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 "xdefaults" = "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 "xdefaults" = "xexport" || test "x" = "xexport"; then
-+ CPPFLAGS="$CPPFLAGS -I ${ac_ggz_prefix_incdir} -I /usr/local/include"
-+ LDFLAGS="$LDFLAGS -L${ac_ggz_prefix_libdir} -L/usr/local/lib"
-+fi
-+
-+save_cflags=$CFLAGS
-+save_cxxflags=$CXXFLAGS
-+if test "x$GCC" = xyes; then
- CFLAGS="-Wall -Werror"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -16295,29 +18073,34 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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
- sed 's/^/| /' conftest.$ac_ext >&5
-
--save_cflags="$save_cflags -fsigned-char"
-+ save_cflags="$save_cflags -fsigned-char"
- save_cxxflags="$save_cxxflags -fsigned-char"
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-- else
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -16336,63 +18119,67 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- save_cflags="$save_cflags -xchar=signed"
- save_cxxflags="$save_cxxflags -xchar=signed"
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-
-- fi
-- CFLAGS=$save_cflags
-- CXXFLAGS=$save_cxxflags
- fi
-
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+fi
-+CFLAGS=$save_cflags
-+CXXFLAGS=$save_cxxflags
-
-- if test x$ac_ggz_prefix != xno ; then
-
--echo "$as_me:$LINENO: checking for GGZ library: libggz" >&5
--echo $ECHO_N "checking for GGZ library: libggz... $ECHO_C" >&6
-+{ 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 or --without-libggz-dir was given.
-+# Check whether --with-libggz-dir was given.
- if test "${with_libggz_dir+set}" = set; then
-- withval="$with_libggz_dir"
-- ac_libggz_includes="$withval"/include
-+ withval=$with_libggz_dir; ac_libggz_includes="$withval"/include
- ac_libggz_libraries="$withval"/lib
-
--fi;
-+fi
-
--# Check whether --with-libggz-includes or --without-libggz-includes was given.
-+
-+# Check whether --with-libggz-includes was given.
- if test "${with_libggz_includes+set}" = set; then
-- withval="$with_libggz_includes"
-- ac_libggz_includes="$withval"
-+ withval=$with_libggz_includes; ac_libggz_includes="$withval"
-+
-+fi
-
--fi;
-
--# Check whether --with-libggz-libraries or --without-libggz-libraries was given.
-+# Check whether --with-libggz-libraries was given.
- if test "${with_libggz_libraries+set}" = set; then
-- withval="$with_libggz_libraries"
-- ac_libggz_libraries="$withval"
-+ withval=$with_libggz_libraries; ac_libggz_libraries="$withval"
-+
-+fi
-
--fi;
-
- if test "${ac_cv_have_libggz+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -16425,7 +18212,7 @@
- do
- for j in $libggz_header;
- do
-- echo "configure: 16428: $i/$j" >&5
-+ echo "configure: 18215: $i/$j" >&5
- if test -r "$i/$j"; then
- echo "taking that" >&5
- libggz_incdir=$i
-@@ -16478,11 +18265,11 @@
-
- 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
-+ { 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
-+ { 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
-@@ -16507,8 +18294,8 @@
- 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
-+ { 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"
-@@ -16530,9 +18317,6 @@
- fi
-
-
-- else
-- try_ggz=no
-- fi
-
- if test "$try_ggz" = "yes"; then
- # For now, version 0.0.14 is required. This could be an additional
-@@ -16561,14 +18345,13 @@
- CPPFLAGS=$LIBGGZ_INCLUDES
- export LD_LIBRARY_PATH=$save_ldlibrary_path:$libggz_libraries
-
-- 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
-+ { 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
- ac_ggz_version_check="skipped due to cross-compiling"
-
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -16584,13 +18367,22 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+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>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (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
-@@ -16603,11 +18395,13 @@
- ( exit $ac_status )
- ac_ggz_version_check=no
- fi
--rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+
-+
- if test "$ac_ggz_version_check" = "no"; then
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { 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;}
-@@ -16615,8 +18409,8 @@
- fi
- try_ggz=no
- else
-- echo "$as_me:$LINENO: result: $ac_ggz_version_check" >&5
--echo "${ECHO_T}$ac_ggz_version_check" >&6
-+ { echo "$as_me:$LINENO: result: $ac_ggz_version_check" >&5
-+echo "${ECHO_T}$ac_ggz_version_check" >&6; }
-
- fi
-
-@@ -16629,45 +18423,45 @@
-
- ggz_client="no"
-
--# Check whether --with-ggz-client or --without-ggz-client was given.
-+# Check whether --with-ggz-client was given.
- if test "${with_ggz_client+set}" = set; then
-- withval="$with_ggz_client"
-- try_ggz_client=$withval
--fi;
-+ withval=$with_ggz_client; try_ggz_client=$withval
-+fi
-+
-
- 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: ggzmod" >&5
--echo $ECHO_N "checking for GGZ library: ggzmod... $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_ggzmod_includes=NO ac_ggzmod_libraries=NO
- ggzmod_libraries=""
- ggzmod_includes=""
-
-
--# Check whether --with-ggzmod-dir or --without-ggzmod-dir was given.
-+# Check whether --with-ggzmod-dir was given.
- if test "${with_ggzmod_dir+set}" = set; then
-- withval="$with_ggzmod_dir"
-- ac_ggzmod_includes="$withval"/include
-+ withval=$with_ggzmod_dir; ac_ggzmod_includes="$withval"/include
- ac_ggzmod_libraries="$withval"/lib
-
--fi;
-+fi
-
--# Check whether --with-ggzmod-includes or --without-ggzmod-includes was given.
-+
-+# Check whether --with-ggzmod-includes was given.
- if test "${with_ggzmod_includes+set}" = set; then
-- withval="$with_ggzmod_includes"
-- ac_ggzmod_includes="$withval"
-+ withval=$with_ggzmod_includes; ac_ggzmod_includes="$withval"
-+
-+fi
-
--fi;
-
--# Check whether --with-ggzmod-libraries or --without-ggzmod-libraries was given.
-+# Check whether --with-ggzmod-libraries was given.
- if test "${with_ggzmod_libraries+set}" = set; then
-- withval="$with_ggzmod_libraries"
-- ac_ggzmod_libraries="$withval"
-+ withval=$with_ggzmod_libraries; ac_ggzmod_libraries="$withval"
-+
-+fi
-
--fi;
-
- if test "${ac_cv_have_ggzmod+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -16700,7 +18494,7 @@
- do
- for j in $ggzmod_header;
- do
-- echo "configure: 16703: $i/$j" >&5
-+ echo "configure: 18497: $i/$j" >&5
- if test -r "$i/$j"; then
- echo "taking that" >&5
- ggzmod_incdir=$i
-@@ -16753,11 +18547,11 @@
-
- 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
-+ { 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_ggzmod" >&5
--echo "${ECHO_T}$have_ggzmod" >&6
-+ { 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
-@@ -16782,8 +18576,8 @@
- else
- 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
-+ { 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; }
-
- ggzmod_libraries="$ac_ggzmod_libraries"
- ggzmod_includes="$ac_ggzmod_includes"
-@@ -16802,19 +18596,19 @@
-
- # Perform actions given by argument 1.
-
--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
-+{ 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 or --without-ggzconfig was given.
-+# Check whether --with-ggzconfig was given.
- if test "${with_ggzconfig+set}" = set; then
-- withval="$with_ggzconfig"
-- ac_ggz_config="$withval"
-+ withval=$with_ggzconfig; ac_ggz_config="$withval"
-+
-+fi
-
--fi;
-
- ac_ggz_config_orig=$ac_ggz_config
-
-@@ -16830,7 +18624,7 @@
- do
- for j in ggz-config;
- do
-- echo "configure: 16833: $i/$j" >&5
-+ echo "configure: 18627: $i/$j" >&5
- if test -r "$i/$j"; then
- echo "taking that" >&5
- ggz_config_dir=$i
-@@ -16856,8 +18650,8 @@
-
- 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
-+ { echo "$as_me:$LINENO: result: $have_ggz_config (intentionally ignored)" >&5
-+echo "${ECHO_T}$have_ggz_config (intentionally ignored)" >&6; }
- GGZ_CONFIG="true"
- ggzexecmoddir="\${libdir}/ggz"
- ggzdatadir="\${datadir}/ggz"
-@@ -16875,8 +18669,8 @@
- _ACEOF
-
- else
-- echo "$as_me:$LINENO: result: $have_ggz_config" >&5
--echo "${ECHO_T}$have_ggz_config" >&6
-+ { 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;}
-@@ -16895,8 +18689,8 @@
- fi
-
- 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
-+ { 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="\${libdir}/ggz"
- ggzdatadir="\${datadir}/ggz"
-@@ -16905,7 +18699,7 @@
-
-
- cat >>confdefs.h <<_ACEOF
--#define GGZMODULECONFDIR "${prefix}/etc"
-+#define GGZMODULECONFDIR "${sysconfdir}"
- _ACEOF
-
-
-@@ -16921,19 +18715,19 @@
- 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
-+ { 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 or --disable-noregistry was given.
-+ # Check whether --enable-noregistry was given.
- if test "${enable_noregistry+set}" = set; then
-- enableval="$enable_noregistry"
-- enable_noregistry=yes
-+ enableval=$enable_noregistry; enable_noregistry=yes
- else
- enable_noregistry=no
--fi;
-+fi
-+
-
- GGZ_CONFIG="${ggz_config}/ggz-config"
- if test "$enable_noregistry" = yes; then
-@@ -17006,35 +18800,35 @@
- if test "$ggz_client" = "yes"; then
- if test "x"gtk"" = "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
-+{ 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 or --without-ggz-gtk-dir was given.
-+# 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
-+ withval=$with_ggz_gtk_dir; ac_ggz_gtk_includes="$withval"/include
- ac_ggz_gtk_libraries="$withval"/lib
-
--fi;
-+fi
-+
-
--# Check whether --with-ggz-gtk-includes or --without-ggz-gtk-includes was given.
-+# 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"
-+ withval=$with_ggz_gtk_includes; ac_ggz_gtk_includes="$withval"
-
--fi;
-+fi
-
--# Check whether --with-ggz-gtk-libraries or --without-ggz-gtk-libraries was given.
-+
-+# 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"
-+ withval=$with_ggz_gtk_libraries; ac_ggz_gtk_libraries="$withval"
-+
-+fi
-
--fi;
-
- if test "${ac_cv_have_ggz_gtk+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -17067,7 +18861,7 @@
- do
- for j in $ggz_gtk_header;
- do
-- echo "configure: 17070: $i/$j" >&5
-+ echo "configure: 18864: $i/$j" >&5
- if test -r "$i/$j"; then
- echo "taking that" >&5
- ggz_gtk_incdir=$i
-@@ -17120,11 +18914,11 @@
-
- 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
-+ { 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
-+ { 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
-@@ -17149,8 +18943,8 @@
- 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
-+ { 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"
-@@ -17181,9 +18975,7 @@
- fi
- fi
-
--
--
--if test "$ggz_client" = "yes"; then
-+ if test "$ggz_client" = "yes"; then
- GGZ_CLIENT_TRUE=
- GGZ_CLIENT_FALSE='#'
- else
-@@ -17191,9 +18983,7 @@
- GGZ_CLIENT_FALSE=
- fi
-
--
--
--if test "$ggz_gtk" = "yes"; then
-+ if test "$ggz_gtk" = "yes"; then
- GGZ_GTK_TRUE=
- GGZ_GTK_FALSE='#'
- else
-@@ -17204,35 +18994,35 @@
-
-
-
--echo "$as_me:$LINENO: checking for GGZ library: libggz" >&5
--echo $ECHO_N "checking for GGZ library: libggz... $ECHO_C" >&6
-+{ 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 or --without-libggz-dir was given.
-+# Check whether --with-libggz-dir was given.
- if test "${with_libggz_dir+set}" = set; then
-- withval="$with_libggz_dir"
-- ac_libggz_includes="$withval"/include
-+ withval=$with_libggz_dir; ac_libggz_includes="$withval"/include
- ac_libggz_libraries="$withval"/lib
-
--fi;
-+fi
-
--# Check whether --with-libggz-includes or --without-libggz-includes was given.
-+
-+# Check whether --with-libggz-includes was given.
- if test "${with_libggz_includes+set}" = set; then
-- withval="$with_libggz_includes"
-- ac_libggz_includes="$withval"
-+ withval=$with_libggz_includes; ac_libggz_includes="$withval"
-+
-+fi
-
--fi;
-
--# Check whether --with-libggz-libraries or --without-libggz-libraries was given.
-+# Check whether --with-libggz-libraries was given.
- if test "${with_libggz_libraries+set}" = set; then
-- withval="$with_libggz_libraries"
-- ac_libggz_libraries="$withval"
-+ withval=$with_libggz_libraries; ac_libggz_libraries="$withval"
-+
-+fi
-
--fi;
-
- if test "${ac_cv_have_libggz+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -17265,7 +19055,7 @@
- do
- for j in $libggz_header;
- do
-- echo "configure: 17268: $i/$j" >&5
-+ echo "configure: 19058: $i/$j" >&5
- if test -r "$i/$j"; then
- echo "taking that" >&5
- libggz_incdir=$i
-@@ -17318,11 +19108,11 @@
-
- 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
-+ { 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
-+ { 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
-@@ -17347,8 +19137,8 @@
- 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
-+ { 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"
-@@ -17397,14 +19187,13 @@
- CPPFLAGS=$LIBGGZ_INCLUDES
- export LD_LIBRARY_PATH=$save_ldlibrary_path:$libggz_libraries
-
-- 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
-+ { 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
- ac_ggz_version_check="skipped due to cross-compiling"
-
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -17420,13 +19209,22 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+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>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (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
-@@ -17439,11 +19237,13 @@
- ( exit $ac_status )
- ac_ggz_version_check=no
- fi
--rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+
-+
- if test "$ac_ggz_version_check" = "no"; then
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { 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;}
-@@ -17451,8 +19251,8 @@
- fi
- try_ggz=no
- else
-- echo "$as_me:$LINENO: result: $ac_ggz_version_check" >&5
--echo "${ECHO_T}$ac_ggz_version_check" >&6
-+ { echo "$as_me:$LINENO: result: $ac_ggz_version_check" >&5
-+echo "${ECHO_T}$ac_ggz_version_check" >&6; }
-
- fi
-
-@@ -17465,45 +19265,45 @@
-
- ggz_server="no"
-
--# Check whether --with-ggz-server or --without-ggz-server was given.
-+# Check whether --with-ggz-server was given.
- if test "${with_ggz_server+set}" = set; then
-- withval="$with_ggz_server"
-- try_ggz_server=$withval
--fi;
-+ 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
-+{ 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 or --without-ggzdmod-dir was given.
-+# Check whether --with-ggzdmod-dir was given.
- if test "${with_ggzdmod_dir+set}" = set; then
-- withval="$with_ggzdmod_dir"
-- ac_ggzdmod_includes="$withval"/include
-+ withval=$with_ggzdmod_dir; ac_ggzdmod_includes="$withval"/include
- ac_ggzdmod_libraries="$withval"/lib
-
--fi;
-+fi
-
--# Check whether --with-ggzdmod-includes or --without-ggzdmod-includes was given.
-+
-+# Check whether --with-ggzdmod-includes was given.
- if test "${with_ggzdmod_includes+set}" = set; then
-- withval="$with_ggzdmod_includes"
-- ac_ggzdmod_includes="$withval"
-+ withval=$with_ggzdmod_includes; ac_ggzdmod_includes="$withval"
-+
-+fi
-
--fi;
-
--# Check whether --with-ggzdmod-libraries or --without-ggzdmod-libraries was given.
-+# Check whether --with-ggzdmod-libraries was given.
- if test "${with_ggzdmod_libraries+set}" = set; then
-- withval="$with_ggzdmod_libraries"
-- ac_ggzdmod_libraries="$withval"
-+ withval=$with_ggzdmod_libraries; ac_ggzdmod_libraries="$withval"
-+
-+fi
-
--fi;
-
- if test "${ac_cv_have_ggzdmod+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -17536,7 +19336,7 @@
- do
- for j in $ggzdmod_header;
- do
-- echo "configure: 17539: $i/$j" >&5
-+ echo "configure: 19339: $i/$j" >&5
- if test -r "$i/$j"; then
- echo "taking that" >&5
- ggzdmod_incdir=$i
-@@ -17589,11 +19389,11 @@
-
- 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
-+ { 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
-+ { 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
-@@ -17618,8 +19418,8 @@
- 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
-+ { 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"
-@@ -17644,21 +19444,21 @@
- fi
- if test "$ggz_server" = "yes"; then
-
--echo "$as_me:$LINENO: checking for GGZ server: ggzd" >&5
--echo $ECHO_N "checking for GGZ server: ggzd... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for GGZ server: ggzd" >&5
-+echo $ECHO_N "checking for GGZ server: ggzd... $ECHO_C" >&6; }
-
--# Check whether --with-ggzd-confdir or --without-ggzd-confdir was given.
-+# Check whether --with-ggzd-confdir was given.
- if test "${with_ggzd_confdir+set}" = set; then
-- withval="$with_ggzd_confdir"
-- ac_ggzd_confdir="$withval"
-+ withval=$with_ggzd_confdir; ac_ggzd_confdir="$withval"
-+
-+fi
-
--fi;
-
- if test "${ac_cv_have_ggzdconf+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-
-- if test "x" = "xforce"; then
-+ if test "xforce" = "xforce"; then
- if test "x$ac_ggzd_confdir" = "x"; then
- ggzdconfdirs="$ac_ggz_stdetc"
- else
-@@ -17693,28 +19493,28 @@
- eval "$ac_cv_have_ggzdconf"
-
- if test "$have_ggzdconf" != yes; then
-- if test "x" = "xignore"; then
-- echo "$as_me:$LINENO: result: $have_ggzdconf (intentionally ignored)" >&5
--echo "${ECHO_T}$have_ggzdconf (intentionally ignored)" >&6
-- elif test "x" = "xforce"; then
-+ if test "xforce" = "xignore"; then
-+ { echo "$as_me:$LINENO: result: $have_ggzdconf (intentionally ignored)" >&5
-+echo "${ECHO_T}$have_ggzdconf (intentionally ignored)" >&6; }
-+ elif test "xforce" = "xforce"; then
- if test "x$ac_ggzd_confdir" = "x"; then
-- ggzdconfdir="\${prefix}/etc/ggzd"
-+ ggzdconfdir="\${sysconfdir}/ggzd"
- else
- ggzdconfdir=$ac_ggzd_confdir
- fi
-- echo "$as_me:$LINENO: result: $have_ggzdconf (but forced to ${ggzdconfdir})" >&5
--echo "${ECHO_T}$have_ggzdconf (but forced to ${ggzdconfdir})" >&6
-+ { echo "$as_me:$LINENO: result: $have_ggzdconf (but forced to ${ggzdconfdir})" >&5
-+echo "${ECHO_T}$have_ggzdconf (but forced to ${ggzdconfdir})" >&6; }
- else
-- echo "$as_me:$LINENO: result: $have_ggzdconf" >&5
--echo "${ECHO_T}$have_ggzdconf" >&6
-- if test "x" = "x"; then
-+ { echo "$as_me:$LINENO: result: $have_ggzdconf" >&5
-+echo "${ECHO_T}$have_ggzdconf" >&6; }
-+ if test "xforce" = "x"; then
- { { echo "$as_me:$LINENO: error: GGZ server configuration not found. Please check your installation! " >&5
- echo "$as_me: error: GGZ server configuration not found. Please check your installation! " >&2;}
- { (exit 1); exit 1; }; }
- fi
-
- # Perform actions given by argument 2.
--
-+ force
- fi
- else
- prefixed=0
-@@ -17723,26 +19523,21 @@
- prefixed=1
- fi
- fi
-- if test "x$ggzdconfdir" != "x${prefix}/etc/ggzd" && test "x$prefixed" = "x1"; then
-- echo "$as_me:$LINENO: result: $have_ggzdconf ($ggzdconfdir, but using ${prefix}/etc/ggzd nevertheless)" >&5
--echo "${ECHO_T}$have_ggzdconf ($ggzdconfdir, but using ${prefix}/etc/ggzd nevertheless)" >&6
-- ggzdconfdir="\${prefix}/etc/ggzd"
-+ if test "x$ggzdconfdir" != "x${sysconfdir}/ggzd" && test "x$prefixed" = "x1"; then
-+ { echo "$as_me:$LINENO: result: $have_ggzdconf ($ggzdconfdir, but using ${sysconfdir}/ggzd nevertheless)" >&5
-+echo "${ECHO_T}$have_ggzdconf ($ggzdconfdir, but using ${sysconfdir}/ggzd nevertheless)" >&6; }
-+ ggzdconfdir="\${sysconfdir}/ggzd"
- else
-- echo "$as_me:$LINENO: result: $have_ggzdconf ($ggzdconfdir)" >&5
--echo "${ECHO_T}$have_ggzdconf ($ggzdconfdir)" >&6
-+ { echo "$as_me:$LINENO: result: $have_ggzdconf ($ggzdconfdir)" >&5
-+echo "${ECHO_T}$have_ggzdconf ($ggzdconfdir)" >&6; }
- fi
- fi
-
--if test "$have_ggzdconf" = yes || test "x" = "xforce"; then
-+if test "$have_ggzdconf" = yes || test "xforce" = "xforce"; then
-
-
- ggzddatadir=${datadir}/${PACKAGE}
-
--cat >>confdefs.h <<_ACEOF
--#define GGZDDATADIR "${ggzddatadir}"
--_ACEOF
--
--
-
- if test "x${libdir}" = 'x${exec_prefix}/lib'; then
- if test "x${exec_prefix}" = "xNONE"; then
-@@ -17765,7 +19560,7 @@
-
-
- # Perform actions given by argument 1.
--
-+ force
- fi
-
-
-@@ -17783,9 +19578,7 @@
- fi
- fi
-
--
--
--if test "$ggz_server" = "yes"; then
-+ if test "$ggz_server" = "yes"; then
- GGZ_SERVER_TRUE=
- GGZ_SERVER_FALSE='#'
- else
-@@ -17808,66 +19601,64 @@
-
- ac_ggz_prefix=""
-
--# Check whether --with-ggz-dir or --without-ggz-dir was given.
-+# Check whether --with-ggz-dir was given.
- if test "${with_ggz_dir+set}" = set; then
-- withval="$with_ggz_dir"
-- ac_ggz_prefix="$withval"
-+ withval=$with_ggz_dir; ac_ggz_prefix="$withval"
-
--fi;
-+fi
-
--if test "x$ac_ggz_prefix" != "xno" ; then
-- 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 "xdefaults" = "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 "xdefaults" = "xexport" || test "x" = "xexport"; then
-- CPPFLAGS="$CPPFLAGS -I ${ac_ggz_prefix_incdir} -I /usr/local/include"
-- LDFLAGS="$LDFLAGS -L${ac_ggz_prefix_libdir} -L/usr/local/lib"
-- fi
--
-- save_cflags=$CFLAGS
-- save_cxxflags=$CXXFLAGS
-- if test "x$GCC" = xyes; then
-+
-+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 "xdefaults" = "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 "xdefaults" = "xexport" || test "x" = "xexport"; then
-+ CPPFLAGS="$CPPFLAGS -I ${ac_ggz_prefix_incdir} -I /usr/local/include"
-+ LDFLAGS="$LDFLAGS -L${ac_ggz_prefix_libdir} -L/usr/local/lib"
-+fi
-+
-+save_cflags=$CFLAGS
-+save_cxxflags=$CXXFLAGS
-+if test "x$GCC" = xyes; then
- CFLAGS="-Wall -Werror"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -17883,29 +19674,34 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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
- sed 's/^/| /' conftest.$ac_ext >&5
-
--save_cflags="$save_cflags -fsigned-char"
-+ save_cflags="$save_cflags -fsigned-char"
- save_cxxflags="$save_cxxflags -fsigned-char"
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-- else
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -17924,63 +19720,67 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+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 -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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
- save_cflags="$save_cflags -xchar=signed"
- save_cxxflags="$save_cxxflags -xchar=signed"
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-
-- fi
-- CFLAGS=$save_cflags
-- CXXFLAGS=$save_cxxflags
- fi
-
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+fi
-+CFLAGS=$save_cflags
-+CXXFLAGS=$save_cxxflags
-
-- if test x$ac_ggz_prefix != xno ; then
-
--echo "$as_me:$LINENO: checking for GGZ library: libggz" >&5
--echo $ECHO_N "checking for GGZ library: libggz... $ECHO_C" >&6
-+{ 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 or --without-libggz-dir was given.
-+# Check whether --with-libggz-dir was given.
- if test "${with_libggz_dir+set}" = set; then
-- withval="$with_libggz_dir"
-- ac_libggz_includes="$withval"/include
-+ withval=$with_libggz_dir; ac_libggz_includes="$withval"/include
- ac_libggz_libraries="$withval"/lib
-
--fi;
-+fi
-+
-
--# Check whether --with-libggz-includes or --without-libggz-includes was given.
-+# Check whether --with-libggz-includes was given.
- if test "${with_libggz_includes+set}" = set; then
-- withval="$with_libggz_includes"
-- ac_libggz_includes="$withval"
-+ withval=$with_libggz_includes; ac_libggz_includes="$withval"
-
--fi;
-+fi
-
--# Check whether --with-libggz-libraries or --without-libggz-libraries was given.
-+
-+# Check whether --with-libggz-libraries was given.
- if test "${with_libggz_libraries+set}" = set; then
-- withval="$with_libggz_libraries"
-- ac_libggz_libraries="$withval"
-+ withval=$with_libggz_libraries; ac_libggz_libraries="$withval"
-+
-+fi
-
--fi;
-
- if test "${ac_cv_have_libggz+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -18013,7 +19813,7 @@
- do
- for j in $libggz_header;
- do
-- echo "configure: 18016: $i/$j" >&5
-+ echo "configure: 19816: $i/$j" >&5
- if test -r "$i/$j"; then
- echo "taking that" >&5
- libggz_incdir=$i
-@@ -18066,11 +19866,11 @@
-
- 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
-+ { 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
-+ { 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
-@@ -18095,8 +19895,8 @@
- 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
-+ { 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"
-@@ -18118,9 +19918,6 @@
- fi
-
-
-- else
-- try_ggz=no
-- fi
-
- if test "$try_ggz" = "yes"; then
- # For now, version 0.0.14 is required. This could be an additional
-@@ -18149,14 +19946,13 @@
- CPPFLAGS=$LIBGGZ_INCLUDES
- export LD_LIBRARY_PATH=$save_ldlibrary_path:$libggz_libraries
-
-- 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
-+ { 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
- ac_ggz_version_check="skipped due to cross-compiling"
-
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -18172,13 +19968,22 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+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>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (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
-@@ -18191,11 +19996,13 @@
- ( exit $ac_status )
- ac_ggz_version_check=no
- fi
--rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+
-+
- if test "$ac_ggz_version_check" = "no"; then
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { 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;}
-@@ -18203,8 +20010,8 @@
- fi
- try_ggz=no
- else
-- echo "$as_me:$LINENO: result: $ac_ggz_version_check" >&5
--echo "${ECHO_T}$ac_ggz_version_check" >&6
-+ { echo "$as_me:$LINENO: result: $ac_ggz_version_check" >&5
-+echo "${ECHO_T}$ac_ggz_version_check" >&6; }
-
- fi
-
-@@ -18217,45 +20024,45 @@
-
- ggz_client="no"
-
--# Check whether --with-ggz-client or --without-ggz-client was given.
-+# Check whether --with-ggz-client was given.
- if test "${with_ggz_client+set}" = set; then
-- withval="$with_ggz_client"
-- try_ggz_client=$withval
--fi;
-+ withval=$with_ggz_client; try_ggz_client=$withval
-+fi
-+
-
- 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: ggzmod" >&5
--echo $ECHO_N "checking for GGZ library: ggzmod... $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_ggzmod_includes=NO ac_ggzmod_libraries=NO
- ggzmod_libraries=""
- ggzmod_includes=""
-
-
--# Check whether --with-ggzmod-dir or --without-ggzmod-dir was given.
-+# Check whether --with-ggzmod-dir was given.
- if test "${with_ggzmod_dir+set}" = set; then
-- withval="$with_ggzmod_dir"
-- ac_ggzmod_includes="$withval"/include
-+ withval=$with_ggzmod_dir; ac_ggzmod_includes="$withval"/include
- ac_ggzmod_libraries="$withval"/lib
-
--fi;
-+fi
-+
-
--# Check whether --with-ggzmod-includes or --without-ggzmod-includes was given.
-+# Check whether --with-ggzmod-includes was given.
- if test "${with_ggzmod_includes+set}" = set; then
-- withval="$with_ggzmod_includes"
-- ac_ggzmod_includes="$withval"
-+ withval=$with_ggzmod_includes; ac_ggzmod_includes="$withval"
-
--fi;
-+fi
-
--# Check whether --with-ggzmod-libraries or --without-ggzmod-libraries was given.
-+
-+# Check whether --with-ggzmod-libraries was given.
- if test "${with_ggzmod_libraries+set}" = set; then
-- withval="$with_ggzmod_libraries"
-- ac_ggzmod_libraries="$withval"
-+ withval=$with_ggzmod_libraries; ac_ggzmod_libraries="$withval"
-+
-+fi
-
--fi;
-
- if test "${ac_cv_have_ggzmod+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -18288,7 +20095,7 @@
- do
- for j in $ggzmod_header;
- do
-- echo "configure: 18291: $i/$j" >&5
-+ echo "configure: 20098: $i/$j" >&5
- if test -r "$i/$j"; then
- echo "taking that" >&5
- ggzmod_incdir=$i
-@@ -18341,11 +20148,11 @@
-
- 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
-+ { 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_ggzmod" >&5
--echo "${ECHO_T}$have_ggzmod" >&6
-+ { 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
-@@ -18370,8 +20177,8 @@
- else
- 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
-+ { 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; }
-
- ggzmod_libraries="$ac_ggzmod_libraries"
- ggzmod_includes="$ac_ggzmod_includes"
-@@ -18390,19 +20197,19 @@
-
- # Perform actions given by argument 1.
-
--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
-+{ 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 or --without-ggzconfig was given.
-+# Check whether --with-ggzconfig was given.
- if test "${with_ggzconfig+set}" = set; then
-- withval="$with_ggzconfig"
-- ac_ggz_config="$withval"
-+ withval=$with_ggzconfig; ac_ggz_config="$withval"
-+
-+fi
-
--fi;
-
- ac_ggz_config_orig=$ac_ggz_config
-
-@@ -18418,7 +20225,7 @@
- do
- for j in ggz-config;
- do
-- echo "configure: 18421: $i/$j" >&5
-+ echo "configure: 20228: $i/$j" >&5
- if test -r "$i/$j"; then
- echo "taking that" >&5
- ggz_config_dir=$i
-@@ -18444,8 +20251,8 @@
-
- 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
-+ { echo "$as_me:$LINENO: result: $have_ggz_config (intentionally ignored)" >&5
-+echo "${ECHO_T}$have_ggz_config (intentionally ignored)" >&6; }
- GGZ_CONFIG="true"
- ggzexecmoddir="\${libdir}/ggz"
- ggzdatadir="\${datadir}/ggz"
-@@ -18463,8 +20270,8 @@
- _ACEOF
-
- else
-- echo "$as_me:$LINENO: result: $have_ggz_config" >&5
--echo "${ECHO_T}$have_ggz_config" >&6
-+ { 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;}
-@@ -18483,8 +20290,8 @@
- fi
-
- 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
-+ { 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="\${libdir}/ggz"
- ggzdatadir="\${datadir}/ggz"
-@@ -18493,7 +20300,7 @@
-
-
- cat >>confdefs.h <<_ACEOF
--#define GGZMODULECONFDIR "${prefix}/etc"
-+#define GGZMODULECONFDIR "${sysconfdir}"
- _ACEOF
-
-
-@@ -18509,19 +20316,19 @@
- 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
-+ { 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 or --disable-noregistry was given.
-+ # Check whether --enable-noregistry was given.
- if test "${enable_noregistry+set}" = set; then
-- enableval="$enable_noregistry"
-- enable_noregistry=yes
-+ enableval=$enable_noregistry; enable_noregistry=yes
- else
- enable_noregistry=no
--fi;
-+fi
-+
-
- GGZ_CONFIG="${ggz_config}/ggz-config"
- if test "$enable_noregistry" = yes; then
-@@ -18594,35 +20401,35 @@
- if test "$ggz_client" = "yes"; then
- if test "x" = "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
-+{ 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 or --without-ggz-gtk-dir was given.
-+# 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
-+ withval=$with_ggz_gtk_dir; ac_ggz_gtk_includes="$withval"/include
- ac_ggz_gtk_libraries="$withval"/lib
-
--fi;
-+fi
-
--# Check whether --with-ggz-gtk-includes or --without-ggz-gtk-includes was given.
-+
-+# 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"
-+ withval=$with_ggz_gtk_includes; ac_ggz_gtk_includes="$withval"
-+
-+fi
-
--fi;
-
--# Check whether --with-ggz-gtk-libraries or --without-ggz-gtk-libraries was given.
-+# 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"
-+ withval=$with_ggz_gtk_libraries; ac_ggz_gtk_libraries="$withval"
-+
-+fi
-
--fi;
-
- if test "${ac_cv_have_ggz_gtk+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -18655,7 +20462,7 @@
- do
- for j in $ggz_gtk_header;
- do
-- echo "configure: 18658: $i/$j" >&5
-+ echo "configure: 20465: $i/$j" >&5
- if test -r "$i/$j"; then
- echo "taking that" >&5
- ggz_gtk_incdir=$i
-@@ -18708,11 +20515,11 @@
-
- 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
-+ { 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
-+ { 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
-@@ -18737,8 +20544,8 @@
- 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
-+ { 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"
-@@ -18769,9 +20576,7 @@
- fi
- fi
-
--
--
--if test "$ggz_client" = "yes"; then
-+ if test "$ggz_client" = "yes"; then
- GGZ_CLIENT_TRUE=
- GGZ_CLIENT_FALSE='#'
- else
-@@ -18779,9 +20584,7 @@
- GGZ_CLIENT_FALSE=
- fi
-
--
--
--if test "$ggz_gtk" = "yes"; then
-+ if test "$ggz_gtk" = "yes"; then
- GGZ_GTK_TRUE=
- GGZ_GTK_FALSE='#'
- else
-@@ -18792,35 +20595,35 @@
-
-
-
--echo "$as_me:$LINENO: checking for GGZ library: libggz" >&5
--echo $ECHO_N "checking for GGZ library: libggz... $ECHO_C" >&6
-+{ 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 or --without-libggz-dir was given.
-+# Check whether --with-libggz-dir was given.
- if test "${with_libggz_dir+set}" = set; then
-- withval="$with_libggz_dir"
-- ac_libggz_includes="$withval"/include
-+ withval=$with_libggz_dir; ac_libggz_includes="$withval"/include
- ac_libggz_libraries="$withval"/lib
-
--fi;
-+fi
-+
-
--# Check whether --with-libggz-includes or --without-libggz-includes was given.
-+# Check whether --with-libggz-includes was given.
- if test "${with_libggz_includes+set}" = set; then
-- withval="$with_libggz_includes"
-- ac_libggz_includes="$withval"
-+ withval=$with_libggz_includes; ac_libggz_includes="$withval"
-
--fi;
-+fi
-
--# Check whether --with-libggz-libraries or --without-libggz-libraries was given.
-+
-+# Check whether --with-libggz-libraries was given.
- if test "${with_libggz_libraries+set}" = set; then
-- withval="$with_libggz_libraries"
-- ac_libggz_libraries="$withval"
-+ withval=$with_libggz_libraries; ac_libggz_libraries="$withval"
-+
-+fi
-
--fi;
-
- if test "${ac_cv_have_libggz+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -18853,7 +20656,7 @@
- do
- for j in $libggz_header;
- do
-- echo "configure: 18856: $i/$j" >&5
-+ echo "configure: 20659: $i/$j" >&5
- if test -r "$i/$j"; then
- echo "taking that" >&5
- libggz_incdir=$i
-@@ -18906,11 +20709,11 @@
-
- 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
-+ { 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
-+ { 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
-@@ -18935,8 +20738,8 @@
- 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
-+ { 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"
-@@ -18985,14 +20788,13 @@
- CPPFLAGS=$LIBGGZ_INCLUDES
- export LD_LIBRARY_PATH=$save_ldlibrary_path:$libggz_libraries
-
-- 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
-+ { 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
- ac_ggz_version_check="skipped due to cross-compiling"
-
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -19008,13 +20810,22 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+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>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (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
-@@ -19027,11 +20838,13 @@
- ( exit $ac_status )
- ac_ggz_version_check=no
- fi
--rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+
-+
- if test "$ac_ggz_version_check" = "no"; then
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { 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;}
-@@ -19039,8 +20852,8 @@
- fi
- try_ggz=no
- else
-- echo "$as_me:$LINENO: result: $ac_ggz_version_check" >&5
--echo "${ECHO_T}$ac_ggz_version_check" >&6
-+ { echo "$as_me:$LINENO: result: $ac_ggz_version_check" >&5
-+echo "${ECHO_T}$ac_ggz_version_check" >&6; }
-
- fi
-
-@@ -19053,45 +20866,45 @@
-
- ggz_server="no"
-
--# Check whether --with-ggz-server or --without-ggz-server was given.
-+# Check whether --with-ggz-server was given.
- if test "${with_ggz_server+set}" = set; then
-- withval="$with_ggz_server"
-- try_ggz_server=$withval
--fi;
-+ 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
-+{ 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 or --without-ggzdmod-dir was given.
-+# Check whether --with-ggzdmod-dir was given.
- if test "${with_ggzdmod_dir+set}" = set; then
-- withval="$with_ggzdmod_dir"
-- ac_ggzdmod_includes="$withval"/include
-+ withval=$with_ggzdmod_dir; ac_ggzdmod_includes="$withval"/include
- ac_ggzdmod_libraries="$withval"/lib
-
--fi;
-+fi
-+
-
--# Check whether --with-ggzdmod-includes or --without-ggzdmod-includes was given.
-+# Check whether --with-ggzdmod-includes was given.
- if test "${with_ggzdmod_includes+set}" = set; then
-- withval="$with_ggzdmod_includes"
-- ac_ggzdmod_includes="$withval"
-+ withval=$with_ggzdmod_includes; ac_ggzdmod_includes="$withval"
-
--fi;
-+fi
-
--# Check whether --with-ggzdmod-libraries or --without-ggzdmod-libraries was given.
-+
-+# Check whether --with-ggzdmod-libraries was given.
- if test "${with_ggzdmod_libraries+set}" = set; then
-- withval="$with_ggzdmod_libraries"
-- ac_ggzdmod_libraries="$withval"
-+ withval=$with_ggzdmod_libraries; ac_ggzdmod_libraries="$withval"
-+
-+fi
-
--fi;
-
- if test "${ac_cv_have_ggzdmod+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -19124,7 +20937,7 @@
- do
- for j in $ggzdmod_header;
- do
-- echo "configure: 19127: $i/$j" >&5
-+ echo "configure: 20940: $i/$j" >&5
- if test -r "$i/$j"; then
- echo "taking that" >&5
- ggzdmod_incdir=$i
-@@ -19177,11 +20990,11 @@
-
- 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
-+ { 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
-+ { 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
-@@ -19206,8 +21019,8 @@
- 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
-+ { 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"
-@@ -19232,21 +21045,21 @@
- fi
- if test "$ggz_server" = "yes"; then
-
--echo "$as_me:$LINENO: checking for GGZ server: ggzd" >&5
--echo $ECHO_N "checking for GGZ server: ggzd... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for GGZ server: ggzd" >&5
-+echo $ECHO_N "checking for GGZ server: ggzd... $ECHO_C" >&6; }
-
--# Check whether --with-ggzd-confdir or --without-ggzd-confdir was given.
-+# Check whether --with-ggzd-confdir was given.
- if test "${with_ggzd_confdir+set}" = set; then
-- withval="$with_ggzd_confdir"
-- ac_ggzd_confdir="$withval"
-+ withval=$with_ggzd_confdir; ac_ggzd_confdir="$withval"
-+
-+fi
-
--fi;
-
- if test "${ac_cv_have_ggzdconf+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-
-- if test "x" = "xforce"; then
-+ if test "xforce" = "xforce"; then
- if test "x$ac_ggzd_confdir" = "x"; then
- ggzdconfdirs="$ac_ggz_stdetc"
- else
-@@ -19281,28 +21094,28 @@
- eval "$ac_cv_have_ggzdconf"
-
- if test "$have_ggzdconf" != yes; then
-- if test "x" = "xignore"; then
-- echo "$as_me:$LINENO: result: $have_ggzdconf (intentionally ignored)" >&5
--echo "${ECHO_T}$have_ggzdconf (intentionally ignored)" >&6
-- elif test "x" = "xforce"; then
-+ if test "xforce" = "xignore"; then
-+ { echo "$as_me:$LINENO: result: $have_ggzdconf (intentionally ignored)" >&5
-+echo "${ECHO_T}$have_ggzdconf (intentionally ignored)" >&6; }
-+ elif test "xforce" = "xforce"; then
- if test "x$ac_ggzd_confdir" = "x"; then
-- ggzdconfdir="\${prefix}/etc/ggzd"
-+ ggzdconfdir="\${sysconfdir}/ggzd"
- else
- ggzdconfdir=$ac_ggzd_confdir
- fi
-- echo "$as_me:$LINENO: result: $have_ggzdconf (but forced to ${ggzdconfdir})" >&5
--echo "${ECHO_T}$have_ggzdconf (but forced to ${ggzdconfdir})" >&6
-+ { echo "$as_me:$LINENO: result: $have_ggzdconf (but forced to ${ggzdconfdir})" >&5
-+echo "${ECHO_T}$have_ggzdconf (but forced to ${ggzdconfdir})" >&6; }
- else
-- echo "$as_me:$LINENO: result: $have_ggzdconf" >&5
--echo "${ECHO_T}$have_ggzdconf" >&6
-- if test "x" = "x"; then
-+ { echo "$as_me:$LINENO: result: $have_ggzdconf" >&5
-+echo "${ECHO_T}$have_ggzdconf" >&6; }
-+ if test "xforce" = "x"; then
- { { echo "$as_me:$LINENO: error: GGZ server configuration not found. Please check your installation! " >&5
- echo "$as_me: error: GGZ server configuration not found. Please check your installation! " >&2;}
- { (exit 1); exit 1; }; }
- fi
-
- # Perform actions given by argument 2.
--
-+ force
- fi
- else
- prefixed=0
-@@ -19311,26 +21124,21 @@
- prefixed=1
- fi
- fi
-- if test "x$ggzdconfdir" != "x${prefix}/etc/ggzd" && test "x$prefixed" = "x1"; then
-- echo "$as_me:$LINENO: result: $have_ggzdconf ($ggzdconfdir, but using ${prefix}/etc/ggzd nevertheless)" >&5
--echo "${ECHO_T}$have_ggzdconf ($ggzdconfdir, but using ${prefix}/etc/ggzd nevertheless)" >&6
-- ggzdconfdir="\${prefix}/etc/ggzd"
-+ if test "x$ggzdconfdir" != "x${sysconfdir}/ggzd" && test "x$prefixed" = "x1"; then
-+ { echo "$as_me:$LINENO: result: $have_ggzdconf ($ggzdconfdir, but using ${sysconfdir}/ggzd nevertheless)" >&5
-+echo "${ECHO_T}$have_ggzdconf ($ggzdconfdir, but using ${sysconfdir}/ggzd nevertheless)" >&6; }
-+ ggzdconfdir="\${sysconfdir}/ggzd"
- else
-- echo "$as_me:$LINENO: result: $have_ggzdconf ($ggzdconfdir)" >&5
--echo "${ECHO_T}$have_ggzdconf ($ggzdconfdir)" >&6
-+ { echo "$as_me:$LINENO: result: $have_ggzdconf ($ggzdconfdir)" >&5
-+echo "${ECHO_T}$have_ggzdconf ($ggzdconfdir)" >&6; }
- fi
- fi
-
--if test "$have_ggzdconf" = yes || test "x" = "xforce"; then
-+if test "$have_ggzdconf" = yes || test "xforce" = "xforce"; then
-
-
- ggzddatadir=${datadir}/${PACKAGE}
-
--cat >>confdefs.h <<_ACEOF
--#define GGZDDATADIR "${ggzddatadir}"
--_ACEOF
--
--
-
- if test "x${libdir}" = 'x${exec_prefix}/lib'; then
- if test "x${exec_prefix}" = "xNONE"; then
-@@ -19353,7 +21161,7 @@
-
-
- # Perform actions given by argument 1.
--
-+ force
- fi
-
-
-@@ -19371,9 +21179,7 @@
- fi
- fi
-
--
--
--if test "$ggz_server" = "yes"; then
-+ if test "$ggz_server" = "yes"; then
- GGZ_SERVER_TRUE=
- GGZ_SERVER_FALSE='#'
- else
-@@ -19395,9 +21201,7 @@
-
-
-
--
--
--if test "x$SDL_mixer" = "xyes"; then
-+ if test "x$SDL_mixer" = "xyes"; then
- AUDIO_SDL_TRUE=
- AUDIO_SDL_FALSE='#'
- else
-@@ -19405,9 +21209,7 @@
- AUDIO_SDL_FALSE=
- fi
-
--
--
--if test "$gui_sources" = "gui-sdl"; then
-+ if test "$gui_sources" = "gui-sdl"; then
- CLIENT_GUI_SDL_TRUE=
- CLIENT_GUI_SDL_FALSE='#'
- else
-@@ -19415,9 +21217,7 @@
- CLIENT_GUI_SDL_FALSE=
- fi
-
--
--
--if test "$gui_sources" = "gui-gtk-2.0"; then
-+ if test "$gui_sources" = "gui-gtk-2.0"; then
- CLIENT_GUI_GTK_2_0_TRUE=
- CLIENT_GUI_GTK_2_0_FALSE='#'
- else
-@@ -19425,9 +21225,7 @@
- CLIENT_GUI_GTK_2_0_FALSE=
- fi
-
--
--
--if test "$gui_sources" = "gui-xaw"; then
-+ if test "$gui_sources" = "gui-xaw"; then
- CLIENT_GUI_XAW_TRUE=
- CLIENT_GUI_XAW_FALSE='#'
- else
-@@ -19435,9 +21233,7 @@
- CLIENT_GUI_XAW_FALSE=
- fi
-
--
--
--if test "$gui_sources" = "gui-beos"; then
-+ if test "$gui_sources" = "gui-beos"; then
- CLIENT_GUI_BEOS_TRUE=
- CLIENT_GUI_BEOS_FALSE='#'
- else
-@@ -19445,9 +21241,7 @@
- CLIENT_GUI_BEOS_FALSE=
- fi
-
--
--
--if test "$gui_sources" = "gui-stub"; then
-+ if test "$gui_sources" = "gui-stub"; then
- CLIENT_GUI_STUB_TRUE=
- CLIENT_GUI_STUB_FALSE='#'
- else
-@@ -19455,9 +21249,7 @@
- CLIENT_GUI_STUB_FALSE=
- fi
-
--
--
--if test "$gui_sources" = "gui-win32"; then
-+ if test "$gui_sources" = "gui-win32"; then
- CLIENT_GUI_WIN32_TRUE=
- CLIENT_GUI_WIN32_FALSE='#'
- else
-@@ -19465,9 +21257,7 @@
- CLIENT_GUI_WIN32_FALSE=
- fi
-
--
--
--if test "$gui_sources" = "gui-ftwl"; then
-+ if test "$gui_sources" = "gui-ftwl"; then
- CLIENT_GUI_FTWL_TRUE=
- CLIENT_GUI_FTWL_FALSE='#'
- else
-@@ -19475,9 +21265,7 @@
- CLIENT_GUI_FTWL_FALSE=
- fi
-
--
--
--if test "$ftwl" != "no"; then
-+ if test "$ftwl" != "no"; then
- FTWL_TRUE=
- FTWL_FALSE='#'
- else
-@@ -19485,9 +21273,7 @@
- FTWL_FALSE=
- fi
-
--
--
--if test "$ftwl" = "x11"; then
-+ if test "$ftwl" = "x11"; then
- FTWL_X11_TRUE=
- FTWL_X11_FALSE='#'
- else
-@@ -19495,9 +21281,7 @@
- FTWL_X11_FALSE=
- fi
-
--
--
--if test "$ftwl" = "sdl"; then
-+ if test "$ftwl" = "sdl"; then
- FTWL_SDL_TRUE=
- FTWL_SDL_FALSE='#'
- else
-@@ -19505,9 +21289,7 @@
- FTWL_SDL_FALSE=
- fi
-
--
--
--if test "$ftwl" = "opengl"; then
-+ if test "$ftwl" = "opengl"; then
- FTWL_OPENGL_TRUE=
- FTWL_OPENGL_FALSE='#'
- else
-@@ -19515,9 +21297,7 @@
- FTWL_OPENGL_FALSE=
- fi
-
--
--
--if test x"$MINGW32" = "xyes"; then
-+ if test x"$MINGW32" = "xyes"; then
- MINGW32_TRUE=
- MINGW32_FALSE='#'
- else
-@@ -19527,60 +21307,67 @@
-
-
- if test x$server = xtrue; then
-- echo "$as_me:$LINENO: checking for gethostbyaddr in -lbind" >&5
--echo $ECHO_N "checking for gethostbyaddr in -lbind... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for gethostbyaddr in -lbind" >&5
-+echo $ECHO_N "checking for gethostbyaddr in -lbind... $ECHO_C" >&6; }
- if test "${ac_cv_lib_bind_gethostbyaddr+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lbind $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char gethostbyaddr ();
- int
- main ()
- {
--gethostbyaddr ();
-+return gethostbyaddr ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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_bind_gethostbyaddr=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_bind_gethostbyaddr=no
-+ ac_cv_lib_bind_gethostbyaddr=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+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
--echo "$as_me:$LINENO: result: $ac_cv_lib_bind_gethostbyaddr" >&5
--echo "${ECHO_T}$ac_cv_lib_bind_gethostbyaddr" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_bind_gethostbyaddr" >&5
-+echo "${ECHO_T}$ac_cv_lib_bind_gethostbyaddr" >&6; }
- if test $ac_cv_lib_bind_gethostbyaddr = yes; then
- SERVER_LIBS="-lbind $SERVER_LIBS"
- fi
-@@ -19590,19 +21377,18 @@
- if test "$WITH_READLINE" = "yes" || test "$WITH_READLINE" = "maybe"; then
- HAVE_TERMCAP="";
- if test "${ac_cv_header_readline_readline_h+set}" = set; then
-- echo "$as_me:$LINENO: checking for readline/readline.h" >&5
--echo $ECHO_N "checking for readline/readline.h... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for readline/readline.h" >&5
-+echo $ECHO_N "checking for readline/readline.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_readline_readline_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_readline_readline_h" >&5
--echo "${ECHO_T}$ac_cv_header_readline_readline_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_readline_readline_h" >&5
-+echo "${ECHO_T}$ac_cv_header_readline_readline_h" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking readline/readline.h usability" >&5
--echo $ECHO_N "checking readline/readline.h usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking readline/readline.h usability" >&5
-+echo $ECHO_N "checking readline/readline.h usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -19612,33 +21398,38 @@
- #include <readline/readline.h>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_header_compiler=no
-+ ac_header_compiler=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+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 readline/readline.h presence" >&5
--echo $ECHO_N "checking readline/readline.h presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking readline/readline.h presence" >&5
-+echo $ECHO_N "checking readline/readline.h presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -19646,23 +21437,22 @@
- /* end confdefs.h. */
- #include <readline/readline.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+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
-- 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
-@@ -19670,52 +21460,45 @@
-
- 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
-+{ 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 in
-- yes:no )
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+ yes:no: )
- { echo "$as_me:$LINENO: WARNING: readline/readline.h: accepted by the compiler, rejected by the preprocessor!" >&5
- echo "$as_me: WARNING: readline/readline.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-- { echo "$as_me:$LINENO: WARNING: readline/readline.h: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: readline/readline.h: proceeding with the preprocessor's result" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------ ##
--## Report this to bug-autoconf at gnu.org. ##
--## ------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+ { echo "$as_me:$LINENO: WARNING: readline/readline.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: readline/readline.h: proceeding with the compiler's result" >&2;}
-+ ac_header_preproc=yes
- ;;
-- no:yes )
-+ no:yes:* )
- { echo "$as_me:$LINENO: WARNING: readline/readline.h: present but cannot be compiled" >&5
- echo "$as_me: WARNING: readline/readline.h: present but cannot be compiled" >&2;}
-- { echo "$as_me:$LINENO: WARNING: readline/readline.h: check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: readline/readline.h: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: readline/readline.h: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: readline/readline.h: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: readline/readline.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: readline/readline.h: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: readline/readline.h: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: readline/readline.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: readline/readline.h: proceeding with the preprocessor's result" >&5
- echo "$as_me: WARNING: readline/readline.h: proceeding with the preprocessor's result" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------ ##
--## Report this to bug-autoconf at gnu.org. ##
--## ------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+ { echo "$as_me:$LINENO: WARNING: readline/readline.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: readline/readline.h: in the future, the compiler will take precedence" >&2;}
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for readline/readline.h" >&5
--echo $ECHO_N "checking for readline/readline.h... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for readline/readline.h" >&5
-+echo $ECHO_N "checking for readline/readline.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_readline_readline_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_cv_header_readline_readline_h=$ac_header_preproc
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_readline_readline_h" >&5
--echo "${ECHO_T}$ac_cv_header_readline_readline_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_readline_readline_h" >&5
-+echo "${ECHO_T}$ac_cv_header_readline_readline_h" >&6; }
-
- fi
- if test $ac_cv_header_readline_readline_h = yes; then
-@@ -19739,120 +21522,134 @@
- Configuring server without readline support." >&2;}
- fi
- else
-- echo "$as_me:$LINENO: checking for completion_matches in -lreadline" >&5
--echo $ECHO_N "checking for completion_matches in -lreadline... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for completion_matches in -lreadline" >&5
-+echo $ECHO_N "checking for completion_matches in -lreadline... $ECHO_C" >&6; }
- if test "${ac_cv_lib_readline_completion_matches+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lreadline $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char completion_matches ();
- int
- main ()
- {
--completion_matches ();
-+return completion_matches ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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_readline_completion_matches=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_readline_completion_matches=no
-+ ac_cv_lib_readline_completion_matches=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+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
--echo "$as_me:$LINENO: result: $ac_cv_lib_readline_completion_matches" >&5
--echo "${ECHO_T}$ac_cv_lib_readline_completion_matches" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_readline_completion_matches" >&5
-+echo "${ECHO_T}$ac_cv_lib_readline_completion_matches" >&6; }
- if test $ac_cv_lib_readline_completion_matches = yes; then
- have_readline_lib=1
- else
- have_readline_lib=0
- fi
-
-- echo "$as_me:$LINENO: checking for rl_completion_matches in -lreadline" >&5
--echo $ECHO_N "checking for rl_completion_matches in -lreadline... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for rl_completion_matches in -lreadline" >&5
-+echo $ECHO_N "checking for rl_completion_matches in -lreadline... $ECHO_C" >&6; }
- if test "${ac_cv_lib_readline_rl_completion_matches+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lreadline $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char rl_completion_matches ();
- int
- main ()
- {
--rl_completion_matches ();
-+return rl_completion_matches ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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_readline_rl_completion_matches=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_readline_rl_completion_matches=no
-+ ac_cv_lib_readline_rl_completion_matches=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+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
--echo "$as_me:$LINENO: result: $ac_cv_lib_readline_rl_completion_matches" >&5
--echo "${ECHO_T}$ac_cv_lib_readline_rl_completion_matches" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_readline_rl_completion_matches" >&5
-+echo "${ECHO_T}$ac_cv_lib_readline_rl_completion_matches" >&6; }
- if test $ac_cv_lib_readline_rl_completion_matches = yes; then
- have_new_readline_lib=1
- else
-@@ -19860,288 +21657,323 @@
- fi
-
- if test "$have_readline_lib" != "1" && test "$have_new_readline_lib" != "1"; then
-- echo "$as_me:$LINENO: checking for tgetent in -ltinfo" >&5
--echo $ECHO_N "checking for tgetent in -ltinfo... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for tgetent in -ltinfo" >&5
-+echo $ECHO_N "checking for tgetent in -ltinfo... $ECHO_C" >&6; }
- if test "${ac_cv_lib_tinfo_tgetent+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-ltinfo $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char tgetent ();
- int
- main ()
- {
--tgetent ();
-+return tgetent ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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_tinfo_tgetent=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_tinfo_tgetent=no
-+ ac_cv_lib_tinfo_tgetent=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+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
--echo "$as_me:$LINENO: result: $ac_cv_lib_tinfo_tgetent" >&5
--echo "${ECHO_T}$ac_cv_lib_tinfo_tgetent" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_tinfo_tgetent" >&5
-+echo "${ECHO_T}$ac_cv_lib_tinfo_tgetent" >&6; }
- if test $ac_cv_lib_tinfo_tgetent = yes; then
- HAVE_TERMCAP="-ltinfo"
- else
-- echo "$as_me:$LINENO: checking for tgetent in -lncurses" >&5
--echo $ECHO_N "checking for tgetent in -lncurses... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for tgetent in -lncurses" >&5
-+echo $ECHO_N "checking for tgetent in -lncurses... $ECHO_C" >&6; }
- if test "${ac_cv_lib_ncurses_tgetent+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lncurses $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char tgetent ();
- int
- main ()
- {
--tgetent ();
-+return tgetent ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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_ncurses_tgetent=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_ncurses_tgetent=no
-+ ac_cv_lib_ncurses_tgetent=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+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
--echo "$as_me:$LINENO: result: $ac_cv_lib_ncurses_tgetent" >&5
--echo "${ECHO_T}$ac_cv_lib_ncurses_tgetent" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_ncurses_tgetent" >&5
-+echo "${ECHO_T}$ac_cv_lib_ncurses_tgetent" >&6; }
- if test $ac_cv_lib_ncurses_tgetent = yes; then
- HAVE_TERMCAP="-lncurses"
- else
-- echo "$as_me:$LINENO: checking for tgetent in -lcurses" >&5
--echo $ECHO_N "checking for tgetent in -lcurses... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for tgetent in -lcurses" >&5
-+echo $ECHO_N "checking for tgetent in -lcurses... $ECHO_C" >&6; }
- if test "${ac_cv_lib_curses_tgetent+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lcurses $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char tgetent ();
- int
- main ()
- {
--tgetent ();
-+return tgetent ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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_curses_tgetent=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_curses_tgetent=no
-+ ac_cv_lib_curses_tgetent=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+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
--echo "$as_me:$LINENO: result: $ac_cv_lib_curses_tgetent" >&5
--echo "${ECHO_T}$ac_cv_lib_curses_tgetent" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_curses_tgetent" >&5
-+echo "${ECHO_T}$ac_cv_lib_curses_tgetent" >&6; }
- if test $ac_cv_lib_curses_tgetent = yes; then
- HAVE_TERMCAP="-lcurses"
- else
-- echo "$as_me:$LINENO: checking for tgetent in -ltermcap" >&5
--echo $ECHO_N "checking for tgetent in -ltermcap... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for tgetent in -ltermcap" >&5
-+echo $ECHO_N "checking for tgetent in -ltermcap... $ECHO_C" >&6; }
- if test "${ac_cv_lib_termcap_tgetent+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-ltermcap $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char tgetent ();
- int
- main ()
- {
--tgetent ();
-+return tgetent ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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_termcap_tgetent=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_termcap_tgetent=no
-+ ac_cv_lib_termcap_tgetent=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+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
--echo "$as_me:$LINENO: result: $ac_cv_lib_termcap_tgetent" >&5
--echo "${ECHO_T}$ac_cv_lib_termcap_tgetent" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_termcap_tgetent" >&5
-+echo "${ECHO_T}$ac_cv_lib_termcap_tgetent" >&6; }
- if test $ac_cv_lib_termcap_tgetent = yes; then
- HAVE_TERMCAP="-ltermcap"
- else
-- echo "$as_me:$LINENO: checking for tgetent in -ltermlib" >&5
--echo $ECHO_N "checking for tgetent in -ltermlib... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for tgetent in -ltermlib" >&5
-+echo $ECHO_N "checking for tgetent in -ltermlib... $ECHO_C" >&6; }
- if test "${ac_cv_lib_termlib_tgetent+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-ltermlib $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char tgetent ();
- int
- main ()
- {
--tgetent ();
-+return tgetent ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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_termlib_tgetent=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_termlib_tgetent=no
-+ ac_cv_lib_termlib_tgetent=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+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
--echo "$as_me:$LINENO: result: $ac_cv_lib_termlib_tgetent" >&5
--echo "${ECHO_T}$ac_cv_lib_termlib_tgetent" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_termlib_tgetent" >&5
-+echo "${ECHO_T}$ac_cv_lib_termlib_tgetent" >&6; }
- if test $ac_cv_lib_termlib_tgetent = yes; then
- HAVE_TERMCAP="-ltermlib"
- fi
-@@ -20160,60 +21992,67 @@
-
-
- if test x"$HAVE_TERMCAP" != "x"; then
-- echo "$as_me:$LINENO: checking for filename_completion_function in -lreadline" >&5
--echo $ECHO_N "checking for filename_completion_function in -lreadline... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for filename_completion_function in -lreadline" >&5
-+echo $ECHO_N "checking for filename_completion_function in -lreadline... $ECHO_C" >&6; }
- if test "${ac_cv_lib_readline_filename_completion_function+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lreadline "$HAVE_TERMCAP" $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char filename_completion_function ();
- int
- main ()
- {
--filename_completion_function ();
-+return filename_completion_function ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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_readline_filename_completion_function=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_readline_filename_completion_function=no
-+ ac_cv_lib_readline_filename_completion_function=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+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
--echo "$as_me:$LINENO: result: $ac_cv_lib_readline_filename_completion_function" >&5
--echo "${ECHO_T}$ac_cv_lib_readline_filename_completion_function" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_readline_filename_completion_function" >&5
-+echo "${ECHO_T}$ac_cv_lib_readline_filename_completion_function" >&6; }
- if test $ac_cv_lib_readline_filename_completion_function = yes; then
- have_readline_lib=1
- else
-@@ -20226,60 +22065,67 @@
- echo "$as_me: WARNING: I had to manually add $HAVE_TERMCAP dependency to
- make readline library pass the test." >&2;}
- fi
-- echo "$as_me:$LINENO: checking for rl_filename_completion_function in -lreadline" >&5
--echo $ECHO_N "checking for rl_filename_completion_function in -lreadline... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for rl_filename_completion_function in -lreadline" >&5
-+echo $ECHO_N "checking for rl_filename_completion_function in -lreadline... $ECHO_C" >&6; }
- if test "${ac_cv_lib_readline_rl_filename_completion_function+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lreadline "$HAVE_TERMCAP" $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char rl_filename_completion_function ();
- int
- main ()
- {
--rl_filename_completion_function ();
-+return rl_filename_completion_function ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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_readline_rl_filename_completion_function=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_readline_rl_filename_completion_function=no
-+ ac_cv_lib_readline_rl_filename_completion_function=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+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
--echo "$as_me:$LINENO: result: $ac_cv_lib_readline_rl_filename_completion_function" >&5
--echo "${ECHO_T}$ac_cv_lib_readline_rl_filename_completion_function" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_readline_rl_filename_completion_function" >&5
-+echo "${ECHO_T}$ac_cv_lib_readline_rl_filename_completion_function" >&6; }
- if test $ac_cv_lib_readline_rl_filename_completion_function = yes; then
- have_new_readline_lib=1
- else
-@@ -20296,17 +22142,16 @@
- fi
-
- if test "$have_new_readline_lib" = "1"; then
-- echo "$as_me:$LINENO: checking whether readline works at runtime" >&5
--echo $ECHO_N "checking whether readline works at runtime... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking whether readline works at runtime" >&5
-+echo $ECHO_N "checking whether readline works at runtime... $ECHO_C" >&6; }
- templibs="$LIBS"
- LIBS="-lreadline $HAVE_TERMCAP $LIBS"
- if test "$cross_compiling" = yes; then
-- echo "$as_me:$LINENO: result: unknown: cross-compiling" >&5
--echo "${ECHO_T}unknown: cross-compiling" >&6
-+ { echo "$as_me:$LINENO: result: unknown: cross-compiling" >&5
-+echo "${ECHO_T}unknown: cross-compiling" >&6; }
- have_new_readline_lib=1
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -20351,18 +22196,27 @@
-
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+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>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (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
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- have_new_readline_lib=1
- else
- echo "$as_me: program exited with status $ac_status" >&5
-@@ -20370,12 +22224,14 @@
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ( exit $ac_status )
--echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- have_new_readline_lib=0
- fi
--rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+
-+
- LIBS="$templibs"
-
- if test "$have_new_readline_lib" = "1"; then
-@@ -20406,17 +22262,16 @@
- fi
- else
- if test "$have_readline_lib" = "1"; then
-- echo "$as_me:$LINENO: checking whether readline works at runtime" >&5
--echo $ECHO_N "checking whether readline works at runtime... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking whether readline works at runtime" >&5
-+echo $ECHO_N "checking whether readline works at runtime... $ECHO_C" >&6; }
- templibs="$LIBS"
- LIBS="-lreadline $HAVE_TERMCAP $LIBS"
- if test "$cross_compiling" = yes; then
-- echo "$as_me:$LINENO: result: unknown: cross-compiling" >&5
--echo "${ECHO_T}unknown: cross-compiling" >&6
-+ { echo "$as_me:$LINENO: result: unknown: cross-compiling" >&5
-+echo "${ECHO_T}unknown: cross-compiling" >&6; }
- have_readline_lib=1
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -20461,18 +22316,27 @@
-
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+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>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (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
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- have_readline_lib=1
- else
- echo "$as_me: program exited with status $ac_status" >&5
-@@ -20480,12 +22344,14 @@
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ( exit $ac_status )
--echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- have_readline_lib=0
- fi
--rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+
-+
- LIBS="$templibs"
-
- if test "$have_readline_lib" = "1"; then
-@@ -20528,134 +22394,150 @@
- fi
-
-
-- echo "$as_me:$LINENO: checking for pow" >&5
--echo $ECHO_N "checking for pow... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for pow" >&5
-+echo $ECHO_N "checking for pow... $ECHO_C" >&6; }
- if test "${ac_cv_func_pow+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-+/* Define pow to an innocuous variant, in case <limits.h> declares pow.
-+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
-+#define pow innocuous_pow
-+
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char pow (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+
- #ifdef __STDC__
- # include <limits.h>
- #else
- # include <assert.h>
- #endif
--/* Override any gcc2 internal prototype to avoid an error. */
-+
-+#undef pow
-+
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char pow ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_pow) || defined (__stub___pow)
-+#if defined __stub_pow || defined __stub___pow
- choke me
--#else
--char (*f) () = pow;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != pow;
-+return pow ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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_pow=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_func_pow=no
-+ ac_cv_func_pow=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+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_pow" >&5
--echo "${ECHO_T}$ac_cv_func_pow" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_pow" >&5
-+echo "${ECHO_T}$ac_cv_func_pow" >&6; }
-
- if test $ac_cv_func_pow = no; then
-- echo "$as_me:$LINENO: checking for pow in -lm" >&5
--echo $ECHO_N "checking for pow in -lm... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for pow in -lm" >&5
-+echo $ECHO_N "checking for pow in -lm... $ECHO_C" >&6; }
- if test "${ac_cv_lib_m_pow+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lm $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char pow ();
- int
- main ()
- {
--pow ();
-+return pow ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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_m_pow=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_m_pow=no
-+ ac_cv_lib_m_pow=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+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
--echo "$as_me:$LINENO: result: $ac_cv_lib_m_pow" >&5
--echo "${ECHO_T}$ac_cv_lib_m_pow" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_m_pow" >&5
-+echo "${ECHO_T}$ac_cv_lib_m_pow" >&6; }
- if test $ac_cv_lib_m_pow = yes; then
- SERVER_LIBS="$SERVER_LIBS -lm"
- else
-@@ -20669,15 +22551,14 @@
-
-
-
--echo "$as_me:$LINENO: checking for main in -lnls" >&5
--echo $ECHO_N "checking for main in -lnls... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for main in -lnls" >&5
-+echo $ECHO_N "checking for main in -lnls... $ECHO_C" >&6; }
- if test "${ac_cv_lib_nls_main+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lnls $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -20688,35 +22569,43 @@
- int
- main ()
- {
--main ();
-+return main ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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_nls_main=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_nls_main=no
-+ ac_cv_lib_nls_main=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+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
--echo "$as_me:$LINENO: result: $ac_cv_lib_nls_main" >&5
--echo "${ECHO_T}$ac_cv_lib_nls_main" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_nls_main" >&5
-+echo "${ECHO_T}$ac_cv_lib_nls_main" >&6; }
- if test $ac_cv_lib_nls_main = yes; then
- cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBNLS 1
-@@ -20727,13 +22616,12 @@
- fi
-
-
--echo "$as_me:$LINENO: checking for ANSI C header files" >&5
--echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
- if test "${ac_cv_header_stdc+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -20753,30 +22641,35 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_header_stdc=no
-+ ac_cv_header_stdc=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
- if test $ac_cv_header_stdc = yes; then
- # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -20798,7 +22691,6 @@
- if test $ac_cv_header_stdc = yes; then
- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -20823,21 +22715,21 @@
- :
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- #include <ctype.h>
-+#include <stdlib.h>
- #if ((' ' & 0x0FF) == 0x020)
- # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
- # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
- #else
- # define ISLOWER(c) \
-- (('a' <= (c) && (c) <= 'i') \
-- || ('j' <= (c) && (c) <= 'r') \
-- || ('s' <= (c) && (c) <= 'z'))
-+ (('a' <= (c) && (c) <= 'i') \
-+ || ('j' <= (c) && (c) <= 'r') \
-+ || ('s' <= (c) && (c) <= 'z'))
- # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
- #endif
-
-@@ -20848,19 +22740,28 @@
- int i;
- for (i = 0; i < 256; i++)
- if (XOR (islower (i), ISLOWER (i))
-- || toupper (i) != TOUPPER (i))
-- exit(2);
-- exit (0);
-+ || toupper (i) != TOUPPER (i))
-+ return 2;
-+ return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+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>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (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
-@@ -20873,12 +22774,14 @@
- ( exit $ac_status )
- ac_cv_header_stdc=no
- fi
--rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+
-+
- fi
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
--echo "${ECHO_T}$ac_cv_header_stdc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-+echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
- if test $ac_cv_header_stdc = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -20887,13 +22790,12 @@
-
- fi
-
--echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5
--echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5
-+echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6; }
- if test "${ac_cv_header_sys_wait_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -20902,7 +22804,7 @@
- #include <sys/types.h>
- #include <sys/wait.h>
- #ifndef WEXITSTATUS
--# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)
-+# define WEXITSTATUS(stat_val) ((unsigned int) (stat_val) >> 8)
- #endif
- #ifndef WIFEXITED
- # define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
-@@ -20919,28 +22821,34 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_header_sys_wait_h=no
-+ ac_cv_header_sys_wait_h=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5
--echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5
-+echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6; }
- if test $ac_cv_header_sys_wait_h = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -20962,20 +22870,20 @@
- sys/file.h libintl.h signal.h strings.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-- echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -20985,33 +22893,38 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_header_compiler=no
-+ ac_header_compiler=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+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 $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -21019,23 +22932,22 @@
- /* end confdefs.h. */
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+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
-- 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
-@@ -21043,52 +22955,46 @@
-
- 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
-+{ 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 in
-- yes:no )
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+ yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
- echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------ ##
--## Report this to bug-autoconf at gnu.org. ##
--## ------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+ ac_header_preproc=yes
- ;;
-- no:yes )
-+ no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
- echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------ ##
--## Report this to bug-autoconf at gnu.org. ##
--## ------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- eval "$as_ac_Header=$ac_header_preproc"
-+ eval "$as_ac_Header=\$ac_header_preproc"
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-
- fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -21100,13 +23006,12 @@
-
- done
-
--echo "$as_me:$LINENO: checking for stdbool.h that conforms to C99" >&5
--echo $ECHO_N "checking for stdbool.h that conforms to C99... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for stdbool.h that conforms to C99" >&5
-+echo $ECHO_N "checking for stdbool.h that conforms to C99... $ECHO_C" >&6; }
- if test "${ac_cv_header_stdbool_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -21115,114 +23020,161 @@
-
- #include <stdbool.h>
- #ifndef bool
--# error bool is not defined
-+ "error: bool is not defined"
- #endif
- #ifndef false
--# error false is not defined
-+ "error: false is not defined"
- #endif
- #if false
--# error false is not 0
-+ "error: false is not 0"
- #endif
- #ifndef true
--# error true is not defined
-+ "error: true is not defined"
- #endif
- #if true != 1
--# error true is not 1
-+ "error: true is not 1"
- #endif
- #ifndef __bool_true_false_are_defined
--# error __bool_true_false_are_defined is not defined
-+ "error: __bool_true_false_are_defined is not defined"
- #endif
-
-- struct s { _Bool s: 1; _Bool t; } s;
-+ struct s { _Bool s: 1; _Bool t; } s;
-
-- char a[true == 1 ? 1 : -1];
-- char b[false == 0 ? 1 : -1];
-- char c[__bool_true_false_are_defined == 1 ? 1 : -1];
-- char d[(bool) -0.5 == true ? 1 : -1];
-- bool e = &s;
-- char f[(_Bool) -0.0 == false ? 1 : -1];
-- char g[true];
-- char h[sizeof (_Bool)];
-- char i[sizeof s.t];
-+ char a[true == 1 ? 1 : -1];
-+ char b[false == 0 ? 1 : -1];
-+ char c[__bool_true_false_are_defined == 1 ? 1 : -1];
-+ char d[(bool) 0.5 == true ? 1 : -1];
-+ bool e = &s;
-+ char f[(_Bool) 0.0 == false ? 1 : -1];
-+ char g[true];
-+ char h[sizeof (_Bool)];
-+ char i[sizeof s.t];
-+ enum { j = false, k = true, l = false * true, m = true * 256 };
-+ _Bool n[m];
-+ char o[sizeof n == m * sizeof n[0] ? 1 : -1];
-+ char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
-+# if defined __xlc__ || defined __GNUC__
-+ /* Catch a bug in IBM AIX xlc compiler version 6.0.0.0
-+ reported by James Lemley on 2005-10-05; see
-+ http://lists.gnu.org/archive/html/bug-coreutils/2005-10/msg00086.html
-+ This test is not quite right, since xlc is allowed to
-+ reject this program, as the initializer for xlcbug is
-+ not one of the forms that C requires support for.
-+ However, doing the test right would require a runtime
-+ test, and that would make cross-compilation harder.
-+ Let us hope that IBM fixes the xlc bug, and also adds
-+ support for this kind of constant expression. In the
-+ meantime, this test will reject xlc, which is OK, since
-+ our stdbool.h substitute should suffice. We also test
-+ this with GCC, where it should work, to detect more
-+ quickly whether someone messes up the test in the
-+ future. */
-+ char digs[] = "0123456789";
-+ int xlcbug = 1 / (&(digs + 5)[-2 + (bool) 1] == &digs[4] ? 1 : -1);
-+# endif
-+ /* Catch a bug in an HP-UX C compiler. See
-+ http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
-+ http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
-+ */
-+ _Bool q = true;
-+ _Bool *pq = &q;
-
- int
- main ()
- {
-- return !a + !b + !c + !d + !e + !f + !g + !h + !i;
-+
-+ *pq |= q;
-+ *pq |= ! q;
-+ /* Refer to every declared value, to avoid compiler optimizations. */
-+ return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l
-+ + !m + !n + !o + !p + !q + !pq);
-+
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_header_stdbool_h=no
-+ ac_cv_header_stdbool_h=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_stdbool_h" >&5
--echo "${ECHO_T}$ac_cv_header_stdbool_h" >&6
--echo "$as_me:$LINENO: checking for _Bool" >&5
--echo $ECHO_N "checking for _Bool... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_stdbool_h" >&5
-+echo "${ECHO_T}$ac_cv_header_stdbool_h" >&6; }
-+{ echo "$as_me:$LINENO: checking for _Bool" >&5
-+echo $ECHO_N "checking for _Bool... $ECHO_C" >&6; }
- if test "${ac_cv_type__Bool+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+typedef _Bool ac__type_new_;
- int
- main ()
- {
--if ((_Bool *) 0)
-+if ((ac__type_new_ *) 0)
- return 0;
--if (sizeof (_Bool))
-+if (sizeof (ac__type_new_))
- return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_type__Bool=no
-+ ac_cv_type__Bool=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type__Bool" >&5
--echo "${ECHO_T}$ac_cv_type__Bool" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type__Bool" >&5
-+echo "${ECHO_T}$ac_cv_type__Bool" >&6; }
- if test $ac_cv_type__Bool = yes; then
-
- cat >>confdefs.h <<_ACEOF
-@@ -21257,20 +23209,20 @@
- sys/uio.h termios.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-- echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -21280,33 +23232,38 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_header_compiler=no
-+ ac_header_compiler=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+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 $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -21314,23 +23271,22 @@
- /* end confdefs.h. */
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+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
-- 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
-@@ -21338,52 +23294,46 @@
-
- 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
-+{ 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 in
-- yes:no )
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+ yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
- echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------ ##
--## Report this to bug-autoconf at gnu.org. ##
--## ------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+ ac_header_preproc=yes
- ;;
-- no:yes )
-+ no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
- echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------ ##
--## Report this to bug-autoconf at gnu.org. ##
--## ------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- eval "$as_ac_Header=$ac_header_preproc"
-+ eval "$as_ac_Header=\$ac_header_preproc"
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-
- fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -21400,19 +23350,18 @@
- fc_save_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $CLIENT_CFLAGS"
- if test "${ac_cv_header_X11_xpm_h+set}" = set; then
-- echo "$as_me:$LINENO: checking for X11/xpm.h" >&5
--echo $ECHO_N "checking for X11/xpm.h... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for X11/xpm.h" >&5
-+echo $ECHO_N "checking for X11/xpm.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_X11_xpm_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_X11_xpm_h" >&5
--echo "${ECHO_T}$ac_cv_header_X11_xpm_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_xpm_h" >&5
-+echo "${ECHO_T}$ac_cv_header_X11_xpm_h" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking X11/xpm.h usability" >&5
--echo $ECHO_N "checking X11/xpm.h usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking X11/xpm.h usability" >&5
-+echo $ECHO_N "checking X11/xpm.h usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -21422,33 +23371,38 @@
- #include <X11/xpm.h>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_header_compiler=no
-+ ac_header_compiler=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+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 X11/xpm.h presence" >&5
--echo $ECHO_N "checking X11/xpm.h presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking X11/xpm.h presence" >&5
-+echo $ECHO_N "checking X11/xpm.h presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -21456,23 +23410,22 @@
- /* end confdefs.h. */
- #include <X11/xpm.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+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
-- 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
-@@ -21480,52 +23433,45 @@
-
- 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
-+{ 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 in
-- yes:no )
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+ yes:no: )
- { echo "$as_me:$LINENO: WARNING: X11/xpm.h: accepted by the compiler, rejected by the preprocessor!" >&5
- echo "$as_me: WARNING: X11/xpm.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-- { echo "$as_me:$LINENO: WARNING: X11/xpm.h: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: X11/xpm.h: proceeding with the preprocessor's result" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------ ##
--## Report this to bug-autoconf at gnu.org. ##
--## ------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+ { echo "$as_me:$LINENO: WARNING: X11/xpm.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: X11/xpm.h: proceeding with the compiler's result" >&2;}
-+ ac_header_preproc=yes
- ;;
-- no:yes )
-+ no:yes:* )
- { echo "$as_me:$LINENO: WARNING: X11/xpm.h: present but cannot be compiled" >&5
- echo "$as_me: WARNING: X11/xpm.h: present but cannot be compiled" >&2;}
-- { echo "$as_me:$LINENO: WARNING: X11/xpm.h: check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: X11/xpm.h: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: X11/xpm.h: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: X11/xpm.h: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: X11/xpm.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: X11/xpm.h: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: X11/xpm.h: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: X11/xpm.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: X11/xpm.h: proceeding with the preprocessor's result" >&5
- echo "$as_me: WARNING: X11/xpm.h: proceeding with the preprocessor's result" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------ ##
--## Report this to bug-autoconf at gnu.org. ##
--## ------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+ { echo "$as_me:$LINENO: WARNING: X11/xpm.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: X11/xpm.h: in the future, the compiler will take precedence" >&2;}
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for X11/xpm.h" >&5
--echo $ECHO_N "checking for X11/xpm.h... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for X11/xpm.h" >&5
-+echo $ECHO_N "checking for X11/xpm.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_X11_xpm_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_cv_header_X11_xpm_h=$ac_header_preproc
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_X11_xpm_h" >&5
--echo "${ECHO_T}$ac_cv_header_X11_xpm_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_xpm_h" >&5
-+echo "${ECHO_T}$ac_cv_header_X11_xpm_h" >&6; }
-
- fi
- if test $ac_cv_header_X11_xpm_h = yes; then
-@@ -21540,13 +23486,12 @@
- CPPFLAGS="$fc_save_CPPFLAGS"
- fi
-
--echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
--echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
-+echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; }
- if test "${ac_cv_c_const+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -21560,10 +23505,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};
-@@ -21572,16 +23517,17 @@
- 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;
-
- *t++ = 0;
-+ if (s) return 0;
- }
- { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */
- int x[] = {25, 17};
-@@ -21600,7 +23546,9 @@
- }
- { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
- const int foo = 10;
-+ if (!foo) return 0;
- }
-+ return !cs[0] && !zero.x;
- #endif
-
- ;
-@@ -21608,28 +23556,34 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_c_const=no
-+ ac_cv_c_const=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
--echo "${ECHO_T}$ac_cv_c_const" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
-+echo "${ECHO_T}$ac_cv_c_const" >&6; }
- if test $ac_cv_c_const = no; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -21638,13 +23592,12 @@
-
- fi
-
--echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
--echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
-+echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6; }
- if test "${ac_cv_header_time+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -21664,28 +23617,34 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_header_time=no
-+ ac_cv_header_time=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
--echo "${ECHO_T}$ac_cv_header_time" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
-+echo "${ECHO_T}$ac_cv_header_time" >&6; }
- if test $ac_cv_header_time = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -21694,13 +23653,12 @@
-
- fi
-
--echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5
--echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5
-+echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6; }
- if test "${ac_cv_struct_tm+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -21712,34 +23670,42 @@
- int
- main ()
- {
--struct tm *tp; tp->tm_sec;
-+struct tm tm;
-+ int *p = &tm.tm_sec;
-+ return !p;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_struct_tm=time.h
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_struct_tm=sys/time.h
-+ ac_cv_struct_tm=sys/time.h
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5
--echo "${ECHO_T}$ac_cv_struct_tm" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5
-+echo "${ECHO_T}$ac_cv_struct_tm" >&6; }
- if test $ac_cv_struct_tm = sys/time.h; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -21748,13 +23714,12 @@
-
- fi
-
--echo "$as_me:$LINENO: checking for socklen_t" >&5
--echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for socklen_t" >&5
-+echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6; }
- if test "${ac_cv_type_socklen_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -21764,40 +23729,47 @@
- #include <sys/socket.h>
-
-
-+typedef socklen_t ac__type_new_;
- int
- main ()
- {
--if ((socklen_t *) 0)
-+if ((ac__type_new_ *) 0)
- return 0;
--if (sizeof (socklen_t))
-+if (sizeof (ac__type_new_))
- return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_type_socklen_t=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_type_socklen_t=no
-+ ac_cv_type_socklen_t=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_socklen_t" >&5
--echo "${ECHO_T}$ac_cv_type_socklen_t" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_socklen_t" >&5
-+echo "${ECHO_T}$ac_cv_type_socklen_t" >&6; }
- if test $ac_cv_type_socklen_t = yes; then
-
- cat >>confdefs.h <<_ACEOF
-@@ -21808,13 +23780,12 @@
- fi
-
-
--echo "$as_me:$LINENO: checking return type of signal handlers" >&5
--echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking return type of signal handlers" >&5
-+echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6; }
- if test "${ac_cv_type_signal+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -21822,99 +23793,103 @@
- /* end confdefs.h. */
- #include <sys/types.h>
- #include <signal.h>
--#ifdef signal
--# undef signal
--#endif
--#ifdef __cplusplus
--extern "C" void (*signal (int, void (*)(int)))(int);
--#else
--void (*signal ()) ();
--#endif
-
- int
- main ()
- {
--int i;
-+return *(signal (0, 0)) (0) == 1;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; then
-- ac_cv_type_signal=void
-+ (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
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_type_signal=int
-+ ac_cv_type_signal=void
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
--echo "${ECHO_T}$ac_cv_type_signal" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
-+echo "${ECHO_T}$ac_cv_type_signal" >&6; }
-
- cat >>confdefs.h <<_ACEOF
- #define RETSIGTYPE $ac_cv_type_signal
- _ACEOF
-
-
--echo "$as_me:$LINENO: checking for pid_t" >&5
--echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for pid_t" >&5
-+echo $ECHO_N "checking for pid_t... $ECHO_C" >&6; }
- if test "${ac_cv_type_pid_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+typedef pid_t ac__type_new_;
- int
- main ()
- {
--if ((pid_t *) 0)
-+if ((ac__type_new_ *) 0)
- return 0;
--if (sizeof (pid_t))
-+if (sizeof (ac__type_new_))
- return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_type_pid_t=no
-+ ac_cv_type_pid_t=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
--echo "${ECHO_T}$ac_cv_type_pid_t" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
-+echo "${ECHO_T}$ac_cv_type_pid_t" >&6; }
- if test $ac_cv_type_pid_t = yes; then
- :
- else
-@@ -21926,24 +23901,23 @@
- fi
-
-
--
--for ac_header in unistd.h vfork.h
-+for ac_header in vfork.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-- echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -21953,33 +23927,38 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_header_compiler=no
-+ ac_header_compiler=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+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 $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -21987,23 +23966,22 @@
- /* end confdefs.h. */
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+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
-- 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
-@@ -22011,52 +23989,46 @@
-
- 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
-+{ 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 in
-- yes:no )
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+ yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
- echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------ ##
--## Report this to bug-autoconf at gnu.org. ##
--## ------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+ ac_header_preproc=yes
- ;;
-- no:yes )
-+ no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
- echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------ ##
--## Report this to bug-autoconf at gnu.org. ##
--## ------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- eval "$as_ac_Header=$ac_header_preproc"
-+ eval "$as_ac_Header=\$ac_header_preproc"
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-
- fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -22073,78 +24045,88 @@
- for ac_func in fork vfork
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
-+#define $ac_func innocuous_$ac_func
-+
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+
- #ifdef __STDC__
- # include <limits.h>
- #else
- # include <assert.h>
- #endif
--/* Override any gcc2 internal prototype to avoid an error. */
-+
-+#undef $ac_func
-+
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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
- sed 's/^/| /' conftest.$ac_ext >&5
-
--eval "$as_ac_var=no"
-+ eval "$as_ac_var=no"
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -22154,8 +24136,8 @@
- done
-
- if test "x$ac_cv_func_fork" = xyes; then
-- echo "$as_me:$LINENO: checking for working fork" >&5
--echo $ECHO_N "checking for working fork... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for working fork" >&5
-+echo $ECHO_N "checking for working fork... $ECHO_C" >&6; }
- if test "${ac_cv_func_fork_works+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -22163,27 +24145,40 @@
- ac_cv_func_fork_works=cross
- else
- cat >conftest.$ac_ext <<_ACEOF
--/* By Ruediger Kuhlmann. */
-- #include <sys/types.h>
-- #if HAVE_UNISTD_H
-- # include <unistd.h>
-- #endif
-- /* Some systems only have a dummy stub for fork() */
-- int main ()
-- {
-- if (fork() < 0)
-- exit (1);
-- exit (0);
-- }
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+int
-+main ()
-+{
-+
-+ /* By Ruediger Kuhlmann. */
-+ return fork () < 0;
-+
-+ ;
-+ return 0;
-+}
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+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>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (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
-@@ -22196,11 +24191,13 @@
- ( exit $ac_status )
- ac_cv_func_fork_works=no
- fi
--rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+
-+
- fi
--echo "$as_me:$LINENO: result: $ac_cv_func_fork_works" >&5
--echo "${ECHO_T}$ac_cv_func_fork_works" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_fork_works" >&5
-+echo "${ECHO_T}$ac_cv_func_fork_works" >&6; }
-
- else
- ac_cv_func_fork_works=$ac_cv_func_fork
-@@ -22220,8 +24217,8 @@
- fi
- ac_cv_func_vfork_works=$ac_cv_func_vfork
- if test "x$ac_cv_func_vfork" = xyes; then
-- echo "$as_me:$LINENO: checking for working vfork" >&5
--echo $ECHO_N "checking for working vfork... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for working vfork" >&5
-+echo $ECHO_N "checking for working vfork... $ECHO_C" >&6; }
- if test "${ac_cv_func_vfork_works+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -22229,22 +24226,15 @@
- ac_cv_func_vfork_works=cross
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- /* Thanks to Paul Eggert for this test. */
--#include <stdio.h>
--#include <stdlib.h>
--#include <sys/types.h>
--#include <sys/stat.h>
-+$ac_includes_default
- #include <sys/wait.h>
--#if HAVE_UNISTD_H
--# include <unistd.h>
--#endif
--#if HAVE_VFORK_H
-+#ifdef HAVE_VFORK_H
- # include <vfork.h>
- #endif
- /* On some sparc systems, changes by the child to local and incoming
-@@ -22315,7 +24305,7 @@
-
- while (wait(&status) != child)
- ;
-- exit(
-+ return (
- /* Was there some problem with vforking? */
- child < 0
-
-@@ -22332,13 +24322,22 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+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>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (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
-@@ -22351,15 +24350,17 @@
- ( exit $ac_status )
- ac_cv_func_vfork_works=no
- fi
--rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+
-+
- fi
--echo "$as_me:$LINENO: result: $ac_cv_func_vfork_works" >&5
--echo "${ECHO_T}$ac_cv_func_vfork_works" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_vfork_works" >&5
-+echo "${ECHO_T}$ac_cv_func_vfork_works" >&6; }
-
- fi;
- if test "x$ac_cv_func_fork_works" = xcross; then
-- ac_cv_func_vfork_works=ac_cv_func_vfork
-+ ac_cv_func_vfork_works=$ac_cv_func_vfork
- { echo "$as_me:$LINENO: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&5
- echo "$as_me: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&2;}
- fi
-@@ -22385,8 +24386,8 @@
-
- fi
-
--echo "$as_me:$LINENO: checking for working strcoll" >&5
--echo $ECHO_N "checking for working strcoll... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for working strcoll" >&5
-+echo $ECHO_N "checking for working strcoll... $ECHO_C" >&6; }
- if test "${ac_cv_func_strcoll_works+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -22394,7 +24395,6 @@
- ac_cv_func_strcoll_works=no
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -22404,7 +24404,7 @@
- int
- main ()
- {
--exit (strcoll ("abc", "def") >= 0 ||
-+return (strcoll ("abc", "def") >= 0 ||
- strcoll ("ABC", "DEF") >= 0 ||
- strcoll ("123", "456") >= 0)
- ;
-@@ -22412,13 +24412,22 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+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>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (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
-@@ -22431,11 +24440,13 @@
- ( exit $ac_status )
- ac_cv_func_strcoll_works=no
- fi
--rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+
-+
- fi
--echo "$as_me:$LINENO: result: $ac_cv_func_strcoll_works" >&5
--echo "${ECHO_T}$ac_cv_func_strcoll_works" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_strcoll_works" >&5
-+echo "${ECHO_T}$ac_cv_func_strcoll_works" >&6; }
- if test $ac_cv_func_strcoll_works = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -22448,155 +24459,174 @@
- for ac_func in vprintf
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
-+#define $ac_func innocuous_$ac_func
-+
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+
- #ifdef __STDC__
- # include <limits.h>
- #else
- # include <assert.h>
- #endif
--/* Override any gcc2 internal prototype to avoid an error. */
-+
-+#undef $ac_func
-+
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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
- sed 's/^/| /' conftest.$ac_ext >&5
-
--eval "$as_ac_var=no"
-+ eval "$as_ac_var=no"
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
-
--echo "$as_me:$LINENO: checking for _doprnt" >&5
--echo $ECHO_N "checking for _doprnt... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for _doprnt" >&5
-+echo $ECHO_N "checking for _doprnt... $ECHO_C" >&6; }
- if test "${ac_cv_func__doprnt+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-+/* Define _doprnt to an innocuous variant, in case <limits.h> declares _doprnt.
-+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
-+#define _doprnt innocuous__doprnt
-+
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char _doprnt (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+
- #ifdef __STDC__
- # include <limits.h>
- #else
- # include <assert.h>
- #endif
--/* Override any gcc2 internal prototype to avoid an error. */
-+
-+#undef _doprnt
-+
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char _doprnt ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub__doprnt) || defined (__stub____doprnt)
-+#if defined __stub__doprnt || defined __stub____doprnt
- choke me
--#else
--char (*f) () = _doprnt;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != _doprnt;
-+return _doprnt ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_func__doprnt=no
-+ ac_cv_func__doprnt=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+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
--echo "${ECHO_T}$ac_cv_func__doprnt" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_func__doprnt" >&5
-+echo "${ECHO_T}$ac_cv_func__doprnt" >&6; }
- if test $ac_cv_func__doprnt = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -22611,8 +24641,8 @@
-
-
- if test "x$MINGW32" != "xyes"; then
--echo "$as_me:$LINENO: checking for working vsnprintf" >&5
--echo $ECHO_N "checking for working vsnprintf... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for working vsnprintf" >&5
-+echo $ECHO_N "checking for working vsnprintf... $ECHO_C" >&6; }
- if test "${ac_cv_func_working_vsnprintf+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -22620,7 +24650,6 @@
- ac_cv_func_working_vsnprintf=no
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -22671,13 +24700,22 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+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>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (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
-@@ -22690,11 +24728,13 @@
- ( exit $ac_status )
- ac_cv_func_working_vsnprintf=no
- fi
--rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+
-+
- fi
--echo "$as_me:$LINENO: result: $ac_cv_func_working_vsnprintf" >&5
--echo "${ECHO_T}$ac_cv_func_working_vsnprintf" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_working_vsnprintf" >&5
-+echo "${ECHO_T}$ac_cv_func_working_vsnprintf" >&6; }
- if test $ac_cv_func_working_vsnprintf = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -22707,78 +24747,88 @@
- for ac_func in vsnprintf
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
-+#define $ac_func innocuous_$ac_func
-+
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+
- #ifdef __STDC__
- # include <limits.h>
- #else
- # include <assert.h>
- #endif
--/* Override any gcc2 internal prototype to avoid an error. */
-+
-+#undef $ac_func
-+
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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
- sed 's/^/| /' conftest.$ac_ext >&5
-
--eval "$as_ac_var=no"
-+ eval "$as_ac_var=no"
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -22815,78 +24865,88 @@
- gethostbyname connect bind getline
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
-+#define $ac_func innocuous_$ac_func
-+
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+
- #ifdef __STDC__
- # include <limits.h>
- #else
- # include <assert.h>
- #endif
--/* Override any gcc2 internal prototype to avoid an error. */
-+
-+#undef $ac_func
-+
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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
- sed 's/^/| /' conftest.$ac_ext >&5
-
--eval "$as_ac_var=no"
-+ eval "$as_ac_var=no"
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -22896,18 +24956,17 @@
- done
-
-
--echo "$as_me:$LINENO: checking for working gettimeofday" >&5
--echo $ECHO_N "checking for working gettimeofday... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for working gettimeofday" >&5
-+echo $ECHO_N "checking for working gettimeofday... $ECHO_C" >&6; }
-
- templibs="$LIBS"
- LIBS=" $LIBS"
- if test "$cross_compiling" = yes; then
-- echo "$as_me:$LINENO: result: unknown: cross-compiling" >&5
--echo "${ECHO_T}unknown: cross-compiling" >&6
-+ { echo "$as_me:$LINENO: result: unknown: cross-compiling" >&5
-+echo "${ECHO_T}unknown: cross-compiling" >&6; }
-
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -23009,18 +25068,27 @@
-
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+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>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (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
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_GETTIMEOFDAY 1
-@@ -23032,190 +25100,213 @@
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ( exit $ac_status )
--echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-
- fi
--rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+
-+
- LIBS="$templibs"
-
-
- if test $ac_cv_func_gethostbyname = no; then
-- echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
--echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
-+echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6; }
- if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lnsl $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char gethostbyname ();
- int
- main ()
- {
--gethostbyname ();
-+return gethostbyname ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_nsl_gethostbyname=no
-+ ac_cv_lib_nsl_gethostbyname=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+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
--echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
--echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
-+echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6; }
- if test $ac_cv_lib_nsl_gethostbyname = yes; then
- LIBS="-lnsl $LIBS"
- fi
-
- fi
- if test $ac_cv_func_connect = no; then
-- echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
--echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
-+echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; }
- if test "${ac_cv_lib_socket_connect+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lsocket $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char connect ();
- int
- main ()
- {
--connect ();
-+return connect ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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_connect=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_socket_connect=no
-+ ac_cv_lib_socket_connect=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+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
--echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
--echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
-+echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6; }
- if test $ac_cv_lib_socket_connect = yes; then
- LIBS="-lsocket $LIBS"
- fi
-
- fi
- if test $ac_cv_func_bind = no; then
-- echo "$as_me:$LINENO: checking for gethostbyaddr in -lbind" >&5
--echo $ECHO_N "checking for gethostbyaddr in -lbind... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for gethostbyaddr in -lbind" >&5
-+echo $ECHO_N "checking for gethostbyaddr in -lbind... $ECHO_C" >&6; }
- if test "${ac_cv_lib_bind_gethostbyaddr+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lbind $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char gethostbyaddr ();
- int
- main ()
- {
--gethostbyaddr ();
-+return gethostbyaddr ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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_bind_gethostbyaddr=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_bind_gethostbyaddr=no
-+ ac_cv_lib_bind_gethostbyaddr=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+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
--echo "$as_me:$LINENO: result: $ac_cv_lib_bind_gethostbyaddr" >&5
--echo "${ECHO_T}$ac_cv_lib_bind_gethostbyaddr" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_bind_gethostbyaddr" >&5
-+echo "${ECHO_T}$ac_cv_lib_bind_gethostbyaddr" >&6; }
- if test $ac_cv_lib_bind_gethostbyaddr = yes; then
- LIBS="-lbind $LIBS"
- fi
-@@ -23228,78 +25319,88 @@
- for ac_func in fdopen
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
-+#define $ac_func innocuous_$ac_func
-+
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+
- #ifdef __STDC__
- # include <limits.h>
- #else
- # include <assert.h>
- #endif
--/* Override any gcc2 internal prototype to avoid an error. */
-+
-+#undef $ac_func
-+
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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
- sed 's/^/| /' conftest.$ac_ext >&5
-
--eval "$as_ac_var=no"
-+ eval "$as_ac_var=no"
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -23312,78 +25413,87 @@
-
-
-
--echo "$as_me:$LINENO: checking for fcntl" >&5
--echo $ECHO_N "checking for fcntl... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for fcntl" >&5
-+echo $ECHO_N "checking for fcntl... $ECHO_C" >&6; }
- if test "${ac_cv_func_fcntl+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-+/* Define fcntl to an innocuous variant, in case <limits.h> declares fcntl.
-+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
-+#define fcntl innocuous_fcntl
-+
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char fcntl (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+
- #ifdef __STDC__
- # include <limits.h>
- #else
- # include <assert.h>
- #endif
--/* Override any gcc2 internal prototype to avoid an error. */
-+
-+#undef fcntl
-+
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char fcntl ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_fcntl) || defined (__stub___fcntl)
-+#if defined __stub_fcntl || defined __stub___fcntl
- choke me
--#else
--char (*f) () = fcntl;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != fcntl;
-+return fcntl ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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_fcntl=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_func_fcntl=no
-+ ac_cv_func_fcntl=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+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_fcntl" >&5
--echo "${ECHO_T}$ac_cv_func_fcntl" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_fcntl" >&5
-+echo "${ECHO_T}$ac_cv_func_fcntl" >&6; }
- if test $ac_cv_func_fcntl = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -23396,78 +25506,87 @@
- _ACEOF
-
- else
-- echo "$as_me:$LINENO: checking for ioctl" >&5
--echo $ECHO_N "checking for ioctl... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for ioctl" >&5
-+echo $ECHO_N "checking for ioctl... $ECHO_C" >&6; }
- if test "${ac_cv_func_ioctl+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-+/* Define ioctl to an innocuous variant, in case <limits.h> declares ioctl.
-+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
-+#define ioctl innocuous_ioctl
-+
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char ioctl (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+
- #ifdef __STDC__
- # include <limits.h>
- #else
- # include <assert.h>
- #endif
--/* Override any gcc2 internal prototype to avoid an error. */
-+
-+#undef ioctl
-+
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char ioctl ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_ioctl) || defined (__stub___ioctl)
-+#if defined __stub_ioctl || defined __stub___ioctl
- choke me
--#else
--char (*f) () = ioctl;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != ioctl;
-+return ioctl ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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_ioctl=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_func_ioctl=no
-+ ac_cv_func_ioctl=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+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_ioctl" >&5
--echo "${ECHO_T}$ac_cv_func_ioctl" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_ioctl" >&5
-+echo "${ECHO_T}$ac_cv_func_ioctl" >&6; }
- if test $ac_cv_func_ioctl = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -23484,10 +25603,9 @@
- fi
-
-
--echo "$as_me:$LINENO: checking for SIGPIPE" >&5
--echo $ECHO_N "checking for SIGPIPE... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for SIGPIPE" >&5
-+echo $ECHO_N "checking for SIGPIPE... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -23503,19 +25621,24 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_SIGPIPE 1
-@@ -23525,10 +25648,11 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-
- FREECIV_DATADIR="$datadir/freeciv"
-@@ -23547,60 +25671,67 @@
- CPPFLAGS="$CPPFLAGS -DDEFAULT_DATA_PATH=\"\\\"$DEFAULT_DATA_PATH\\\"\""
-
- if test -n "$WITH_EFENCE"; then
-- echo "$as_me:$LINENO: checking for malloc in -lefence" >&5
--echo $ECHO_N "checking for malloc in -lefence... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for malloc in -lefence" >&5
-+echo $ECHO_N "checking for malloc in -lefence... $ECHO_C" >&6; }
- if test "${ac_cv_lib_efence_malloc+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lefence $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* 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
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char malloc ();
- int
- main ()
- {
--malloc ();
-+return malloc ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+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); }; }; 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_efence_malloc=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_efence_malloc=no
-+ ac_cv_lib_efence_malloc=no
- fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+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
--echo "$as_me:$LINENO: result: $ac_cv_lib_efence_malloc" >&5
--echo "${ECHO_T}$ac_cv_lib_efence_malloc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_efence_malloc" >&5
-+echo "${ECHO_T}$ac_cv_lib_efence_malloc" >&6; }
- if test $ac_cv_lib_efence_malloc = yes; then
-
- if test "x$LIBS" = "x"; then
-@@ -23612,16 +25743,16 @@
-
- fi
-
-- ac_config_commands="$ac_config_commands fc_default-1"
-+ac_config_commands="$ac_config_commands fc_default-1"
-
-
-- ac_config_commands="$ac_config_commands fc_default-2"
-+ac_config_commands="$ac_config_commands fc_default-2"
-
-
-- ac_config_commands="$ac_config_commands fc_default-4"
-+ac_config_commands="$ac_config_commands fc_default-4"
-
-
-- ac_config_commands="$ac_config_commands fc_default-5"
-+ac_config_commands="$ac_config_commands fc_default-5"
-
-
- if test -n "$GCC"; then
-@@ -23648,13 +25779,13 @@
- _ACEOF
-
-
-- ac_config_files="$ac_config_files Makefile data/Makefile data/civclient.dsc data/civserver.dsc data/civserver.room data/hex2t/Makefile data/amplio/Makefile data/buildings/Makefile data/flags/Makefile data/misc/Makefile data/trident/Makefile data/isophex/Makefile data/isotrident/Makefile data/stdsounds/Makefile data/default/Makefile data/civ1/Makefile data/civ2/Makefile data/scenario/Makefile data/nation/Makefile data/themes/Makefile data/themes/gui-gtk-2.0/Makefile data/themes/gui-gtk-2.0/Freeciv/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Arrows/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Buttons/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Check-Radio/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Combo/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Frame-Gap/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Handles/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Lines/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ListHeaders/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Menu-Menubar/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Others/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Panel/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ProgressBar/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Range/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Shadows/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Spin/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Toolbar/Makefile data/themes/gui-sdl/Makefile data/themes/gui-sdl/human/Makefile data/wonders/Makefile data/icons/Makefile utility/Makefile utility/ftwl/Makefile dependencies/Makefile dependencies/lua/Makefile dependencies/tolua/Makefile dependencies/lua/src/Makefile dependencies/lua/src/lib/Makefile common/Makefile common/aicore/Makefile ai/Makefile tests/Makefile win32/Makefile client/Makefile client/agents/Makefile client/include/Makefile client/gui-sdl/Makefile client/gui-gtk-2.0/Makefile client/gui-xaw/Makefile client/gui-win32/Makefile client/gui-ftwl/Makefile client/gui-stub/Makefile server/Makefile server/generator/Makefile server/scripting/Makefile manual/Makefile intl/Makefile po/Makefile.in doc/Makefile doc/man/Makefile doc/ca/Makefile doc/de/Makefile doc/fr/Makefile doc/it/Makefile doc/ja/Makefile doc/nl/Makefile doc/sv/Makefile freeciv.spec:bootstrap/freeciv.spec.in bootstrap/undep.sh data/Freeciv client/freeciv.desktop:bootstrap/freeciv.desktop.in server/freeciv-server.desktop:bootstrap/freeciv-server.desktop.in"
-+ac_config_files="$ac_config_files Makefile data/Makefile data/civclient.dsc data/civserver.dsc data/civserver.room data/hex2t/Makefile data/amplio/Makefile data/buildings/Makefile data/flags/Makefile data/misc/Makefile data/trident/Makefile data/isophex/Makefile data/isotrident/Makefile data/stdsounds/Makefile data/default/Makefile data/civ1/Makefile data/civ2/Makefile data/scenario/Makefile data/nation/Makefile data/themes/Makefile data/themes/gui-gtk-2.0/Makefile data/themes/gui-gtk-2.0/Freeciv/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Arrows/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Buttons/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Check-Radio/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Combo/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Frame-Gap/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Handles/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Lines/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ListHeaders/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Menu-Menubar/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Others/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Panel/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ProgressBar/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Range/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Shadows/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Spin/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Toolbar/Makefile data/themes/gui-sdl/Makefile data/themes/gui-sdl/human/Makefile data/wonders/Makefile data/icons/Makefile utility/Makefile utility/ftwl/Makefile dependencies/Makefile dependencies/lua/Makefile dependencies/tolua/Makefile dependencies/lua/src/Makefile dependencies/lua/src/lib/Makefile common/Makefile common/aicore/Makefile ai/Makefile tests/Makefile win32/Makefile client/Makefile client/agents/Makefile client/include/Makefile client/gui-sdl/Makefile client/gui-gtk-2.0/Makefile client/gui-xaw/Makefile client/gui-win32/Makefile client/gui-ftwl/Makefile client/gui-stub/Makefile server/Makefile server/generator/Makefile server/scripting/Makefile manual/Makefile intl/Makefile po/Makefile.in doc/Makefile doc/man/Makefile doc/ca/Makefile doc/de/Makefile doc/fr/Makefile doc/it/Makefile doc/ja/Makefile doc/nl/Makefile doc/sv/Makefile freeciv.spec:bootstrap/freeciv.spec.in bootstrap/undep.sh data/Freeciv client/freeciv.desktop:bootstrap/freeciv.desktop.in server/freeciv-server.desktop:bootstrap/freeciv-server.desktop.in"
-
-- ac_config_files="$ac_config_files civ:bootstrap/civ.in"
-+ac_config_files="$ac_config_files civ:bootstrap/civ.in"
-
-- ac_config_files="$ac_config_files ser:bootstrap/ser.in"
-+ac_config_files="$ac_config_files ser:bootstrap/ser.in"
-
-- ac_config_commands="$ac_config_commands default"
-+ac_config_commands="$ac_config_commands default"
-
- cat >confcache <<\_ACEOF
- # This file is a shell script that caches the results of configure
-@@ -23674,39 +25805,58 @@
-
- # The following way of writing the cache mishandles newlines in values,
- # but we know of no workaround that is simple, portable, and efficient.
--# So, don't put newlines in cache variables' values.
-+# So, we kill variables containing newlines.
- # Ultrix sh set writes to stderr and can't be redirected directly,
- # and sets the high bit in the cache file unless we assign to the vars.
--{
-+(
-+ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-+ eval ac_val=\$$ac_var
-+ case $ac_val in #(
-+ *${as_nl}*)
-+ case $ac_var in #(
-+ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-+ esac
-+ case $ac_var in #(
-+ _ | IFS | as_nl) ;; #(
-+ *) $as_unset $ac_var ;;
-+ esac ;;
-+ esac
-+ done
-+
- (set) 2>&1 |
-- case `(ac_space=' '; set | grep ac_space) 2>&1` in
-- *ac_space=\ *)
-+ case $as_nl`(ac_space=' '; set) 2>&1` in #(
-+ *${as_nl}ac_space=\ *)
- # `set' does not quote correctly, so add quotes (double-quote
- # substitution turns \\\\ into \\, and sed turns \\ into \).
- sed -n \
-- "s/'/'\\\\''/g;
-- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-- ;;
-+ "s/'/'\\\\''/g;
-+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-+ ;; #(
- *)
- # `set' quotes correctly as required by POSIX, so do not add quotes.
-- sed -n \
-- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
- ;;
-- esac;
--} |
-+ esac |
-+ sort
-+) |
- sed '
-+ /^ac_cv_env_/b end
- t clear
-- : clear
-+ :clear
- s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
- t end
-- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-- : end' >>confcache
--if diff $cache_file confcache >/dev/null 2>&1; then :; else
-- if test -w $cache_file; then
-- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-+ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-+ :end' >>confcache
-+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-+ if test -w "$cache_file"; then
-+ test "x$cache_file" != "x/dev/null" &&
-+ { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-+echo "$as_me: updating cache $cache_file" >&6;}
- cat confcache >$cache_file
- else
-- echo "not updating unwritable cache $cache_file"
-+ { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-+echo "$as_me: not updating unwritable cache $cache_file" >&6;}
- fi
- fi
- rm -f confcache
-@@ -23715,32 +25865,18 @@
- # Let make expand exec_prefix.
- test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
--# VPATH may cause trouble with some makes, so we remove $(srcdir),
--# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
--# trailing colons and then remove the whole line if VPATH becomes empty
--# (actually we leave an empty line to preserve line numbers).
--if test "x$srcdir" = x.; then
-- ac_vpsub='/^[ ]*VPATH[ ]*=/{
--s/:*\$(srcdir):*/:/;
--s/:*\${srcdir}:*/:/;
--s/:*@srcdir@:*/:/;
--s/^\([^=]*=[ ]*\):*/\1/;
--s/:*$//;
--s/^[^=]*=[ ]*$//;
--}'
--fi
--
- DEFS=-DHAVE_CONFIG_H
-
- ac_libobjs=
- ac_ltlibobjs=
- for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
- # 1. Remove the extension, and $U if already installed.
-- ac_i=`echo "$ac_i" |
-- sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
-- # 2. Add them.
-- ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
-- ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
-+ ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-+ ac_i=`echo "$ac_i" | sed "$ac_script"`
-+ # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
-+ # will be set to the directory where LIBOBJS objects are built.
-+ ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-+ ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
- done
- LIBOBJS=$ac_libobjs
-
-@@ -23761,6 +25897,13 @@
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
-+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-+ { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
- if test -z "${SERVER_TRUE}" && test -z "${SERVER_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"SERVER\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
-@@ -23796,6 +25939,20 @@
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
-+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-+ { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-+ { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
- if test -z "${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
-@@ -23953,28 +26110,92 @@
- ## 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=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '${1+"$@"}'='"$@"'
--elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-- set -o posix
-+ setopt NO_GLOB_SUBST
-+else
-+ case `(set -o) 2>/dev/null` in
-+ *posix*) set -o posix ;;
-+esac
-+
-+fi
-+
-+
-+
-+
-+# PATH needs CR
-+# Avoid depending upon Character Ranges.
-+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-+as_cr_digits='0123456789'
-+as_cr_alnum=$as_cr_Letters$as_cr_digits
-+
-+# The user is always right.
-+if test "${PATH_SEPARATOR+set}" != set; then
-+ echo "#! /bin/sh" >conf$$.sh
-+ echo "exit 0" >>conf$$.sh
-+ chmod +x conf$$.sh
-+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-+ PATH_SEPARATOR=';'
-+ else
-+ PATH_SEPARATOR=:
-+ fi
-+ rm -f conf$$.sh
- fi
-
- # Support unset when possible.
--if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
-+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
- as_unset=unset
- else
- as_unset=false
- fi
-
-
--# Work around bugs in pre-3.0 UWIN ksh.
--$as_unset ENV MAIL MAILPATH
--PS1='$ '
-+# IFS
-+# We need space, tab and new line, in precisely that order. Quoting is
-+# there to prevent editors from complaining about space-tab.
-+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-+# splitting by setting IFS to empty value.)
-+as_nl='
-+'
-+IFS=" "" $as_nl"
-+
-+# Find who we are. Look in the path if we contain no directory separator.
-+case $0 in
-+ *[\\/]* ) as_myself=$0 ;;
-+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-+done
-+IFS=$as_save_IFS
-+
-+ ;;
-+esac
-+# We did not find ourselves, most probably we were run as `sh COMMAND'
-+# in which case we are not to be found in the path.
-+if test "x$as_myself" = x; then
-+ as_myself=$0
-+fi
-+if test ! -f "$as_myself"; then
-+ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-+ { (exit 1); exit 1; }
-+fi
-+
-+# Work around bugs in pre-3.0 UWIN ksh.
-+for as_var in ENV MAIL MAILPATH
-+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+done
-+PS1='$ '
- PS2='> '
- PS4='+ '
-
-@@ -23984,21 +26205,22 @@
- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
- LC_TELEPHONE LC_TIME
- do
-- if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
-+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
- eval $as_var=C; export $as_var
- else
-- $as_unset $as_var
-+ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
- fi
- done
-
- # Required to use basename.
--if expr a : '\(a\)' >/dev/null 2>&1; then
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
- else
- as_expr=false
- fi
-
--if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
- as_basename=basename
- else
- as_basename=false
-@@ -24006,200 +26228,166 @@
-
-
- # Name of the executable.
--as_me=`$as_basename "$0" ||
-+as_me=`$as_basename -- "$0" ||
- $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- X"$0" : 'X\(//\)$' \| \
-- X"$0" : 'X\(/\)$' \| \
-- . : '\(.\)' 2>/dev/null ||
-+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
- echo X/"$0" |
-- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-- /^X\/\(\/\/\)$/{ s//\1/; q; }
-- /^X\/\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
--
-+ sed '/^.*\/\([^/][^/]*\)\/*$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\/\(\/\/\)$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\/\(\/\).*/{
-+ s//\1/
-+ q
-+ }
-+ s/.*/./; q'`
-
--# PATH needs CR, and LINENO needs CR and PATH.
--# Avoid depending upon Character Ranges.
--as_cr_letters='abcdefghijklmnopqrstuvwxyz'
--as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
--as_cr_Letters=$as_cr_letters$as_cr_LETTERS
--as_cr_digits='0123456789'
--as_cr_alnum=$as_cr_Letters$as_cr_digits
-+# CDPATH.
-+$as_unset CDPATH
-
--# The user is always right.
--if test "${PATH_SEPARATOR+set}" != set; then
-- echo "#! /bin/sh" >conf$$.sh
-- echo "exit 0" >>conf$$.sh
-- chmod +x conf$$.sh
-- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-- PATH_SEPARATOR=';'
-- else
-- PATH_SEPARATOR=:
-- fi
-- rm -f conf$$.sh
--fi
-
-
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
-- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
- test "x$as_lineno_1" != "x$as_lineno_2" &&
-- test "x$as_lineno_3" = "x$as_lineno_2" || {
-- # Find who we are. Look in the path if we contain no path at all
-- # relative or not.
-- case $0 in
-- *[\\/]* ) as_myself=$0 ;;
-- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
--done
--
-- ;;
-- esac
-- # We did not find ourselves, most probably we were run as `sh COMMAND'
-- # in which case we are not to be found in the path.
-- if test "x$as_myself" = x; then
-- as_myself=$0
-- fi
-- if test ! -f "$as_myself"; then
-- { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
--echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
-- { (exit 1); exit 1; }; }
-- fi
-- case $CONFIG_SHELL in
-- '')
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for as_base in sh bash ksh sh5; do
-- case $as_dir in
-- /*)
-- if ("$as_dir/$as_base" -c '
-- as_lineno_1=$LINENO
-- as_lineno_2=$LINENO
-- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-- test "x$as_lineno_1" != "x$as_lineno_2" &&
-- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
-- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-- CONFIG_SHELL=$as_dir/$as_base
-- export CONFIG_SHELL
-- exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-- fi;;
-- esac
-- done
--done
--;;
-- esac
-+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
- # uniformly replaced by the line number. The first 'sed' inserts a
-- # line-number line before each line; the second 'sed' does the real
-- # work. The second script uses 'N' to pair each line-number line
-- # with the numbered line, and appends trailing '-' during
-- # substitution so that $LINENO is not a special case at line end.
-+ # line-number line after each line using $LINENO; the second 'sed'
-+ # does the real work. The second script uses 'N' to pair each
-+ # line-number line with the line containing $LINENO, and appends
-+ # trailing '-' during substitution so that $LINENO is not a special
-+ # case at line end.
- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
-- sed '=' <$as_myself |
-+ # scripts with optimization help from Paolo Bonzini. Blame Lee
-+ # E. McMahon (1931-1989) for sed's syntax. :-)
-+ sed -n '
-+ p
-+ /[$]LINENO/=
-+ ' <$as_myself |
- sed '
-+ s/[$]LINENO.*/&-/
-+ t lineno
-+ b
-+ :lineno
- N
-- s,$,-,
-- : loop
-- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-+ :loop
-+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
- t loop
-- s,-$,,
-- s,^['$as_cr_digits']*\n,,
-+ s/-\n.*//
- ' >$as_me.lineno &&
-- chmod +x $as_me.lineno ||
-- { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
--echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
-+ chmod +x "$as_me.lineno" ||
-+ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
- { (exit 1); exit 1; }; }
-
- # Don't try to exec as it changes $[0], causing all sort of problems
- # (the dirname of $[0] is not the place where we might find the
-- # original and so on. Autoconf is especially sensible to this).
-- . ./$as_me.lineno
-+ # original and so on. Autoconf is especially sensitive to this).
-+ . "./$as_me.lineno"
- # Exit status is that of the last command.
- exit
- }
-
-
--case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-- *c*,-n*) ECHO_N= ECHO_C='
--' ECHO_T=' ' ;;
-- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-- *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
-+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-+ as_dirname=dirname
-+else
-+ as_dirname=false
-+fi
-+
-+ECHO_C= ECHO_N= ECHO_T=
-+case `echo -n x` in
-+-n*)
-+ case `echo 'x\c'` in
-+ *c*) ECHO_T=' ';; # ECHO_T is single tab character.
-+ *) ECHO_C='\c';;
-+ esac;;
-+*)
-+ ECHO_N='-n';;
- esac
-
--if expr a : '\(a\)' >/dev/null 2>&1; then
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
- else
- as_expr=false
- fi
-
- rm -f conf$$ conf$$.exe conf$$.file
-+if test -d conf$$.dir; then
-+ rm -f conf$$.dir/conf$$.file
-+else
-+ rm -f conf$$.dir
-+ mkdir conf$$.dir
-+fi
- echo >conf$$.file
- if ln -s conf$$.file conf$$ 2>/dev/null; then
-- # We could just check for DJGPP; but this test a) works b) is more generic
-- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-- if test -f conf$$.exe; then
-- # Don't use ln at all; we don't have any links
-+ as_ln_s='ln -s'
-+ # ... but there are two gotchas:
-+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-+ # In both cases, we have to default to `cp -p'.
-+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
-- else
-- as_ln_s='ln -s'
-- fi
- elif ln conf$$.file conf$$ 2>/dev/null; then
- as_ln_s=ln
- else
- as_ln_s='cp -p'
- fi
--rm -f conf$$ conf$$.exe conf$$.file
-+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-+rmdir conf$$.dir 2>/dev/null
-
- if mkdir -p . 2>/dev/null; then
- as_mkdir_p=:
- else
-+ test -d ./-p && rmdir ./-p
- as_mkdir_p=false
- fi
-
--as_executable_p="test -f"
-+if test -x / >/dev/null 2>&1; then
-+ as_test_x='test -x'
-+else
-+ 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
-+as_executable_p=$as_test_x
-
- # Sed expression to map a string onto a valid CPP name.
--as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
-+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
- # Sed expression to map a string onto a valid variable name.
--as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
--
--
--# IFS
--# We need space, tab and new line, in precisely that order.
--as_nl='
--'
--IFS=" $as_nl"
-+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
--# CDPATH.
--$as_unset CDPATH
-
- exec 6>&1
-
--# Open the log real soon, to keep \$[0] and so on meaningful, and to
-+# Save the log message, to keep $[0] and so on meaningful, and to
- # report actual input values of CONFIG_FILES etc. instead of their
--# values after options handling. Logging --version etc. is OK.
--exec 5>>config.log
--{
-- echo
-- sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
--## Running $as_me. ##
--_ASBOX
--} >&5
--cat >&5 <<_CSEOF
--
-+# values after options handling.
-+ac_log="
- This file was extended by $as_me, which was
--generated by GNU Autoconf 2.57. Invocation command line was
-+generated by GNU Autoconf 2.61. Invocation command line was
-
- CONFIG_FILES = $CONFIG_FILES
- CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -24207,30 +26395,20 @@
- CONFIG_COMMANDS = $CONFIG_COMMANDS
- $ $0 $@
-
--_CSEOF
--echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
--echo >&5
-+on `(hostname || uname -n) 2>/dev/null | sed 1q`
-+"
-+
- _ACEOF
-
-+cat >>$CONFIG_STATUS <<_ACEOF
- # Files that config.status was made for.
--if test -n "$ac_config_files"; then
-- echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
--fi
--
--if test -n "$ac_config_headers"; then
-- echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
--fi
--
--if test -n "$ac_config_links"; then
-- echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
--fi
-+config_files="$ac_config_files"
-+config_headers="$ac_config_headers"
-+config_commands="$ac_config_commands"
-
--if test -n "$ac_config_commands"; then
-- echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
--fi
-+_ACEOF
-
- cat >>$CONFIG_STATUS <<\_ACEOF
--
- ac_cs_usage="\
- \`$as_me' instantiates files from templates according to the
- current configuration.
-@@ -24238,14 +26416,14 @@
- 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
- --file=FILE[:TEMPLATE]
-- instantiate the configuration file FILE
-+ instantiate the configuration file FILE
- --header=FILE[:TEMPLATE]
-- instantiate the configuration header FILE
-+ instantiate the configuration header FILE
-
- Configuration files:
- $config_files
-@@ -24257,20 +26435,22 @@
- $config_commands
-
- Report bugs to <bug-autoconf at gnu.org>."
--_ACEOF
-
-+_ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF
- ac_cs_version="\\
- config.status
--configured by $0, generated by GNU Autoconf 2.57,
-- with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-+configured by $0, generated by GNU Autoconf 2.61,
-+ with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-
--Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
--Free Software Foundation, Inc.
-+Copyright (C) 2006 Free Software Foundation, Inc.
- This config.status script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it."
--srcdir=$srcdir
--INSTALL="$INSTALL"
-+
-+ac_pwd='$ac_pwd'
-+srcdir='$srcdir'
-+INSTALL='$INSTALL'
-+MKDIR_P='$MKDIR_P'
- _ACEOF
-
- cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -24281,39 +26461,24 @@
- do
- case $1 in
- --*=*)
-- ac_option=`expr "x$1" : 'x\([^=]*\)='`
-- ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
-+ ac_option=`expr "X$1" : 'X\([^=]*\)='`
-+ ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
- ac_shift=:
- ;;
-- -*)
-+ *)
- ac_option=$1
- ac_optarg=$2
- ac_shift=shift
- ;;
-- *) # This is not an option, so the user has probably given explicit
-- # arguments.
-- ac_option=$1
-- ac_need_defaults=false;;
- esac
-
- case $ac_option in
- # Handling of the options.
--_ACEOF
--cat >>$CONFIG_STATUS <<\_ACEOF
- -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
- ac_cs_recheck=: ;;
-- --version | --vers* | -V )
-- echo "$ac_cs_version"; exit 0 ;;
-- --he | --h)
-- # Conflict between --help and --header
-- { { echo "$as_me:$LINENO: error: ambiguous option: $1
--Try \`$0 --help' for more information." >&5
--echo "$as_me: error: ambiguous option: $1
--Try \`$0 --help' for more information." >&2;}
-- { (exit 1); exit 1; }; };;
-- --help | --hel | -h )
-- echo "$ac_cs_usage"; exit 0 ;;
-- --debug | --d* | -d )
-+ --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-+ echo "$ac_cs_version"; exit ;;
-+ --debug | --debu | --deb | --de | --d | -d )
- debug=: ;;
- --file | --fil | --fi | --f )
- $ac_shift
-@@ -24323,18 +26488,24 @@
- $ac_shift
- CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
- ac_need_defaults=false;;
-+ --he | --h)
-+ # Conflict between --help and --header
-+ { echo "$as_me: error: ambiguous option: $1
-+Try \`$0 --help' for more information." >&2
-+ { (exit 1); exit 1; }; };;
-+ --help | --hel | -h )
-+ echo "$ac_cs_usage"; exit ;;
- -q | -quiet | --quiet | --quie | --qui | --qu | --q \
- | -silent | --silent | --silen | --sile | --sil | --si | --s)
- ac_cs_silent=: ;;
-
- # This is an error.
-- -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
--Try \`$0 --help' for more information." >&5
--echo "$as_me: error: unrecognized option: $1
--Try \`$0 --help' for more information." >&2;}
-+ -*) { echo "$as_me: error: unrecognized option: $1
-+Try \`$0 --help' for more information." >&2
- { (exit 1); exit 1; }; } ;;
-
-- *) ac_config_targets="$ac_config_targets $1" ;;
-+ *) ac_config_targets="$ac_config_targets $1"
-+ ac_need_defaults=false ;;
-
- esac
- shift
-@@ -24350,17 +26521,28 @@
- _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF
- if \$ac_cs_recheck; then
-- echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-- exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-+ echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-+ CONFIG_SHELL=$SHELL
-+ export CONFIG_SHELL
-+ exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
- fi
-
- _ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+exec 5>>config.log
-+{
-+ echo
-+ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-+## Running $as_me. ##
-+_ASBOX
-+ echo "$ac_log"
-+} >&5
-
-+_ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF
- #
--# INIT-COMMANDS section.
-+# INIT-COMMANDS
- #
--
- AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
-
-
-@@ -24371,115 +26553,116 @@
-
- _ACEOF
-
--
--
- cat >>$CONFIG_STATUS <<\_ACEOF
-+
-+# Handling of arguments.
- for ac_config_target in $ac_config_targets
- do
-- case "$ac_config_target" in
-- # Handling of arguments.
-- "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-- "data/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
-- "data/civclient.dsc" ) CONFIG_FILES="$CONFIG_FILES data/civclient.dsc" ;;
-- "data/civserver.dsc" ) CONFIG_FILES="$CONFIG_FILES data/civserver.dsc" ;;
-- "data/civserver.room" ) CONFIG_FILES="$CONFIG_FILES data/civserver.room" ;;
-- "data/hex2t/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/hex2t/Makefile" ;;
-- "data/amplio/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/amplio/Makefile" ;;
-- "data/buildings/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/buildings/Makefile" ;;
-- "data/flags/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/flags/Makefile" ;;
-- "data/misc/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/misc/Makefile" ;;
-- "data/trident/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/trident/Makefile" ;;
-- "data/isophex/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/isophex/Makefile" ;;
-- "data/isotrident/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/isotrident/Makefile" ;;
-- "data/stdsounds/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/stdsounds/Makefile" ;;
-- "data/default/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/default/Makefile" ;;
-- "data/civ1/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/civ1/Makefile" ;;
-- "data/civ2/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/civ2/Makefile" ;;
-- "data/scenario/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/scenario/Makefile" ;;
-- "data/nation/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/nation/Makefile" ;;
-- "data/themes/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/themes/Makefile" ;;
-- "data/themes/gui-gtk-2.0/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Makefile" ;;
-- "data/themes/gui-gtk-2.0/Freeciv/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/Makefile" ;;
-- "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Makefile" ;;
-- "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Arrows/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Arrows/Makefile" ;;
-- "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Buttons/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Buttons/Makefile" ;;
-- "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Check-Radio/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Check-Radio/Makefile" ;;
-- "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Combo/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Combo/Makefile" ;;
-- "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Frame-Gap/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Frame-Gap/Makefile" ;;
-- "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Handles/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Handles/Makefile" ;;
-- "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Lines/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Lines/Makefile" ;;
-- "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ListHeaders/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ListHeaders/Makefile" ;;
-- "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Menu-Menubar/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Menu-Menubar/Makefile" ;;
-- "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Others/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Others/Makefile" ;;
-- "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Panel/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Panel/Makefile" ;;
-- "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ProgressBar/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ProgressBar/Makefile" ;;
-- "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Range/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Range/Makefile" ;;
-- "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/Makefile" ;;
-- "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Shadows/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Shadows/Makefile" ;;
-- "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Spin/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Spin/Makefile" ;;
-- "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs/Makefile" ;;
-- "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Toolbar/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Toolbar/Makefile" ;;
-- "data/themes/gui-sdl/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/themes/gui-sdl/Makefile" ;;
-- "data/themes/gui-sdl/human/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/themes/gui-sdl/human/Makefile" ;;
-- "data/wonders/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/wonders/Makefile" ;;
-- "data/icons/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/icons/Makefile" ;;
-- "utility/Makefile" ) CONFIG_FILES="$CONFIG_FILES utility/Makefile" ;;
-- "utility/ftwl/Makefile" ) CONFIG_FILES="$CONFIG_FILES utility/ftwl/Makefile" ;;
-- "dependencies/Makefile" ) CONFIG_FILES="$CONFIG_FILES dependencies/Makefile" ;;
-- "dependencies/lua/Makefile" ) CONFIG_FILES="$CONFIG_FILES dependencies/lua/Makefile" ;;
-- "dependencies/tolua/Makefile" ) CONFIG_FILES="$CONFIG_FILES dependencies/tolua/Makefile" ;;
-- "dependencies/lua/src/Makefile" ) CONFIG_FILES="$CONFIG_FILES dependencies/lua/src/Makefile" ;;
-- "dependencies/lua/src/lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES dependencies/lua/src/lib/Makefile" ;;
-- "common/Makefile" ) CONFIG_FILES="$CONFIG_FILES common/Makefile" ;;
-- "common/aicore/Makefile" ) CONFIG_FILES="$CONFIG_FILES common/aicore/Makefile" ;;
-- "ai/Makefile" ) CONFIG_FILES="$CONFIG_FILES ai/Makefile" ;;
-- "tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
-- "win32/Makefile" ) CONFIG_FILES="$CONFIG_FILES win32/Makefile" ;;
-- "client/Makefile" ) CONFIG_FILES="$CONFIG_FILES client/Makefile" ;;
-- "client/agents/Makefile" ) CONFIG_FILES="$CONFIG_FILES client/agents/Makefile" ;;
-- "client/include/Makefile" ) CONFIG_FILES="$CONFIG_FILES client/include/Makefile" ;;
-- "client/gui-sdl/Makefile" ) CONFIG_FILES="$CONFIG_FILES client/gui-sdl/Makefile" ;;
-- "client/gui-gtk-2.0/Makefile" ) CONFIG_FILES="$CONFIG_FILES client/gui-gtk-2.0/Makefile" ;;
-- "client/gui-xaw/Makefile" ) CONFIG_FILES="$CONFIG_FILES client/gui-xaw/Makefile" ;;
-- "client/gui-win32/Makefile" ) CONFIG_FILES="$CONFIG_FILES client/gui-win32/Makefile" ;;
-- "client/gui-ftwl/Makefile" ) CONFIG_FILES="$CONFIG_FILES client/gui-ftwl/Makefile" ;;
-- "client/gui-stub/Makefile" ) CONFIG_FILES="$CONFIG_FILES client/gui-stub/Makefile" ;;
-- "server/Makefile" ) CONFIG_FILES="$CONFIG_FILES server/Makefile" ;;
-- "server/generator/Makefile" ) CONFIG_FILES="$CONFIG_FILES server/generator/Makefile" ;;
-- "server/scripting/Makefile" ) CONFIG_FILES="$CONFIG_FILES server/scripting/Makefile" ;;
-- "manual/Makefile" ) CONFIG_FILES="$CONFIG_FILES manual/Makefile" ;;
-- "intl/Makefile" ) CONFIG_FILES="$CONFIG_FILES intl/Makefile" ;;
-- "po/Makefile.in" ) CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
-- "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
-- "doc/man/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/man/Makefile" ;;
-- "doc/ca/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/ca/Makefile" ;;
-- "doc/de/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/de/Makefile" ;;
-- "doc/fr/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/fr/Makefile" ;;
-- "doc/it/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/it/Makefile" ;;
-- "doc/ja/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/ja/Makefile" ;;
-- "doc/nl/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/nl/Makefile" ;;
-- "doc/sv/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/sv/Makefile" ;;
-- "freeciv.spec" ) CONFIG_FILES="$CONFIG_FILES freeciv.spec:bootstrap/freeciv.spec.in" ;;
-- "bootstrap/undep.sh" ) CONFIG_FILES="$CONFIG_FILES bootstrap/undep.sh" ;;
-- "data/Freeciv" ) CONFIG_FILES="$CONFIG_FILES data/Freeciv" ;;
-- "client/freeciv.desktop" ) CONFIG_FILES="$CONFIG_FILES client/freeciv.desktop:bootstrap/freeciv.desktop.in" ;;
-- "server/freeciv-server.desktop" ) CONFIG_FILES="$CONFIG_FILES server/freeciv-server.desktop:bootstrap/freeciv-server.desktop.in" ;;
-- "civ" ) CONFIG_FILES="$CONFIG_FILES civ:bootstrap/civ.in" ;;
-- "ser" ) CONFIG_FILES="$CONFIG_FILES ser:bootstrap/ser.in" ;;
-- "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-- "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
-- "fc_default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS fc_default-1" ;;
-- "fc_default-2" ) CONFIG_COMMANDS="$CONFIG_COMMANDS fc_default-2" ;;
-- "fc_default-4" ) CONFIG_COMMANDS="$CONFIG_COMMANDS fc_default-4" ;;
-- "fc_default-5" ) CONFIG_COMMANDS="$CONFIG_COMMANDS fc_default-5" ;;
-- "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
-- "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-+ case $ac_config_target in
-+ "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-+ "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-+ "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
-+ "fc_default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS fc_default-1" ;;
-+ "fc_default-2") CONFIG_COMMANDS="$CONFIG_COMMANDS fc_default-2" ;;
-+ "fc_default-4") CONFIG_COMMANDS="$CONFIG_COMMANDS fc_default-4" ;;
-+ "fc_default-5") CONFIG_COMMANDS="$CONFIG_COMMANDS fc_default-5" ;;
-+ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-+ "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
-+ "data/civclient.dsc") CONFIG_FILES="$CONFIG_FILES data/civclient.dsc" ;;
-+ "data/civserver.dsc") CONFIG_FILES="$CONFIG_FILES data/civserver.dsc" ;;
-+ "data/civserver.room") CONFIG_FILES="$CONFIG_FILES data/civserver.room" ;;
-+ "data/hex2t/Makefile") CONFIG_FILES="$CONFIG_FILES data/hex2t/Makefile" ;;
-+ "data/amplio/Makefile") CONFIG_FILES="$CONFIG_FILES data/amplio/Makefile" ;;
-+ "data/buildings/Makefile") CONFIG_FILES="$CONFIG_FILES data/buildings/Makefile" ;;
-+ "data/flags/Makefile") CONFIG_FILES="$CONFIG_FILES data/flags/Makefile" ;;
-+ "data/misc/Makefile") CONFIG_FILES="$CONFIG_FILES data/misc/Makefile" ;;
-+ "data/trident/Makefile") CONFIG_FILES="$CONFIG_FILES data/trident/Makefile" ;;
-+ "data/isophex/Makefile") CONFIG_FILES="$CONFIG_FILES data/isophex/Makefile" ;;
-+ "data/isotrident/Makefile") CONFIG_FILES="$CONFIG_FILES data/isotrident/Makefile" ;;
-+ "data/stdsounds/Makefile") CONFIG_FILES="$CONFIG_FILES data/stdsounds/Makefile" ;;
-+ "data/default/Makefile") CONFIG_FILES="$CONFIG_FILES data/default/Makefile" ;;
-+ "data/civ1/Makefile") CONFIG_FILES="$CONFIG_FILES data/civ1/Makefile" ;;
-+ "data/civ2/Makefile") CONFIG_FILES="$CONFIG_FILES data/civ2/Makefile" ;;
-+ "data/scenario/Makefile") CONFIG_FILES="$CONFIG_FILES data/scenario/Makefile" ;;
-+ "data/nation/Makefile") CONFIG_FILES="$CONFIG_FILES data/nation/Makefile" ;;
-+ "data/themes/Makefile") CONFIG_FILES="$CONFIG_FILES data/themes/Makefile" ;;
-+ "data/themes/gui-gtk-2.0/Makefile") CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Makefile" ;;
-+ "data/themes/gui-gtk-2.0/Freeciv/Makefile") CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/Makefile" ;;
-+ "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Makefile") CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Makefile" ;;
-+ "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Arrows/Makefile") CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Arrows/Makefile" ;;
-+ "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Buttons/Makefile") CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Buttons/Makefile" ;;
-+ "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Check-Radio/Makefile") CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Check-Radio/Makefile" ;;
-+ "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Combo/Makefile") CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Combo/Makefile" ;;
-+ "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Frame-Gap/Makefile") CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Frame-Gap/Makefile" ;;
-+ "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Handles/Makefile") CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Handles/Makefile" ;;
-+ "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Lines/Makefile") CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Lines/Makefile" ;;
-+ "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ListHeaders/Makefile") CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ListHeaders/Makefile" ;;
-+ "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Menu-Menubar/Makefile") CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Menu-Menubar/Makefile" ;;
-+ "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Others/Makefile") CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Others/Makefile" ;;
-+ "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Panel/Makefile") CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Panel/Makefile" ;;
-+ "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ProgressBar/Makefile") CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ProgressBar/Makefile" ;;
-+ "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Range/Makefile") CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Range/Makefile" ;;
-+ "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/Makefile") CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/Makefile" ;;
-+ "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Shadows/Makefile") CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Shadows/Makefile" ;;
-+ "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Spin/Makefile") CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Spin/Makefile" ;;
-+ "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs/Makefile") CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs/Makefile" ;;
-+ "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Toolbar/Makefile") CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Toolbar/Makefile" ;;
-+ "data/themes/gui-sdl/Makefile") CONFIG_FILES="$CONFIG_FILES data/themes/gui-sdl/Makefile" ;;
-+ "data/themes/gui-sdl/human/Makefile") CONFIG_FILES="$CONFIG_FILES data/themes/gui-sdl/human/Makefile" ;;
-+ "data/wonders/Makefile") CONFIG_FILES="$CONFIG_FILES data/wonders/Makefile" ;;
-+ "data/icons/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/Makefile" ;;
-+ "utility/Makefile") CONFIG_FILES="$CONFIG_FILES utility/Makefile" ;;
-+ "utility/ftwl/Makefile") CONFIG_FILES="$CONFIG_FILES utility/ftwl/Makefile" ;;
-+ "dependencies/Makefile") CONFIG_FILES="$CONFIG_FILES dependencies/Makefile" ;;
-+ "dependencies/lua/Makefile") CONFIG_FILES="$CONFIG_FILES dependencies/lua/Makefile" ;;
-+ "dependencies/tolua/Makefile") CONFIG_FILES="$CONFIG_FILES dependencies/tolua/Makefile" ;;
-+ "dependencies/lua/src/Makefile") CONFIG_FILES="$CONFIG_FILES dependencies/lua/src/Makefile" ;;
-+ "dependencies/lua/src/lib/Makefile") CONFIG_FILES="$CONFIG_FILES dependencies/lua/src/lib/Makefile" ;;
-+ "common/Makefile") CONFIG_FILES="$CONFIG_FILES common/Makefile" ;;
-+ "common/aicore/Makefile") CONFIG_FILES="$CONFIG_FILES common/aicore/Makefile" ;;
-+ "ai/Makefile") CONFIG_FILES="$CONFIG_FILES ai/Makefile" ;;
-+ "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
-+ "win32/Makefile") CONFIG_FILES="$CONFIG_FILES win32/Makefile" ;;
-+ "client/Makefile") CONFIG_FILES="$CONFIG_FILES client/Makefile" ;;
-+ "client/agents/Makefile") CONFIG_FILES="$CONFIG_FILES client/agents/Makefile" ;;
-+ "client/include/Makefile") CONFIG_FILES="$CONFIG_FILES client/include/Makefile" ;;
-+ "client/gui-sdl/Makefile") CONFIG_FILES="$CONFIG_FILES client/gui-sdl/Makefile" ;;
-+ "client/gui-gtk-2.0/Makefile") CONFIG_FILES="$CONFIG_FILES client/gui-gtk-2.0/Makefile" ;;
-+ "client/gui-xaw/Makefile") CONFIG_FILES="$CONFIG_FILES client/gui-xaw/Makefile" ;;
-+ "client/gui-win32/Makefile") CONFIG_FILES="$CONFIG_FILES client/gui-win32/Makefile" ;;
-+ "client/gui-ftwl/Makefile") CONFIG_FILES="$CONFIG_FILES client/gui-ftwl/Makefile" ;;
-+ "client/gui-stub/Makefile") CONFIG_FILES="$CONFIG_FILES client/gui-stub/Makefile" ;;
-+ "server/Makefile") CONFIG_FILES="$CONFIG_FILES server/Makefile" ;;
-+ "server/generator/Makefile") CONFIG_FILES="$CONFIG_FILES server/generator/Makefile" ;;
-+ "server/scripting/Makefile") CONFIG_FILES="$CONFIG_FILES server/scripting/Makefile" ;;
-+ "manual/Makefile") CONFIG_FILES="$CONFIG_FILES manual/Makefile" ;;
-+ "intl/Makefile") CONFIG_FILES="$CONFIG_FILES intl/Makefile" ;;
-+ "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
-+ "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
-+ "doc/man/Makefile") CONFIG_FILES="$CONFIG_FILES doc/man/Makefile" ;;
-+ "doc/ca/Makefile") CONFIG_FILES="$CONFIG_FILES doc/ca/Makefile" ;;
-+ "doc/de/Makefile") CONFIG_FILES="$CONFIG_FILES doc/de/Makefile" ;;
-+ "doc/fr/Makefile") CONFIG_FILES="$CONFIG_FILES doc/fr/Makefile" ;;
-+ "doc/it/Makefile") CONFIG_FILES="$CONFIG_FILES doc/it/Makefile" ;;
-+ "doc/ja/Makefile") CONFIG_FILES="$CONFIG_FILES doc/ja/Makefile" ;;
-+ "doc/nl/Makefile") CONFIG_FILES="$CONFIG_FILES doc/nl/Makefile" ;;
-+ "doc/sv/Makefile") CONFIG_FILES="$CONFIG_FILES doc/sv/Makefile" ;;
-+ "freeciv.spec") CONFIG_FILES="$CONFIG_FILES freeciv.spec:bootstrap/freeciv.spec.in" ;;
-+ "bootstrap/undep.sh") CONFIG_FILES="$CONFIG_FILES bootstrap/undep.sh" ;;
-+ "data/Freeciv") CONFIG_FILES="$CONFIG_FILES data/Freeciv" ;;
-+ "client/freeciv.desktop") CONFIG_FILES="$CONFIG_FILES client/freeciv.desktop:bootstrap/freeciv.desktop.in" ;;
-+ "server/freeciv-server.desktop") CONFIG_FILES="$CONFIG_FILES server/freeciv-server.desktop:bootstrap/freeciv-server.desktop.in" ;;
-+ "civ") CONFIG_FILES="$CONFIG_FILES civ:bootstrap/civ.in" ;;
-+ "ser") CONFIG_FILES="$CONFIG_FILES ser:bootstrap/ser.in" ;;
-+ "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
-+
- *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
- echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
- { (exit 1); exit 1; }; };;
- esac
- done
-
-+
- # If the user did not use the arguments to specify the items to instantiate,
- # then the envvar interface is used. Set only those that are not.
- # We use the long form for the default assignment because of an extremely
-@@ -24491,437 +26674,630 @@
- fi
-
- # Have a temporary directory for convenience. Make it in the build tree
--# simply because there is no reason to put it here, and in addition,
-+# simply because there is no reason against having it here, and in addition,
- # creating and moving files from /tmp can sometimes cause problems.
--# Create a temporary directory, and hook for its removal unless debugging.
-+# Hook for its removal unless debugging.
-+# Note that there is a small window in which the directory will not be cleaned:
-+# after its creation but before its name has been assigned to `$tmp'.
- $debug ||
- {
-- trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-+ tmp=
-+ trap 'exit_status=$?
-+ { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
-+' 0
- trap '{ (exit 1); exit 1; }' 1 2 13 15
- }
--
- # Create a (secure) tmp directory for tmp files.
-
- {
-- tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
-+ tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
- test -n "$tmp" && test -d "$tmp"
- } ||
- {
-- tmp=./confstat$$-$RANDOM
-- (umask 077 && mkdir $tmp)
-+ tmp=./conf$$-$RANDOM
-+ (umask 077 && mkdir "$tmp")
- } ||
- {
- echo "$me: cannot create a temporary directory in ." >&2
- { (exit 1); exit 1; }
- }
-
--_ACEOF
--
--cat >>$CONFIG_STATUS <<_ACEOF
--
- #
--# CONFIG_FILES section.
-+# Set up the sed scripts for CONFIG_FILES section.
- #
-
- # No need to generate the scripts if there are no CONFIG_FILES.
- # This happens for instance when ./config.status config.h
--if test -n "\$CONFIG_FILES"; then
-- # Protect against being on the right side of a sed subst in config.status.
-- sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
-- s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
--s, at SHELL@,$SHELL,;t t
--s, at PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
--s, at PACKAGE_NAME@,$PACKAGE_NAME,;t t
--s, at PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
--s, at PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
--s, at PACKAGE_STRING@,$PACKAGE_STRING,;t t
--s, at PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
--s, at exec_prefix@,$exec_prefix,;t t
--s, at prefix@,$prefix,;t t
--s, at program_transform_name@,$program_transform_name,;t t
--s, at bindir@,$bindir,;t t
--s, at sbindir@,$sbindir,;t t
--s, at libexecdir@,$libexecdir,;t t
--s, at datadir@,$datadir,;t t
--s, at sysconfdir@,$sysconfdir,;t t
--s, at sharedstatedir@,$sharedstatedir,;t t
--s, at localstatedir@,$localstatedir,;t t
--s, at libdir@,$libdir,;t t
--s, at includedir@,$includedir,;t t
--s, at oldincludedir@,$oldincludedir,;t t
--s, at infodir@,$infodir,;t t
--s, at mandir@,$mandir,;t t
--s, at build_alias@,$build_alias,;t t
--s, at host_alias@,$host_alias,;t t
--s, at target_alias@,$target_alias,;t t
--s, at DEFS@,$DEFS,;t t
--s, at ECHO_C@,$ECHO_C,;t t
--s, at ECHO_N@,$ECHO_N,;t t
--s, at ECHO_T@,$ECHO_T,;t t
--s, at LIBS@,$LIBS,;t t
--s, at build@,$build,;t t
--s, at build_cpu@,$build_cpu,;t t
--s, at build_vendor@,$build_vendor,;t t
--s, at build_os@,$build_os,;t t
--s, at host@,$host,;t t
--s, at host_cpu@,$host_cpu,;t t
--s, at host_vendor@,$host_vendor,;t t
--s, at host_os@,$host_os,;t t
--s, at MAJOR_VERSION@,$MAJOR_VERSION,;t t
--s, at MINOR_VERSION@,$MINOR_VERSION,;t t
--s, at NETWORK_CAPSTRING@,$NETWORK_CAPSTRING,;t t
--s, at INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
--s, at INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
--s, at INSTALL_DATA@,$INSTALL_DATA,;t t
--s, at PACKAGE@,$PACKAGE,;t t
--s, at VERSION@,$VERSION,;t t
--s, at ACLOCAL@,$ACLOCAL,;t t
--s, at AUTOCONF@,$AUTOCONF,;t t
--s, at AUTOMAKE@,$AUTOMAKE,;t t
--s, at AUTOHEADER@,$AUTOHEADER,;t t
--s, at MAKEINFO@,$MAKEINFO,;t t
--s, at AMTAR@,$AMTAR,;t t
--s, at install_sh@,$install_sh,;t t
--s, at STRIP@,$STRIP,;t t
--s, at ac_ct_STRIP@,$ac_ct_STRIP,;t t
--s, at INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
--s, at AWK@,$AWK,;t t
--s, at SET_MAKE@,$SET_MAKE,;t t
--s, at MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
--s, at MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
--s, at MAINT@,$MAINT,;t t
--s, at CC@,$CC,;t t
--s, at CFLAGS@,$CFLAGS,;t t
--s, at LDFLAGS@,$LDFLAGS,;t t
--s, at CPPFLAGS@,$CPPFLAGS,;t t
--s, at ac_ct_CC@,$ac_ct_CC,;t t
--s, at EXEEXT@,$EXEEXT,;t t
--s, at OBJEXT@,$OBJEXT,;t t
--s, at DEPDIR@,$DEPDIR,;t t
--s, at am__include@,$am__include,;t t
--s, at am__quote@,$am__quote,;t t
--s, at AMDEP_TRUE@,$AMDEP_TRUE,;t t
--s, at AMDEP_FALSE@,$AMDEP_FALSE,;t t
--s, at AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
--s, at CCDEPMODE@,$CCDEPMODE,;t t
--s, at CPP@,$CPP,;t t
--s, at EGREP@,$EGREP,;t t
--s, at AUTH_CFLAGS@,$AUTH_CFLAGS,;t t
--s, at AUTH_LIBS@,$AUTH_LIBS,;t t
--s, at SERVER_TRUE@,$SERVER_TRUE,;t t
--s, at SERVER_FALSE@,$SERVER_FALSE,;t t
--s, at CLIENT_TRUE@,$CLIENT_TRUE,;t t
--s, at CLIENT_FALSE@,$CLIENT_FALSE,;t t
--s, at FTWL_TRUE@,$FTWL_TRUE,;t t
--s, at FTWL_FALSE@,$FTWL_FALSE,;t t
--s, at MAKE_DATA_TRUE@,$MAKE_DATA_TRUE,;t t
--s, at MAKE_DATA_FALSE@,$MAKE_DATA_FALSE,;t t
--s, at MAKE_CLIENT_INCLUDE_TRUE@,$MAKE_CLIENT_INCLUDE_TRUE,;t t
--s, at MAKE_CLIENT_INCLUDE_FALSE@,$MAKE_CLIENT_INCLUDE_FALSE,;t t
--s, at CXX@,$CXX,;t t
--s, at CXXFLAGS@,$CXXFLAGS,;t t
--s, at ac_ct_CXX@,$ac_ct_CXX,;t t
--s, at CXXDEPMODE@,$CXXDEPMODE,;t t
--s, at LN_S@,$LN_S,;t t
--s, at RANLIB@,$RANLIB,;t t
--s, at ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
--s, at AR@,$AR,;t t
--s, at ac_ct_AR@,$ac_ct_AR,;t t
--s, at UNAME@,$UNAME,;t t
--s, at LIBICONV@,$LIBICONV,;t t
--s, at localedir@,$localedir,;t t
--s, at ALLOCA@,$ALLOCA,;t t
--s, at GLIBC21@,$GLIBC21,;t t
--s, at USE_NLS@,$USE_NLS,;t t
--s, at MSGFMT@,$MSGFMT,;t t
--s, at GMSGFMT@,$GMSGFMT,;t t
--s, at XGETTEXT@,$XGETTEXT,;t t
--s, at INTLBISON@,$INTLBISON,;t t
--s, at BUILD_INCLUDED_LIBINTL@,$BUILD_INCLUDED_LIBINTL,;t t
--s, at USE_INCLUDED_LIBINTL@,$USE_INCLUDED_LIBINTL,;t t
--s, at CATALOGS@,$CATALOGS,;t t
--s, at CATOBJEXT@,$CATOBJEXT,;t t
--s, at GMOFILES@,$GMOFILES,;t t
--s, at INTLLIBS@,$INTLLIBS,;t t
--s, at INTLOBJS@,$INTLOBJS,;t t
--s, at POFILES@,$POFILES,;t t
--s, at POSUB@,$POSUB,;t t
--s, at DATADIRNAME@,$DATADIRNAME,;t t
--s, at INSTOBJEXT@,$INSTOBJEXT,;t t
--s, at GENCAT@,$GENCAT,;t t
--s, at MKINSTALLDIRS@,$MKINSTALLDIRS,;t t
--s, at INTL_LIBTOOL_SUFFIX_PREFIX@,$INTL_LIBTOOL_SUFFIX_PREFIX,;t t
--s, at AUTO_DEPS@,$AUTO_DEPS,;t t
--s, at WINDRES@,$WINDRES,;t t
--s, at ac_ct_WINDRES@,$ac_ct_WINDRES,;t t
--s, at GZIP@,$GZIP,;t t
--s, at PKG_CONFIG@,$PKG_CONFIG,;t t
--s, at GTK_CFLAGS@,$GTK_CFLAGS,;t t
--s, at GTK_LIBS@,$GTK_LIBS,;t t
--s, at SDL_CONFIG@,$SDL_CONFIG,;t t
--s, at SDL_CFLAGS@,$SDL_CFLAGS,;t t
--s, at SDL_LIBS@,$SDL_LIBS,;t t
--s, at FT2_CONFIG@,$FT2_CONFIG,;t t
--s, at FT2_CFLAGS@,$FT2_CFLAGS,;t t
--s, at FT2_LIBS@,$FT2_LIBS,;t t
--s, at X_CFLAGS@,$X_CFLAGS,;t t
--s, at X_PRE_LIBS@,$X_PRE_LIBS,;t t
--s, at X_LIBS@,$X_LIBS,;t t
--s, at X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t
--s, at ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
--s, at PNG_CFLAGS@,$PNG_CFLAGS,;t t
--s, at PNG_LIBS@,$PNG_LIBS,;t t
--s, at libggz_libraries@,$libggz_libraries,;t t
--s, at libggz_includes@,$libggz_includes,;t t
--s, at LIBGGZ_INCLUDES@,$LIBGGZ_INCLUDES,;t t
--s, at LIBGGZ_LDFLAGS@,$LIBGGZ_LDFLAGS,;t t
--s, at LIB_GGZ@,$LIB_GGZ,;t t
--s, at ggzmod_libraries@,$ggzmod_libraries,;t t
--s, at ggzmod_includes@,$ggzmod_includes,;t t
--s, at GGZMOD_INCLUDES@,$GGZMOD_INCLUDES,;t t
--s, at GGZMOD_LDFLAGS@,$GGZMOD_LDFLAGS,;t t
--s, at LIB_GGZMOD@,$LIB_GGZMOD,;t t
--s, at GGZ_CONFIG@,$GGZ_CONFIG,;t t
--s, at ggzexecmoddir@,$ggzexecmoddir,;t t
--s, at ggzdatadir@,$ggzdatadir,;t t
--s, at ggz_config@,$ggz_config,;t t
--s, at ggzmoduleconfdir@,$ggzmoduleconfdir,;t t
--s, at packagesrcdir@,$packagesrcdir,;t t
--s, at ggz_gtk_libraries@,$ggz_gtk_libraries,;t t
--s, at ggz_gtk_includes@,$ggz_gtk_includes,;t t
--s, at GGZ_GTK_INCLUDES@,$GGZ_GTK_INCLUDES,;t t
--s, at GGZ_GTK_LDFLAGS@,$GGZ_GTK_LDFLAGS,;t t
--s, at LIB_GGZ_GTK@,$LIB_GGZ_GTK,;t t
--s, at GGZ_CLIENT_TRUE@,$GGZ_CLIENT_TRUE,;t t
--s, at GGZ_CLIENT_FALSE@,$GGZ_CLIENT_FALSE,;t t
--s, at GGZ_GTK_TRUE@,$GGZ_GTK_TRUE,;t t
--s, at GGZ_GTK_FALSE@,$GGZ_GTK_FALSE,;t t
--s, at ggzdmod_libraries@,$ggzdmod_libraries,;t t
--s, at ggzdmod_includes@,$ggzdmod_includes,;t t
--s, at GGZDMOD_INCLUDES@,$GGZDMOD_INCLUDES,;t t
--s, at GGZDMOD_LDFLAGS@,$GGZDMOD_LDFLAGS,;t t
--s, at LIB_GGZDMOD@,$LIB_GGZDMOD,;t t
--s, at ggzdconfdir@,$ggzdconfdir,;t t
--s, at ggzddatadir@,$ggzddatadir,;t t
--s, at ggzdexecmoddir@,$ggzdexecmoddir,;t t
--s, at ggzdexecmodpath@,$ggzdexecmodpath,;t t
--s, at GGZ_SERVER_TRUE@,$GGZ_SERVER_TRUE,;t t
--s, at GGZ_SERVER_FALSE@,$GGZ_SERVER_FALSE,;t t
--s, at gui_sources@,$gui_sources,;t t
--s, at CLIENT_CFLAGS@,$CLIENT_CFLAGS,;t t
--s, at CLIENT_CXXFLAGS@,$CLIENT_CXXFLAGS,;t t
--s, at CLIENT_LIBS@,$CLIENT_LIBS,;t t
--s, at CLIENT_LDFLAGS@,$CLIENT_LDFLAGS,;t t
--s, at SOUND_CFLAGS@,$SOUND_CFLAGS,;t t
--s, at SOUND_LIBS@,$SOUND_LIBS,;t t
--s, at FTWL_CFLAGS@,$FTWL_CFLAGS,;t t
--s, at VERSION_WITHOUT_LABEL@,$VERSION_WITHOUT_LABEL,;t t
--s, at VERSION_LABEL@,$VERSION_LABEL,;t t
--s, at AUDIO_SDL_TRUE@,$AUDIO_SDL_TRUE,;t t
--s, at AUDIO_SDL_FALSE@,$AUDIO_SDL_FALSE,;t t
--s, at CLIENT_GUI_SDL_TRUE@,$CLIENT_GUI_SDL_TRUE,;t t
--s, at CLIENT_GUI_SDL_FALSE@,$CLIENT_GUI_SDL_FALSE,;t t
--s, at CLIENT_GUI_GTK_2_0_TRUE@,$CLIENT_GUI_GTK_2_0_TRUE,;t t
--s, at CLIENT_GUI_GTK_2_0_FALSE@,$CLIENT_GUI_GTK_2_0_FALSE,;t t
--s, at CLIENT_GUI_XAW_TRUE@,$CLIENT_GUI_XAW_TRUE,;t t
--s, at CLIENT_GUI_XAW_FALSE@,$CLIENT_GUI_XAW_FALSE,;t t
--s, at CLIENT_GUI_BEOS_TRUE@,$CLIENT_GUI_BEOS_TRUE,;t t
--s, at CLIENT_GUI_BEOS_FALSE@,$CLIENT_GUI_BEOS_FALSE,;t t
--s, at CLIENT_GUI_STUB_TRUE@,$CLIENT_GUI_STUB_TRUE,;t t
--s, at CLIENT_GUI_STUB_FALSE@,$CLIENT_GUI_STUB_FALSE,;t t
--s, at CLIENT_GUI_WIN32_TRUE@,$CLIENT_GUI_WIN32_TRUE,;t t
--s, at CLIENT_GUI_WIN32_FALSE@,$CLIENT_GUI_WIN32_FALSE,;t t
--s, at CLIENT_GUI_FTWL_TRUE@,$CLIENT_GUI_FTWL_TRUE,;t t
--s, at CLIENT_GUI_FTWL_FALSE@,$CLIENT_GUI_FTWL_FALSE,;t t
--s, at FTWL_X11_TRUE@,$FTWL_X11_TRUE,;t t
--s, at FTWL_X11_FALSE@,$FTWL_X11_FALSE,;t t
--s, at FTWL_SDL_TRUE@,$FTWL_SDL_TRUE,;t t
--s, at FTWL_SDL_FALSE@,$FTWL_SDL_FALSE,;t t
--s, at FTWL_OPENGL_TRUE@,$FTWL_OPENGL_TRUE,;t t
--s, at FTWL_OPENGL_FALSE@,$FTWL_OPENGL_FALSE,;t t
--s, at MINGW32_TRUE@,$MINGW32_TRUE,;t t
--s, at MINGW32_FALSE@,$MINGW32_FALSE,;t t
--s, at SERVER_LIBS@,$SERVER_LIBS,;t t
--s, at CONFIGURE_DEPENDENCIES@,$CONFIGURE_DEPENDENCIES,;t t
--s, at LIBOBJS@,$LIBOBJS,;t t
--s, at LTLIBOBJS@,$LTLIBOBJS,;t t
--CEOF
--
--_ACEOF
--
-- cat >>$CONFIG_STATUS <<\_ACEOF
-- # Split the substitutions into bite-sized pieces for seds with
-- # small command number limits, like on Digital OSF/1 and HP-UX.
-- ac_max_sed_lines=48
-- ac_sed_frag=1 # Number of current file.
-- ac_beg=1 # First line for current file.
-- ac_end=$ac_max_sed_lines # Line after last line for current file.
-- ac_more_lines=:
-- ac_sed_cmds=
-- while $ac_more_lines; do
-- if test $ac_beg -gt 1; then
-- sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-- else
-- sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-- fi
-- if test ! -s $tmp/subs.frag; then
-- ac_more_lines=false
-- else
-- # The purpose of the label and of the branching condition is to
-- # speed up the sed processing (if there are no `@' at all, there
-- # is no need to browse any of the substitutions).
-- # These are the two extra sed commands mentioned above.
-- (echo ':t
-- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-- if test -z "$ac_sed_cmds"; then
-- ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-- else
-- ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-- fi
-- ac_sed_frag=`expr $ac_sed_frag + 1`
-- ac_beg=$ac_end
-- ac_end=`expr $ac_end + $ac_max_sed_lines`
-- fi
-- done
-- if test -z "$ac_sed_cmds"; then
-- ac_sed_cmds=cat
-+if test -n "$CONFIG_FILES"; then
-+
-+_ACEOF
-+
-+
-+
-+ac_delim='%!_!# '
-+for ac_last_try in false false false false false :; do
-+ cat >conf$$subs.sed <<_ACEOF
-+SHELL!$SHELL$ac_delim
-+PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
-+PACKAGE_NAME!$PACKAGE_NAME$ac_delim
-+PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
-+PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
-+PACKAGE_STRING!$PACKAGE_STRING$ac_delim
-+PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
-+exec_prefix!$exec_prefix$ac_delim
-+prefix!$prefix$ac_delim
-+program_transform_name!$program_transform_name$ac_delim
-+bindir!$bindir$ac_delim
-+sbindir!$sbindir$ac_delim
-+libexecdir!$libexecdir$ac_delim
-+datarootdir!$datarootdir$ac_delim
-+datadir!$datadir$ac_delim
-+sysconfdir!$sysconfdir$ac_delim
-+sharedstatedir!$sharedstatedir$ac_delim
-+localstatedir!$localstatedir$ac_delim
-+includedir!$includedir$ac_delim
-+oldincludedir!$oldincludedir$ac_delim
-+docdir!$docdir$ac_delim
-+infodir!$infodir$ac_delim
-+htmldir!$htmldir$ac_delim
-+dvidir!$dvidir$ac_delim
-+pdfdir!$pdfdir$ac_delim
-+psdir!$psdir$ac_delim
-+libdir!$libdir$ac_delim
-+localedir!$localedir$ac_delim
-+mandir!$mandir$ac_delim
-+DEFS!$DEFS$ac_delim
-+ECHO_C!$ECHO_C$ac_delim
-+ECHO_N!$ECHO_N$ac_delim
-+ECHO_T!$ECHO_T$ac_delim
-+LIBS!$LIBS$ac_delim
-+build_alias!$build_alias$ac_delim
-+host_alias!$host_alias$ac_delim
-+target_alias!$target_alias$ac_delim
-+build!$build$ac_delim
-+build_cpu!$build_cpu$ac_delim
-+build_vendor!$build_vendor$ac_delim
-+build_os!$build_os$ac_delim
-+host!$host$ac_delim
-+host_cpu!$host_cpu$ac_delim
-+host_vendor!$host_vendor$ac_delim
-+host_os!$host_os$ac_delim
-+MAJOR_VERSION!$MAJOR_VERSION$ac_delim
-+MINOR_VERSION!$MINOR_VERSION$ac_delim
-+NETWORK_CAPSTRING!$NETWORK_CAPSTRING$ac_delim
-+INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
-+INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
-+INSTALL_DATA!$INSTALL_DATA$ac_delim
-+am__isrc!$am__isrc$ac_delim
-+CYGPATH_W!$CYGPATH_W$ac_delim
-+PACKAGE!$PACKAGE$ac_delim
-+VERSION!$VERSION$ac_delim
-+ACLOCAL!$ACLOCAL$ac_delim
-+AUTOCONF!$AUTOCONF$ac_delim
-+AUTOMAKE!$AUTOMAKE$ac_delim
-+AUTOHEADER!$AUTOHEADER$ac_delim
-+MAKEINFO!$MAKEINFO$ac_delim
-+install_sh!$install_sh$ac_delim
-+STRIP!$STRIP$ac_delim
-+INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
-+mkdir_p!$mkdir_p$ac_delim
-+AWK!$AWK$ac_delim
-+SET_MAKE!$SET_MAKE$ac_delim
-+am__leading_dot!$am__leading_dot$ac_delim
-+AMTAR!$AMTAR$ac_delim
-+am__tar!$am__tar$ac_delim
-+am__untar!$am__untar$ac_delim
-+MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
-+MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
-+MAINT!$MAINT$ac_delim
-+CC!$CC$ac_delim
-+CFLAGS!$CFLAGS$ac_delim
-+LDFLAGS!$LDFLAGS$ac_delim
-+CPPFLAGS!$CPPFLAGS$ac_delim
-+ac_ct_CC!$ac_ct_CC$ac_delim
-+EXEEXT!$EXEEXT$ac_delim
-+OBJEXT!$OBJEXT$ac_delim
-+DEPDIR!$DEPDIR$ac_delim
-+am__include!$am__include$ac_delim
-+am__quote!$am__quote$ac_delim
-+AMDEP_TRUE!$AMDEP_TRUE$ac_delim
-+AMDEP_FALSE!$AMDEP_FALSE$ac_delim
-+AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
-+CCDEPMODE!$CCDEPMODE$ac_delim
-+am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
-+am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
-+CPP!$CPP$ac_delim
-+GREP!$GREP$ac_delim
-+EGREP!$EGREP$ac_delim
-+AUTH_CFLAGS!$AUTH_CFLAGS$ac_delim
-+AUTH_LIBS!$AUTH_LIBS$ac_delim
-+SERVER_TRUE!$SERVER_TRUE$ac_delim
-+SERVER_FALSE!$SERVER_FALSE$ac_delim
-+CLIENT_TRUE!$CLIENT_TRUE$ac_delim
-+_ACEOF
-+
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-+ break
-+ elif $ac_last_try; then
-+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-+ { (exit 1); exit 1; }; }
-+ else
-+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
- fi
--fi # test -n "$CONFIG_FILES"
-+done
-+
-+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-+if test -n "$ac_eof"; then
-+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-+ ac_eof=`expr $ac_eof + 1`
-+fi
-
-+cat >>$CONFIG_STATUS <<_ACEOF
-+cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-+_ACEOF
-+sed '
-+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-+s/^/s,@/; s/!/@,|#_!!_#|/
-+:n
-+t n
-+s/'"$ac_delim"'$/,g/; t
-+s/$/\\/; p
-+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-+' >>$CONFIG_STATUS <conf$$subs.sed
-+rm -f conf$$subs.sed
-+cat >>$CONFIG_STATUS <<_ACEOF
-+CEOF$ac_eof
-+_ACEOF
-+
-+
-+ac_delim='%!_!# '
-+for ac_last_try in false false false false false :; do
-+ cat >conf$$subs.sed <<_ACEOF
-+CLIENT_FALSE!$CLIENT_FALSE$ac_delim
-+FTWL_TRUE!$FTWL_TRUE$ac_delim
-+FTWL_FALSE!$FTWL_FALSE$ac_delim
-+MAKE_DATA_TRUE!$MAKE_DATA_TRUE$ac_delim
-+MAKE_DATA_FALSE!$MAKE_DATA_FALSE$ac_delim
-+MAKE_CLIENT_INCLUDE_TRUE!$MAKE_CLIENT_INCLUDE_TRUE$ac_delim
-+MAKE_CLIENT_INCLUDE_FALSE!$MAKE_CLIENT_INCLUDE_FALSE$ac_delim
-+CXX!$CXX$ac_delim
-+CXXFLAGS!$CXXFLAGS$ac_delim
-+ac_ct_CXX!$ac_ct_CXX$ac_delim
-+CXXDEPMODE!$CXXDEPMODE$ac_delim
-+am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
-+am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
-+LN_S!$LN_S$ac_delim
-+RANLIB!$RANLIB$ac_delim
-+AR!$AR$ac_delim
-+UNAME!$UNAME$ac_delim
-+LIBICONV!$LIBICONV$ac_delim
-+ALLOCA!$ALLOCA$ac_delim
-+GLIBC21!$GLIBC21$ac_delim
-+USE_NLS!$USE_NLS$ac_delim
-+MSGFMT!$MSGFMT$ac_delim
-+GMSGFMT!$GMSGFMT$ac_delim
-+XGETTEXT!$XGETTEXT$ac_delim
-+INTLBISON!$INTLBISON$ac_delim
-+BUILD_INCLUDED_LIBINTL!$BUILD_INCLUDED_LIBINTL$ac_delim
-+USE_INCLUDED_LIBINTL!$USE_INCLUDED_LIBINTL$ac_delim
-+CATALOGS!$CATALOGS$ac_delim
-+CATOBJEXT!$CATOBJEXT$ac_delim
-+GMOFILES!$GMOFILES$ac_delim
-+INTLLIBS!$INTLLIBS$ac_delim
-+INTLOBJS!$INTLOBJS$ac_delim
-+POFILES!$POFILES$ac_delim
-+POSUB!$POSUB$ac_delim
-+DATADIRNAME!$DATADIRNAME$ac_delim
-+INSTOBJEXT!$INSTOBJEXT$ac_delim
-+GENCAT!$GENCAT$ac_delim
-+MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim
-+INTL_LIBTOOL_SUFFIX_PREFIX!$INTL_LIBTOOL_SUFFIX_PREFIX$ac_delim
-+AUTO_DEPS!$AUTO_DEPS$ac_delim
-+WINDRES!$WINDRES$ac_delim
-+GZIP!$GZIP$ac_delim
-+PKG_CONFIG!$PKG_CONFIG$ac_delim
-+GTK_CFLAGS!$GTK_CFLAGS$ac_delim
-+GTK_LIBS!$GTK_LIBS$ac_delim
-+SDL_CONFIG!$SDL_CONFIG$ac_delim
-+SDL_CFLAGS!$SDL_CFLAGS$ac_delim
-+SDL_LIBS!$SDL_LIBS$ac_delim
-+FT2_CONFIG!$FT2_CONFIG$ac_delim
-+FT2_CFLAGS!$FT2_CFLAGS$ac_delim
-+FT2_LIBS!$FT2_LIBS$ac_delim
-+XMKMF!$XMKMF$ac_delim
-+X_CFLAGS!$X_CFLAGS$ac_delim
-+X_PRE_LIBS!$X_PRE_LIBS$ac_delim
-+X_LIBS!$X_LIBS$ac_delim
-+X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim
-+PNG_CFLAGS!$PNG_CFLAGS$ac_delim
-+PNG_LIBS!$PNG_LIBS$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
-+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
-+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_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
-+ggzdconfdir!$ggzdconfdir$ac_delim
-+ggzddatadir!$ggzddatadir$ac_delim
-+ggzdexecmoddir!$ggzdexecmoddir$ac_delim
-+ggzdexecmodpath!$ggzdexecmodpath$ac_delim
-+GGZ_SERVER_TRUE!$GGZ_SERVER_TRUE$ac_delim
-+GGZ_SERVER_FALSE!$GGZ_SERVER_FALSE$ac_delim
-+gui_sources!$gui_sources$ac_delim
-+CLIENT_CFLAGS!$CLIENT_CFLAGS$ac_delim
-+CLIENT_CXXFLAGS!$CLIENT_CXXFLAGS$ac_delim
-+_ACEOF
-+
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-+ break
-+ elif $ac_last_try; then
-+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-+ { (exit 1); exit 1; }; }
-+ else
-+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-+ fi
-+done
-+
-+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-+if test -n "$ac_eof"; then
-+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-+ ac_eof=`expr $ac_eof + 1`
-+fi
-+
-+cat >>$CONFIG_STATUS <<_ACEOF
-+cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
-+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-+_ACEOF
-+sed '
-+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-+s/^/s,@/; s/!/@,|#_!!_#|/
-+:n
-+t n
-+s/'"$ac_delim"'$/,g/; t
-+s/$/\\/; p
-+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-+' >>$CONFIG_STATUS <conf$$subs.sed
-+rm -f conf$$subs.sed
-+cat >>$CONFIG_STATUS <<_ACEOF
-+CEOF$ac_eof
- _ACEOF
-+
-+
-+ac_delim='%!_!# '
-+for ac_last_try in false false false false false :; do
-+ cat >conf$$subs.sed <<_ACEOF
-+CLIENT_LIBS!$CLIENT_LIBS$ac_delim
-+CLIENT_LDFLAGS!$CLIENT_LDFLAGS$ac_delim
-+SOUND_CFLAGS!$SOUND_CFLAGS$ac_delim
-+SOUND_LIBS!$SOUND_LIBS$ac_delim
-+FTWL_CFLAGS!$FTWL_CFLAGS$ac_delim
-+VERSION_WITHOUT_LABEL!$VERSION_WITHOUT_LABEL$ac_delim
-+VERSION_LABEL!$VERSION_LABEL$ac_delim
-+AUDIO_SDL_TRUE!$AUDIO_SDL_TRUE$ac_delim
-+AUDIO_SDL_FALSE!$AUDIO_SDL_FALSE$ac_delim
-+CLIENT_GUI_SDL_TRUE!$CLIENT_GUI_SDL_TRUE$ac_delim
-+CLIENT_GUI_SDL_FALSE!$CLIENT_GUI_SDL_FALSE$ac_delim
-+CLIENT_GUI_GTK_2_0_TRUE!$CLIENT_GUI_GTK_2_0_TRUE$ac_delim
-+CLIENT_GUI_GTK_2_0_FALSE!$CLIENT_GUI_GTK_2_0_FALSE$ac_delim
-+CLIENT_GUI_XAW_TRUE!$CLIENT_GUI_XAW_TRUE$ac_delim
-+CLIENT_GUI_XAW_FALSE!$CLIENT_GUI_XAW_FALSE$ac_delim
-+CLIENT_GUI_BEOS_TRUE!$CLIENT_GUI_BEOS_TRUE$ac_delim
-+CLIENT_GUI_BEOS_FALSE!$CLIENT_GUI_BEOS_FALSE$ac_delim
-+CLIENT_GUI_STUB_TRUE!$CLIENT_GUI_STUB_TRUE$ac_delim
-+CLIENT_GUI_STUB_FALSE!$CLIENT_GUI_STUB_FALSE$ac_delim
-+CLIENT_GUI_WIN32_TRUE!$CLIENT_GUI_WIN32_TRUE$ac_delim
-+CLIENT_GUI_WIN32_FALSE!$CLIENT_GUI_WIN32_FALSE$ac_delim
-+CLIENT_GUI_FTWL_TRUE!$CLIENT_GUI_FTWL_TRUE$ac_delim
-+CLIENT_GUI_FTWL_FALSE!$CLIENT_GUI_FTWL_FALSE$ac_delim
-+FTWL_X11_TRUE!$FTWL_X11_TRUE$ac_delim
-+FTWL_X11_FALSE!$FTWL_X11_FALSE$ac_delim
-+FTWL_SDL_TRUE!$FTWL_SDL_TRUE$ac_delim
-+FTWL_SDL_FALSE!$FTWL_SDL_FALSE$ac_delim
-+FTWL_OPENGL_TRUE!$FTWL_OPENGL_TRUE$ac_delim
-+FTWL_OPENGL_FALSE!$FTWL_OPENGL_FALSE$ac_delim
-+MINGW32_TRUE!$MINGW32_TRUE$ac_delim
-+MINGW32_FALSE!$MINGW32_FALSE$ac_delim
-+SERVER_LIBS!$SERVER_LIBS$ac_delim
-+CONFIGURE_DEPENDENCIES!$CONFIGURE_DEPENDENCIES$ac_delim
-+LIBOBJS!$LIBOBJS$ac_delim
-+LTLIBOBJS!$LTLIBOBJS$ac_delim
-+_ACEOF
-+
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 35; then
-+ break
-+ elif $ac_last_try; then
-+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-+ { (exit 1); exit 1; }; }
-+ else
-+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-+ fi
-+done
-+
-+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-+if test -n "$ac_eof"; then
-+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-+ ac_eof=`expr $ac_eof + 1`
-+fi
-+
-+cat >>$CONFIG_STATUS <<_ACEOF
-+cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof
-+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
-+_ACEOF
-+sed '
-+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-+s/^/s,@/; s/!/@,|#_!!_#|/
-+:n
-+t n
-+s/'"$ac_delim"'$/,g/; t
-+s/$/\\/; p
-+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-+' >>$CONFIG_STATUS <conf$$subs.sed
-+rm -f conf$$subs.sed
-+cat >>$CONFIG_STATUS <<_ACEOF
-+:end
-+s/|#_!!_#|//g
-+CEOF$ac_eof
-+_ACEOF
-+
-+
-+# VPATH may cause trouble with some makes, so we remove $(srcdir),
-+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-+# trailing colons and then remove the whole line if VPATH becomes empty
-+# (actually we leave an empty line to preserve line numbers).
-+if test "x$srcdir" = x.; then
-+ ac_vpsub='/^[ ]*VPATH[ ]*=/{
-+s/:*\$(srcdir):*/:/
-+s/:*\${srcdir}:*/:/
-+s/:*@srcdir@:*/:/
-+s/^\([^=]*=[ ]*\):*/\1/
-+s/:*$//
-+s/^[^=]*=[ ]*$//
-+}'
-+fi
-+
- cat >>$CONFIG_STATUS <<\_ACEOF
--for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
-- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-- case $ac_file in
-- - | *:- | *:-:* ) # input from stdin
-- cat >$tmp/stdin
-- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-- * ) ac_file_in=$ac_file.in ;;
-+fi # test -n "$CONFIG_FILES"
-+
-+
-+for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS
-+do
-+ case $ac_tag in
-+ :[FHLC]) ac_mode=$ac_tag; continue;;
-+ esac
-+ case $ac_mode$ac_tag in
-+ :[FHL]*:*);;
-+ :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-+echo "$as_me: error: Invalid tag $ac_tag." >&2;}
-+ { (exit 1); exit 1; }; };;
-+ :[FH]-) ac_tag=-:-;;
-+ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
- esac
-+ ac_save_IFS=$IFS
-+ IFS=:
-+ set x $ac_tag
-+ IFS=$ac_save_IFS
-+ shift
-+ ac_file=$1
-+ shift
-+
-+ case $ac_mode in
-+ :L) ac_source=$1;;
-+ :[FH])
-+ ac_file_inputs=
-+ for ac_f
-+ do
-+ case $ac_f in
-+ -) ac_f="$tmp/stdin";;
-+ *) # Look for the file first in the build tree, then in the source tree
-+ # (if the path is not absolute). The absolute path cannot be DOS-style,
-+ # because $ac_f cannot contain `:'.
-+ test -f "$ac_f" ||
-+ case $ac_f in
-+ [\\/$]*) false;;
-+ *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-+ esac ||
-+ { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-+echo "$as_me: error: cannot find input file: $ac_f" >&2;}
-+ { (exit 1); exit 1; }; };;
-+ esac
-+ ac_file_inputs="$ac_file_inputs $ac_f"
-+ done
-
-- # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
-- ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-+ # Let's still pretend it is `configure' which instantiates (i.e., don't
-+ # use $as_me), people would be surprised to read:
-+ # /* config.h. Generated by config.status. */
-+ configure_input="Generated from "`IFS=:
-+ echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
-+ if test x"$ac_file" != x-; then
-+ configure_input="$ac_file. $configure_input"
-+ { echo "$as_me:$LINENO: creating $ac_file" >&5
-+echo "$as_me: creating $ac_file" >&6;}
-+ fi
-+
-+ case $ac_tag in
-+ *:-:* | *:-) cat >"$tmp/stdin";;
-+ esac
-+ ;;
-+ esac
-+
-+ ac_dir=`$as_dirname -- "$ac_file" ||
- $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-- X"$ac_file" : 'X\(//\)[^/]' \| \
-- X"$ac_file" : 'X\(//\)$' \| \
-- X"$ac_file" : 'X\(/\)' \| \
-- . : '\(.\)' 2>/dev/null ||
-+ X"$ac_file" : 'X\(//\)[^/]' \| \
-+ X"$ac_file" : 'X\(//\)$' \| \
-+ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$ac_file" |
-- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-- /^X\(\/\/\)$/{ s//\1/; q; }
-- /^X\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
-- { if $as_mkdir_p; then
-- mkdir -p "$ac_dir"
-- else
-- as_dir="$ac_dir"
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)[^/].*/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\).*/{
-+ s//\1/
-+ q
-+ }
-+ s/.*/./; q'`
-+ { as_dir="$ac_dir"
-+ case $as_dir in #(
-+ -*) as_dir=./$as_dir;;
-+ esac
-+ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
- as_dirs=
-- while test ! -d "$as_dir"; do
-- as_dirs="$as_dir $as_dirs"
-- as_dir=`(dirname "$as_dir") 2>/dev/null ||
-+ while :; do
-+ case $as_dir in #(
-+ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
-+ *) as_qdir=$as_dir;;
-+ esac
-+ as_dirs="'$as_qdir' $as_dirs"
-+ as_dir=`$as_dirname -- "$as_dir" ||
- $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-- X"$as_dir" : 'X\(//\)[^/]' \| \
-- X"$as_dir" : 'X\(//\)$' \| \
-- X"$as_dir" : 'X\(/\)' \| \
-- . : '\(.\)' 2>/dev/null ||
-+ X"$as_dir" : 'X\(//\)[^/]' \| \
-+ X"$as_dir" : 'X\(//\)$' \| \
-+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$as_dir" |
-- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-- /^X\(\/\/\)$/{ s//\1/; q; }
-- /^X\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)[^/].*/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\).*/{
-+ s//\1/
-+ q
-+ }
-+ s/.*/./; q'`
-+ test -d "$as_dir" && break
- done
-- test ! -n "$as_dirs" || mkdir $as_dirs
-- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
--echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-+ test -z "$as_dirs" || eval "mkdir $as_dirs"
-+ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-+echo "$as_me: error: cannot create directory $as_dir" >&2;}
- { (exit 1); exit 1; }; }; }
--
- ac_builddir=.
-
--if test "$ac_dir" != .; then
-+case "$ac_dir" in
-+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+*)
- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-- # A "../" for each directory in $ac_dir_suffix.
-- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
--else
-- ac_dir_suffix= ac_top_builddir=
--fi
-+ # A ".." for each directory in $ac_dir_suffix.
-+ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
-+ case $ac_top_builddir_sub in
-+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-+ esac ;;
-+esac
-+ac_abs_top_builddir=$ac_pwd
-+ac_abs_builddir=$ac_pwd$ac_dir_suffix
-+# for backward compatibility:
-+ac_top_builddir=$ac_top_build_prefix
-
- case $srcdir in
-- .) # No --srcdir option. We are building in place.
-+ .) # We are building in place.
- ac_srcdir=.
-- if test -z "$ac_top_builddir"; then
-- ac_top_srcdir=.
-- else
-- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-- fi ;;
-- [\\/]* | ?:[\\/]* ) # Absolute path.
-+ ac_top_srcdir=$ac_top_builddir_sub
-+ ac_abs_top_srcdir=$ac_pwd ;;
-+ [\\/]* | ?:[\\/]* ) # Absolute name.
- ac_srcdir=$srcdir$ac_dir_suffix;
-- ac_top_srcdir=$srcdir ;;
-- *) # Relative path.
-- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-- ac_top_srcdir=$ac_top_builddir$srcdir ;;
--esac
--# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
--# absolute.
--ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
--ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
--ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
--ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
-+ ac_top_srcdir=$srcdir
-+ ac_abs_top_srcdir=$srcdir ;;
-+ *) # Relative name.
-+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-+ ac_top_srcdir=$ac_top_build_prefix$srcdir
-+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-+esac
-+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-+
-
-+ case $ac_mode in
-+ :F)
-+ #
-+ # CONFIG_FILE
-+ #
-
- case $INSTALL in
- [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-- *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
-+ *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
- esac
-+ ac_MKDIR_P=$MKDIR_P
-+ case $MKDIR_P in
-+ [\\/$]* | ?:[\\/]* ) ;;
-+ */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
-+ esac
-+_ACEOF
-
-- if test x"$ac_file" != x-; then
-- { echo "$as_me:$LINENO: creating $ac_file" >&5
--echo "$as_me: creating $ac_file" >&6;}
-- rm -f "$ac_file"
-- fi
-- # Let's still pretend it is `configure' which instantiates (i.e., don't
-- # use $as_me), people would be surprised to read:
-- # /* config.h. Generated by config.status. */
-- if test x"$ac_file" = x-; then
-- configure_input=
-- else
-- configure_input="$ac_file. "
-- fi
-- configure_input=$configure_input"Generated from `echo $ac_file_in |
-- sed 's,.*/,,'` by configure."
--
-- # First look for the input files in the build tree, otherwise in the
-- # src tree.
-- ac_file_inputs=`IFS=:
-- for f in $ac_file_in; do
-- case $f in
-- -) echo $tmp/stdin ;;
-- [\\/$]*)
-- # Absolute (can't be DOS-style, as IFS=:)
-- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
--echo "$as_me: error: cannot find input file: $f" >&2;}
-- { (exit 1); exit 1; }; }
-- echo $f;;
-- *) # Relative
-- if test -f "$f"; then
-- # Build tree
-- echo $f
-- elif test -f "$srcdir/$f"; then
-- # Source tree
-- echo $srcdir/$f
-- else
-- # /dev/null tree
-- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
--echo "$as_me: error: cannot find input file: $f" >&2;}
-- { (exit 1); exit 1; }; }
-- fi;;
-- esac
-- done` || { (exit 1); exit 1; }
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+# If the template does not know about datarootdir, expand it.
-+# FIXME: This hack should be removed a few years after 2.60.
-+ac_datarootdir_hack=; ac_datarootdir_seen=
-+
-+case `sed -n '/datarootdir/ {
-+ p
-+ q
-+}
-+/@datadir@/p
-+/@docdir@/p
-+/@infodir@/p
-+/@localedir@/p
-+/@mandir@/p
-+' $ac_file_inputs` in
-+*datarootdir*) ac_datarootdir_seen=yes;;
-+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-+ { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-+echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-+_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF
-+ ac_datarootdir_hack='
-+ s&@datadir@&$datadir&g
-+ s&@docdir@&$docdir&g
-+ s&@infodir@&$infodir&g
-+ s&@localedir@&$localedir&g
-+ s&@mandir@&$mandir&g
-+ s&\\\${datarootdir}&$datarootdir&g' ;;
-+esac
- _ACEOF
-+
-+# Neutralize VPATH when `$srcdir' = `.'.
-+# Shell code in configure.ac might set extrasub.
-+# FIXME: do we really want to maintain this feature?
- cat >>$CONFIG_STATUS <<_ACEOF
- sed "$ac_vpsub
- $extrasub
-@@ -24929,317 +27305,175 @@
- cat >>$CONFIG_STATUS <<\_ACEOF
- :t
- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
--s, at configure_input@,$configure_input,;t t
--s, at srcdir@,$ac_srcdir,;t t
--s, at abs_srcdir@,$ac_abs_srcdir,;t t
--s, at top_srcdir@,$ac_top_srcdir,;t t
--s, at abs_top_srcdir@,$ac_abs_top_srcdir,;t t
--s, at builddir@,$ac_builddir,;t t
--s, at abs_builddir@,$ac_abs_builddir,;t t
--s, at top_builddir@,$ac_top_builddir,;t t
--s, at abs_top_builddir@,$ac_abs_top_builddir,;t t
--s, at INSTALL@,$ac_INSTALL,;t t
--" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
-- rm -f $tmp/stdin
-- if test x"$ac_file" != x-; then
-- mv $tmp/out $ac_file
-- else
-- cat $tmp/out
-- rm -f $tmp/out
-- fi
-+s&@configure_input@&$configure_input&;t t
-+s&@top_builddir@&$ac_top_builddir_sub&;t t
-+s&@srcdir@&$ac_srcdir&;t t
-+s&@abs_srcdir@&$ac_abs_srcdir&;t t
-+s&@top_srcdir@&$ac_top_srcdir&;t t
-+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-+s&@builddir@&$ac_builddir&;t t
-+s&@abs_builddir@&$ac_abs_builddir&;t t
-+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-+s&@INSTALL@&$ac_INSTALL&;t t
-+s&@MKDIR_P@&$ac_MKDIR_P&;t t
-+$ac_datarootdir_hack
-+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" >$tmp/out
-+
-+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-+ { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-+ { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-+which seems to be undefined. Please make sure it is defined." >&5
-+echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-+which seems to be undefined. Please make sure it is defined." >&2;}
-
-- # Run the commands associated with the file.
-+ rm -f "$tmp/stdin"
- case $ac_file in
-- civ ) chmod +x civ ;;
-- ser ) chmod +x ser ;;
-+ -) cat "$tmp/out"; rm -f "$tmp/out";;
-+ *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
- esac
--done
--_ACEOF
--cat >>$CONFIG_STATUS <<\_ACEOF
--
--#
--# CONFIG_HEADER section.
--#
--
--# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
--# NAME is the cpp macro being defined and VALUE is the value it is being given.
--#
--# ac_d sets the value in "#define NAME VALUE" lines.
--ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)'
--ac_dB='[ ].*$,\1#\2'
-+ ;;
-+ :H)
-+ #
-+ # CONFIG_HEADER
-+ #
-+_ACEOF
-+
-+# Transform confdefs.h into a sed script `conftest.defines', that
-+# substitutes the proper values into config.h.in to produce config.h.
-+rm -f conftest.defines conftest.tail
-+# First, append a space to every undef/define line, to ease matching.
-+echo 's/$/ /' >conftest.defines
-+# Then, protect against being on the right side of a sed subst, or in
-+# an unquoted here document, in config.status. If some macros were
-+# called several times there might be several #defines for the same
-+# symbol, which is useless. But do not sort them, since the last
-+# AC_DEFINE must be honored.
-+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-+# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
-+# NAME is the cpp macro being defined, VALUE is the value it is being given.
-+# PARAMS is the parameter list in the macro definition--in most cases, it's
-+# just an empty string.
-+ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*'
-+ac_dB='\\)[ (].*,\\1define\\2'
- ac_dC=' '
--ac_dD=',;t'
--# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
--ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
--ac_uB='$,\1#\2define\3'
--ac_uC=' '
--ac_uD=',;t'
-+ac_dD=' ,'
-
--for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
-- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-- case $ac_file in
-- - | *:- | *:-:* ) # input from stdin
-- cat >$tmp/stdin
-- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-- * ) ac_file_in=$ac_file.in ;;
-- esac
-+uniq confdefs.h |
-+ sed -n '
-+ t rset
-+ :rset
-+ s/^[ ]*#[ ]*define[ ][ ]*//
-+ t ok
-+ d
-+ :ok
-+ s/[\\&,]/\\&/g
-+ s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
-+ s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
-+ ' >>conftest.defines
-
-- test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
--echo "$as_me: creating $ac_file" >&6;}
--
-- # First look for the input files in the build tree, otherwise in the
-- # src tree.
-- ac_file_inputs=`IFS=:
-- for f in $ac_file_in; do
-- case $f in
-- -) echo $tmp/stdin ;;
-- [\\/$]*)
-- # Absolute (can't be DOS-style, as IFS=:)
-- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
--echo "$as_me: error: cannot find input file: $f" >&2;}
-- { (exit 1); exit 1; }; }
-- echo $f;;
-- *) # Relative
-- if test -f "$f"; then
-- # Build tree
-- echo $f
-- elif test -f "$srcdir/$f"; then
-- # Source tree
-- echo $srcdir/$f
-- else
-- # /dev/null tree
-- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
--echo "$as_me: error: cannot find input file: $f" >&2;}
-- { (exit 1); exit 1; }; }
-- fi;;
-- esac
-- done` || { (exit 1); exit 1; }
-- # Remove the trailing spaces.
-- sed 's/[ ]*$//' $ac_file_inputs >$tmp/in
--
--_ACEOF
--
--# Transform confdefs.h into two sed scripts, `conftest.defines' and
--# `conftest.undefs', that substitutes the proper values into
--# config.h.in to produce config.h. The first handles `#define'
--# templates, and the second `#undef' templates.
--# And first: Protect against being on the right side of a sed subst in
--# config.status. Protect against being in an unquoted here document
--# in config.status.
--rm -f conftest.defines conftest.undefs
--# Using a here document instead of a string reduces the quoting nightmare.
--# Putting comments in sed scripts is not portable.
--#
--# `end' is used to avoid that the second main sed command (meant for
--# 0-ary CPP macros) applies to n-ary macro definitions.
--# See the Autoconf documentation for `clear'.
--cat >confdef2sed.sed <<\_ACEOF
--s/[\\&,]/\\&/g
--s,[\\$`],\\&,g
--t clear
--: clear
--s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
--t end
--s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
--: end
--_ACEOF
--# If some macros were called several times there might be several times
--# the same #defines, which is useless. Nevertheless, we may not want to
--# sort them, since we want the *last* AC-DEFINE to be honored.
--uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
--sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
--rm -f confdef2sed.sed
--
--# This sed command replaces #undef with comments. This is necessary, for
-+# Remove the space that was appended to ease matching.
-+# Then replace #undef with comments. This is necessary, for
- # example, in the case of _POSIX_SOURCE, which is predefined and required
- # on some systems where configure will not decide to define it.
--cat >>conftest.undefs <<\_ACEOF
--s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
-+# (The regexp can be short, since the line contains either #define or #undef.)
-+echo 's/ $//
-+s,^[ #]*u.*,/* & */,' >>conftest.defines
-+
-+# Break up conftest.defines:
-+ac_max_sed_lines=50
-+
-+# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1"
-+# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2"
-+# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1"
-+# et cetera.
-+ac_in='$ac_file_inputs'
-+ac_out='"$tmp/out1"'
-+ac_nxt='"$tmp/out2"'
-+
-+while :
-+do
-+ # Write a here document:
-+ cat >>$CONFIG_STATUS <<_ACEOF
-+ # First, check the format of the line:
-+ cat >"\$tmp/defines.sed" <<\\CEOF
-+/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def
-+/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def
-+b
-+:def
- _ACEOF
--
--# Break up conftest.defines because some shells have a limit on the size
--# of here documents, and old seds have small limits too (100 cmds).
--echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
--echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
--echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
--echo ' :' >>$CONFIG_STATUS
--rm -f conftest.tail
--while grep . conftest.defines >/dev/null
--do
-- # Write a limited-size here document to $tmp/defines.sed.
-- echo ' cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
-- # Speed up: don't consider the non `#define' lines.
-- echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS
-- # Work around the forget-to-reset-the-flag bug.
-- echo 't clr' >>$CONFIG_STATUS
-- echo ': clr' >>$CONFIG_STATUS
-- sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
-+ sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
- echo 'CEOF
-- sed -f $tmp/defines.sed $tmp/in >$tmp/out
-- rm -f $tmp/in
-- mv $tmp/out $tmp/in
--' >>$CONFIG_STATUS
-- sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
-+ sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
-+ ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
-+ sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
-+ grep . conftest.tail >/dev/null || break
- rm -f conftest.defines
- mv conftest.tail conftest.defines
- done
--rm -f conftest.defines
--echo ' fi # grep' >>$CONFIG_STATUS
--echo >>$CONFIG_STATUS
--
--# Break up conftest.undefs because some shells have a limit on the size
--# of here documents, and old seds have small limits too (100 cmds).
--echo ' # Handle all the #undef templates' >>$CONFIG_STATUS
--rm -f conftest.tail
--while grep . conftest.undefs >/dev/null
--do
-- # Write a limited-size here document to $tmp/undefs.sed.
-- echo ' cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
-- # Speed up: don't consider the non `#undef'
-- echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS
-- # Work around the forget-to-reset-the-flag bug.
-- echo 't clr' >>$CONFIG_STATUS
-- echo ': clr' >>$CONFIG_STATUS
-- sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
-- echo 'CEOF
-- sed -f $tmp/undefs.sed $tmp/in >$tmp/out
-- rm -f $tmp/in
-- mv $tmp/out $tmp/in
--' >>$CONFIG_STATUS
-- sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
-- rm -f conftest.undefs
-- mv conftest.tail conftest.undefs
--done
--rm -f conftest.undefs
-+rm -f conftest.defines conftest.tail
-
-+echo "ac_result=$ac_in" >>$CONFIG_STATUS
- cat >>$CONFIG_STATUS <<\_ACEOF
-- # Let's still pretend it is `configure' which instantiates (i.e., don't
-- # use $as_me), people would be surprised to read:
-- # /* config.h. Generated by config.status. */
-- if test x"$ac_file" = x-; then
-- echo "/* Generated by configure. */" >$tmp/config.h
-- else
-- echo "/* $ac_file. Generated by configure. */" >$tmp/config.h
-- fi
-- cat $tmp/in >>$tmp/config.h
-- rm -f $tmp/in
- if test x"$ac_file" != x-; then
-- if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
-+ echo "/* $configure_input */" >"$tmp/config.h"
-+ cat "$ac_result" >>"$tmp/config.h"
-+ if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
- { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
- echo "$as_me: $ac_file is unchanged" >&6;}
- else
-- ac_dir=`(dirname "$ac_file") 2>/dev/null ||
--$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-- X"$ac_file" : 'X\(//\)[^/]' \| \
-- X"$ac_file" : 'X\(//\)$' \| \
-- X"$ac_file" : 'X\(/\)' \| \
-- . : '\(.\)' 2>/dev/null ||
--echo X"$ac_file" |
-- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-- /^X\(\/\/\)$/{ s//\1/; q; }
-- /^X\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
-- { if $as_mkdir_p; then
-- mkdir -p "$ac_dir"
-- else
-- as_dir="$ac_dir"
-- as_dirs=
-- while test ! -d "$as_dir"; do
-- as_dirs="$as_dir $as_dirs"
-- as_dir=`(dirname "$as_dir") 2>/dev/null ||
--$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-- X"$as_dir" : 'X\(//\)[^/]' \| \
-- X"$as_dir" : 'X\(//\)$' \| \
-- X"$as_dir" : 'X\(/\)' \| \
-- . : '\(.\)' 2>/dev/null ||
--echo X"$as_dir" |
-- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-- /^X\(\/\/\)$/{ s//\1/; q; }
-- /^X\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
-- done
-- test ! -n "$as_dirs" || mkdir $as_dirs
-- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
--echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-- { (exit 1); exit 1; }; }; }
--
- rm -f $ac_file
-- mv $tmp/config.h $ac_file
-+ mv "$tmp/config.h" $ac_file
- fi
- else
-- cat $tmp/config.h
-- rm -f $tmp/config.h
-+ echo "/* $configure_input */"
-+ cat "$ac_result"
- fi
-- # Run the commands associated with the file.
-- case $ac_file in
-- config.h ) # update the timestamp
--echo 'timestamp for config.h' >"./stamp-h1"
-- ;;
-+ rm -f "$tmp/out12"
-+# Compute $ac_file's index in $config_headers.
-+_am_arg=$ac_file
-+_am_stamp_count=1
-+for _am_header in $config_headers :; do
-+ case $_am_header in
-+ $_am_arg | $_am_arg:* )
-+ break ;;
-+ * )
-+ _am_stamp_count=`expr $_am_stamp_count + 1` ;;
- esac
- done
--_ACEOF
--cat >>$CONFIG_STATUS <<\_ACEOF
-+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
-+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+ X"$_am_arg" : 'X\(//\)[^/]' \| \
-+ X"$_am_arg" : 'X\(//\)$' \| \
-+ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
-+echo X"$_am_arg" |
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)[^/].*/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\).*/{
-+ s//\1/
-+ q
-+ }
-+ s/.*/./; q'`/stamp-h$_am_stamp_count
-+ ;;
-
--#
--# CONFIG_COMMANDS section.
--#
--for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
-- ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
-- ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
-- ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
--$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-- X"$ac_dest" : 'X\(//\)[^/]' \| \
-- X"$ac_dest" : 'X\(//\)$' \| \
-- X"$ac_dest" : 'X\(/\)' \| \
-- . : '\(.\)' 2>/dev/null ||
--echo X"$ac_dest" |
-- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-- /^X\(\/\/\)$/{ s//\1/; q; }
-- /^X\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
-- ac_builddir=.
-+ :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5
-+echo "$as_me: executing $ac_file commands" >&6;}
-+ ;;
-+ esac
-
--if test "$ac_dir" != .; then
-- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-- # A "../" for each directory in $ac_dir_suffix.
-- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
--else
-- ac_dir_suffix= ac_top_builddir=
--fi
-
--case $srcdir in
-- .) # No --srcdir option. We are building in place.
-- ac_srcdir=.
-- if test -z "$ac_top_builddir"; then
-- ac_top_srcdir=.
-- else
-- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-- fi ;;
-- [\\/]* | ?:[\\/]* ) # Absolute path.
-- ac_srcdir=$srcdir$ac_dir_suffix;
-- ac_top_srcdir=$srcdir ;;
-- *) # Relative path.
-- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-- ac_top_srcdir=$ac_top_builddir$srcdir ;;
--esac
--# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
--# absolute.
--ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
--ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
--ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
--ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
--
--
-- { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
--echo "$as_me: executing $ac_dest commands" >&6;}
-- case $ac_dest in
-- depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
-+ case $ac_file$ac_mode in
-+ "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
- # Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
-@@ -25247,90 +27481,123 @@
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
-- # So let's grep whole file.
-- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-- dirpart=`(dirname "$mf") 2>/dev/null ||
-+ # Grep'ing the whole file is not good either: AIX grep has a line
-+ # limit of 2048, but all sed's we know have understand at least 4000.
-+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-+ dirpart=`$as_dirname -- "$mf" ||
- $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-- X"$mf" : 'X\(//\)[^/]' \| \
-- X"$mf" : 'X\(//\)$' \| \
-- X"$mf" : 'X\(/\)' \| \
-- . : '\(.\)' 2>/dev/null ||
-+ X"$mf" : 'X\(//\)[^/]' \| \
-+ X"$mf" : 'X\(//\)$' \| \
-+ X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$mf" |
-- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-- /^X\(\/\/\)$/{ s//\1/; q; }
-- /^X\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)[^/].*/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\).*/{
-+ s//\1/
-+ q
-+ }
-+ s/.*/./; q'`
- else
- continue
- fi
-- grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue
-- # Extract the definition of DEP_FILES from the Makefile without
-- # running `make'.
-- DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
-+ # Extract the definition of DEPDIR, am__include, and am__quote
-+ # from the Makefile without running `make'.
-+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
-+ am__include=`sed -n 's/^am__include = //p' < "$mf"`
-+ test -z "am__include" && continue
-+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # When using ansi2knr, U may be empty or an underscore; expand it
-- U=`sed -n -e '/^U = / s///p' < "$mf"`
-- test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
-- # We invoke sed twice because it is the simplest approach to
-- # changing $(DEPDIR) to its actual value in the expansion.
-- for file in `sed -n -e '
-- /^DEP_FILES = .*\\\\$/ {
-- s/^DEP_FILES = //
-- :loop
-- s/\\\\$//
-- p
-- n
-- /\\\\$/ b loop
-- p
-- }
-- /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
-+ U=`sed -n 's/^U = //p' < "$mf"`
-+ # Find all dependency output files, they are included files with
-+ # $(DEPDIR) in their names. We invoke sed twice because it is the
-+ # simplest approach to changing $(DEPDIR) to its actual value in the
-+ # expansion.
-+ for file in `sed -n "
-+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
-- fdir=`(dirname "$file") 2>/dev/null ||
-+ fdir=`$as_dirname -- "$file" ||
- $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-- X"$file" : 'X\(//\)[^/]' \| \
-- X"$file" : 'X\(//\)$' \| \
-- X"$file" : 'X\(/\)' \| \
-- . : '\(.\)' 2>/dev/null ||
-+ X"$file" : 'X\(//\)[^/]' \| \
-+ X"$file" : 'X\(//\)$' \| \
-+ X"$file" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$file" |
-- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-- /^X\(\/\/\)$/{ s//\1/; q; }
-- /^X\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
-- { if $as_mkdir_p; then
-- mkdir -p $dirpart/$fdir
-- else
-- as_dir=$dirpart/$fdir
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)[^/].*/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\).*/{
-+ s//\1/
-+ q
-+ }
-+ s/.*/./; q'`
-+ { as_dir=$dirpart/$fdir
-+ case $as_dir in #(
-+ -*) as_dir=./$as_dir;;
-+ esac
-+ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
- as_dirs=
-- while test ! -d "$as_dir"; do
-- as_dirs="$as_dir $as_dirs"
-- as_dir=`(dirname "$as_dir") 2>/dev/null ||
-+ while :; do
-+ case $as_dir in #(
-+ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
-+ *) as_qdir=$as_dir;;
-+ esac
-+ as_dirs="'$as_qdir' $as_dirs"
-+ as_dir=`$as_dirname -- "$as_dir" ||
- $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-- X"$as_dir" : 'X\(//\)[^/]' \| \
-- X"$as_dir" : 'X\(//\)$' \| \
-- X"$as_dir" : 'X\(/\)' \| \
-- . : '\(.\)' 2>/dev/null ||
-+ X"$as_dir" : 'X\(//\)[^/]' \| \
-+ X"$as_dir" : 'X\(//\)$' \| \
-+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$as_dir" |
-- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-- /^X\(\/\/\)$/{ s//\1/; q; }
-- /^X\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)[^/].*/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\).*/{
-+ s//\1/
-+ q
-+ }
-+ s/.*/./; q'`
-+ test -d "$as_dir" && break
- done
-- test ! -n "$as_dirs" || mkdir $as_dirs
-- fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5
--echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
-+ test -z "$as_dirs" || eval "mkdir $as_dirs"
-+ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-+echo "$as_me: error: cannot create directory $as_dir" >&2;}
- { (exit 1); exit 1; }; }; }
--
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
- done
- done
- ;;
-- default-1 ) for ac_file in $CONFIG_FILES; do
-+ "default-1":C) for ac_file in $CONFIG_FILES; do
- # Support "outfile[:infile[:infile...]]"
- case "$ac_file" in
- *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-@@ -25359,7 +27626,7 @@
- ;;
- esac
- done ;;
-- fc_default-1 ) if test -f po/Makefile ; then
-+ "fc_default-1":C) if test -f po/Makefile ; then
- if grep 'keyword=N_ --keyword=Q_ --keyword=PL_:1,2' po/Makefile >/dev/null 2>&1 ; then
- # has already been extended
- :
-@@ -25370,7 +27637,7 @@
- rm po/Makefile.tmp
- fi
- fi ;;
-- fc_default-2 ) if test -f po/Makefile ; then
-+ "fc_default-2":C) if test -f po/Makefile ; then
- if grep 'language=C --files-from=\$(srcdir)/POTFILES.in' po/Makefile >/dev/null 2>&1 ; then
- # has already been silenced
- :
-@@ -25381,7 +27648,7 @@
- rm po/Makefile.tmp
- fi
- fi ;;
-- fc_default-4 ) if test -f po/Makefile ; then
-+ "fc_default-4":C) if test -f po/Makefile ; then
- if grep 'add-comments="TRANS:" --escape' po/Makefile >/dev/null 2>&1 ; then
- # has already been modified
- :
-@@ -25392,7 +27659,7 @@
- rm po/Makefile.tmp
- fi
- fi ;;
-- fc_default-5 ) if test x`uname -s` = xBeOS ; then
-+ "fc_default-5":C) if test x`uname -s` = xBeOS ; then
- if grep '#define HAVE_SYS_UIO_H 1' config.h >/dev/null 2>&1 ; then
- echo kluging config.h
- mv -f config.h config.h.tmp
-@@ -25400,12 +27667,13 @@
- rm config.h.tmp
- fi
- fi ;;
-- default ) chmod +x bootstrap/undep.sh ; bootstrap/undep.sh ;;
-+ "civ":F) chmod +x civ ;;
-+ "ser":F) chmod +x ser ;;
-+ "default":C) chmod +x bootstrap/undep.sh ; bootstrap/undep.sh ;;
-+
- esac
--done
--_ACEOF
-+done # for ac_tag
-
--cat >>$CONFIG_STATUS <<\_ACEOF
-
- { (exit 0); exit 0; }
- _ACEOF
diff -Nuar freeciv-2.1.5.orig/m4/ggz.m4 freeciv-2.1.5/m4/ggz.m4
--- freeciv-2.1.5.orig/m4/ggz.m4 2008-06-16 09:32:39.000000000 +0200
+++ freeciv-2.1.5/m4/ggz.m4 2008-06-25 23:56:55.000000000 +0200
--
Civilization turn-based strategy game
More information about the Pkg-games-commits
mailing list