patched oasys to permit usage of libdb4.7, packaged DTN2 into 3 packages - dtn-daemon, dtn-apps & dtn-test-utils. DTN2 packages now located under /net/DTN2/ included a replacement tcl8.4 Makefile as the default does not work (missing an init script)
1.1 --- a/README Wed Oct 28 12:17:25 2009 -0700
1.2 +++ b/README Fri Nov 06 16:13:56 2009 -0800
1.3 @@ -18,7 +18,9 @@
1.4
1.5 Libraries/liboasys
1.6 Libraries/liboasys/liboasys-dev
1.7 -Network/dtn
1.8 +Network/DTN2/dtn-daemon
1.9 +Network/DTN2/dtn-apps
1.10 +Network/DTN2/dtn-test-utils
1.11
1.12 ##########################################################
1.13 For a quick build summary checkout Kamikaze branch and packages with git
1.14 @@ -29,10 +31,28 @@
1.15
1.16 then install the feeds amd make symlinks
1.17
1.18 -openwrt$ ./scripts/feeds update -p dtnkamikaze
1.19 +openwrt$ ./scripts/feeds update dtnkamikaze
1.20 openwrt$ ./scripts/feeds install -p dtnkamikaze
1.21 openwrt$ make package/symlinks
1.22
1.23 openwrt$ make menuconfig
1.24
1.25 +select:
1.26 +Libraries/liboasys
1.27 +Libraries/liboasys/liboasys-dev
1.28 +Network/DTN2/dtn-daemon
1.29 +Network/DTN2/dtn-apps
1.30 +Network/DTN2/dtn-test-utils
1.31
1.32 +##########################################################
1.33 +### Note 1
1.34 +
1.35 +When dtnd is started for the first time you may have to set the clock on your embedded system which may be 'Thu Jan 1 00:00:00 UTC 1970' by default and will give an error like below.
1.36 +
1.37 +root@OpenWrt:# dtnd
1.38 +[4545.043913 /dtnd notice] random seed is 43888
1.39 +[4545.044589 /dtnd notice] DTN daemon starting up... (pid 861)
1.40 +ASSERTION FAILED ((u_int)now.tv_sec >= TIMEVAL_CONVERSION) at bundling/BundleTimestamp.cc:39
1.41 +NO STACK TRACE AVAILABLE ON THIS ARCHITECTURE
1.42 +Aborted
1.43 +
2.1 --- a/libs/oasys/Makefile Wed Oct 28 12:17:25 2009 -0700
2.2 +++ b/libs/oasys/Makefile Fri Nov 06 16:13:56 2009 -0800
2.3 @@ -23,12 +23,16 @@
2.4 PKG_BUILD_DIR:=$(BUILD_DIR)/oasys-$(PKG_VERSION)
2.5 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
2.6 PKG_SOURCE_URL:=http://downloads.sourceforge.net/project/dtn/oasys/oasys-$(PKG_VERSION)/oasys-$(PKG_VERSION).tgz?use_mirror=softlayer/
2.7 -PKG_MD5SUM:=57394850bc1ec0c9d94b96391cf8fb5f
2.8 +#PKG_MD5SUM:=57394850bc1ec0c9d94b96391cf8fb5f
2.9 +#PKG_BUILD_DEPENDS:=+libreadline +libdb47 +tcl +zlib +xerces-c
2.10
2.11 PKG_FIXUP:=libtool
2.12 +#PKG_CAT:=zcat
2.13
2.14 include $(INCLUDE_DIR)/package.mk
2.15
2.16 +# Sart make install at build time
2.17 +#PKG_INSTALL:=1
2.18
2.19 define Package/liboasys
2.20 SECTION:=libs
2.21 @@ -38,7 +42,7 @@
2.22 URL:=http://dtn.hg.sourceforge.net/hgweb/dtn/oasys/
2.23 MAINTAINER:=alex.mcmahon@cs.tcd.ie
2.24 # +xerces-c
2.25 - DEPENDS:=+libreadline +libdb +tcl +zlib +python
2.26 + DEPENDS:=+libreadline +libdb47 +tcl +zlib +python-mini
2.27 MENU:=1
2.28 endef
2.29
2.30 @@ -78,6 +82,7 @@
2.31 --with-tcldir="$(STAGING_DIR)/usr" \
2.32 --without-bluez \
2.33 --with-xsd-tool="$(STAGING_DIR)/usr" \
2.34 + --with-db="$(STAGING_DIR)/usr/lib/db47/usr" \
2.35 )
2.36 endef
2.37
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
3.2 +++ b/libs/oasys/patches/001-oasys-diff Fri Nov 06 16:13:56 2009 -0800
3.3 @@ -0,0 +1,14021 @@
3.4 +diff -r c6dc6a854b31 -r 7ce2b4528dee Makefile
3.5 +--- a/Makefile Wed Nov 04 21:44:35 2009 -0800
3.6 ++++ b/Makefile Wed Nov 04 21:47:13 2009 -0800
3.7 +@@ -27,6 +27,8 @@
3.8 + compat/inet_aton.c \
3.9 + compat/rpc_compat.c \
3.10 + compat/xdr_int64_compat.c \
3.11 ++ compat/cfmakeraw.c \
3.12 ++ compat/cfsetspeed.c \
3.13 +
3.14 + COMPAT_EXTLIB_SRCS := \
3.15 + compat/editline_compat.c \
3.16 +@@ -300,9 +302,7 @@
3.17 + # Make sure the clean rule knows about which files need cleaning
3.18 + #
3.19 + CFGFILES := Rules.make oasys-config.h config.cache config.log config.status \
3.20 +- include/oasys share/oasys
3.21 +-CFGDIRS := include share
3.22 +-
3.23 ++CFGDIRS :=
3.24 + $(SRCDIR)/Rules.make.in:
3.25 + @echo SRCDIR: $(SRCDIR)
3.26 + @echo error -- Makefile did not set SRCDIR properly
3.27 +@@ -445,10 +445,6 @@
3.28 + TESTFILES := $(patsubst %,test/%,$(TESTFILES))
3.29 + test tests: all $(TESTS) $(TESTFILES)
3.30 +
3.31 +-# run tests
3.32 +-.PHONY: check
3.33 +-check:
3.34 +- cd test; tclsh UnitTest.tcl
3.35 +
3.36 + # tags
3.37 + .PHONY: tag tags
3.38 +diff -r c6dc6a854b31 -r 7ce2b4528dee README
3.39 +--- a/README Wed Nov 04 21:44:35 2009 -0800
3.40 ++++ b/README Wed Nov 04 21:47:13 2009 -0800
3.41 +@@ -4,6 +4,40 @@
3.42 + OASYS is a C++ library that provides a set of wrapper classes and
3.43 + utilities for systems programming projects.
3.44 +
3.45 ++oasys/compat/ portability and compatibility logic
3.46 ++oasys/debug/ debugging and logging support code
3.47 ++oasys/io/ I/O and networking support code
3.48 ++oasys/memory/ memory management and debugging support
3.49 ++oasys/serialize/ object serialization support
3.50 ++oasys/smtp/ SMTP (mail) protocol handlers
3.51 ++oasys/storage/ persistant storage interface
3.52 ++oasys/tclcmd/ tcl command infrastructure and support
3.53 ++oasys/test/ unit tests and other test files
3.54 ++oasys/thread/ thread / lock support implementation
3.55 ++oasys/util/ miscellaneous utility classes
3.56 ++
3.57 ++External Requirements
3.58 ++---------------------
3.59 ++
3.60 ++gcc/g++ The GNU Compiler Collection
3.61 ++pthreads libc6 - GNU C Library: Shared libraries
3.62 ++make The GNU version of the "make" utility
3.63 ++tcl The Tool Command Language [development]
3.64 ++
3.65 ++Optional External Packages
3.66 ++--------------------------
3.67 ++tclreadline GNU Readline Extension for Tcl/Tk
3.68 ++libreadline GNU readline and history libraries [development]
3.69 ++tclx Extended Tcl - shared library
3.70 ++tcllib Standard Tcl Library
3.71 ++libdb Berkeley v4.2 - v4.7 Database Libraries [development]
3.72 ++libbluetooth BlueZ Linux Bluetooth library [development]
3.73 ++libgoogle-perftools0 Libraries for CPU and heap analysis
3.74 ++libxerces-cs-dev Validating XML parser library for C++ [development]
3.75 ++python Interactive high-level object-oriented language
3.76 ++xsd XML Data Binding for C++
3.77 ++zlib Compression library [runtime]
3.78 ++
3.79 + Build / Installation:
3.80 + ---------------------
3.81 +
3.82 +diff -r c6dc6a854b31 -r 7ce2b4528dee Rules.make.in
3.83 +--- a/Rules.make.in Wed Nov 04 21:44:35 2009 -0800
3.84 ++++ b/Rules.make.in Wed Nov 04 21:47:13 2009 -0800
3.85 +@@ -112,6 +112,7 @@
3.86 + @echo " EXTLIB_CFLAGS: $(EXTLIB_CFLAGS)"
3.87 + @echo " EXTLIB_LDFLAGS: $(EXTLIB_LDFLAGS)"
3.88 +
3.89 ++
3.90 + #
3.91 + # Rule for generating a .o file from the corresponding .cc file;
3.92 + # automatically creates dependencies via the dependency flags.
3.93 +diff -r c6dc6a854b31 -r 7ce2b4528dee aclocal.m4
3.94 +--- a/aclocal.m4 Wed Nov 04 21:44:35 2009 -0800
3.95 ++++ b/aclocal.m4 Wed Nov 04 21:47:13 2009 -0800
3.96 +@@ -158,7 +158,26 @@
3.97 + dnl Autoconf support for configuring whether Apple's Bonjour stack is
3.98 + dnl available on the system
3.99 + dnl
3.100 ++AC_DEFUN(AC_BONJOUR_HELP, [
3.101 ++cat <<EOF
3.102 +
3.103 ++Configure error with bonjour...
3.104 ++
3.105 ++The default is to try to compile in bonjour support and
3.106 ++if development headers and libraries are not present
3.107 ++proceed. You appear to have stated '[$ac_use_bonjour]'
3.108 ++when asked whether bonjour support should be enabled
3.109 ++Can't find the required development headers (dns_sd.h) or
3.110 ++function (DNSServiceRegister) in dns_sd of the Avahi
3.111 ++Apple Bonjour library.
3.112 ++
3.113 ++
3.114 ++If you do not want bonjour support at all, you can specify
3.115 ++--without-bonjour.
3.116 ++
3.117 ++
3.118 ++EOF
3.119 ++])
3.120 + AC_DEFUN(AC_CONFIG_BONJOUR, [
3.121 +
3.122 + AC_ARG_WITH(bonjour,
3.123 +@@ -172,16 +191,18 @@
3.124 +
3.125 + AC_MSG_CHECKING([whether bonjour support should be enabled])
3.126 +
3.127 +- if test "$ac_use_bonjour" = "no"; then
3.128 +- AC_MSG_RESULT(no)
3.129 +
3.130 +- else
3.131 +- AC_MSG_RESULT($ac_use_bonjour)
3.132 ++ if test "$ac_use_bonjour" = "no"; then
3.133 ++ AC_MSG_RESULT(no)
3.134 ++
3.135 ++ else
3.136 ++ AC_MSG_RESULT($ac_use_bonjour)
3.137 +
3.138 + dnl look for the library and the header
3.139 + AC_EXTLIB_PREPARE
3.140 +- AC_CHECK_HEADERS([dns_sd.h], ac_has_bonjour_h=yes)
3.141 +- AC_SEARCH_LIBS(DNSServiceRegister, dns_sd, ac_has_bonjour_lib=yes)
3.142 ++ AC_MSG_CHECKING([searching for the bonjour library development headers])
3.143 ++ AC_CHECK_HEADERS([dns_sd.h], ac_has_bonjour_h=yes, AC_MSG_RESULT(bonjour header not found))
3.144 ++ AC_SEARCH_LIBS(DNSServiceRegister, dns_sd, ac_has_bonjour_lib=yes, AC_MSG_RESULT(function not found in bonjour library))
3.145 + AC_EXTLIB_SAVE
3.146 +
3.147 + dnl print the result
3.148 +@@ -195,7 +216,8 @@
3.149 + AC_MSG_RESULT(no)
3.150 +
3.151 + else
3.152 +- AC_MSG_ERROR([can't find bonjour headers or library])
3.153 ++ AC_BONJOUR_HELP
3.154 ++ AC_MSG_ERROR([can't find the required development headers for the Avahi Apple Bonjour library])
3.155 + fi
3.156 + fi
3.157 + ])
3.158 +@@ -250,7 +272,7 @@
3.159 + dnl Main macro for finding a usable db installation
3.160 + dnl
3.161 + AC_DEFUN(AC_CONFIG_DB, [
3.162 +- ac_dbvers='4.6 4.5 4.4 4.3 4.2 4.1'
3.163 ++ ac_dbvers='4.7 4.6 4.5 4.4 4.3 4.2 4.1'
3.164 + ac_dbdir='yes'
3.165 +
3.166 + AC_ARG_WITH(db,
3.167 +@@ -260,7 +282,7 @@
3.168 +
3.169 + AC_ARG_WITH(dbver,
3.170 + AC_HELP_STRING([--with-dbver=VERSION],
3.171 +- Berkeley DB versions to try (default 4.5-4.2)),
3.172 ++ Berkeley DB versions to try (default 4.7-4.2)),
3.173 + ac_dbvers=$withval)
3.174 +
3.175 + dnl
3.176 +@@ -701,8 +723,8 @@
3.177 + ac_with_cxx=$withval)
3.178 +
3.179 + if test "x$ac_with_cc" = "x" ; then
3.180 +- ac_try_cc="gcc gcc-4.1 gcc-4.0 gcc-3.4 gcc-3.3"
3.181 +- ac_try_cxx="g++ g++-4.0 g++-4.0 g++-3.4 g++-3.3"
3.182 ++ ac_try_cc="gcc gcc-4.3 gcc-4.2 gcc-4.1 gcc-4.0 gcc-3.4 gcc-3.3"
3.183 ++ ac_try_cxx="g++ g++-4.3 g++-4.2 g++-4.1 g++-4.0 g++-3.4 g++-3.3"
3.184 + else
3.185 + ac_try_cc=$ac_with_cc
3.186 +
3.187 +@@ -749,15 +771,11 @@
3.188 + dnl Figure out the version and set version-specific options
3.189 + dnl
3.190 + AC_CACHE_CHECK(for the version of the GNU C compiler, oasys_cv_prog_gccver, [
3.191 +- oasys_cv_prog_gccver=`$CC --version | head -n 1`
3.192 +- oasys_cv_prog_gccver=`echo $oasys_cv_prog_gccver | sed 's/.*gcc.*(GCC) //'`
3.193 +- oasys_cv_prog_gccver=`echo $oasys_cv_prog_gccver | sed 's/ .*//'`
3.194 ++ oasys_cv_prog_gccver=`$CC -dumpversion | cut -d. -f1-2`
3.195 + ])
3.196 +
3.197 + AC_CACHE_CHECK(for the version of the GNU C++ compiler, oasys_cv_prog_gxxver, [
3.198 +- oasys_cv_prog_gxxver=`$CXX --version | head -n 1`
3.199 +- oasys_cv_prog_gxxver=`echo $oasys_cv_prog_gxxver | sed 's/.*g++.*(GCC) //'`
3.200 +- oasys_cv_prog_gxxver=`echo $oasys_cv_prog_gxxver | sed 's/ .*//'`
3.201 ++ oasys_cv_prog_gxxver=`$CXX -dumpversion | cut -d. -f1-2`
3.202 + ])
3.203 +
3.204 + if test $oasys_cv_prog_gccver != $oasys_cv_prog_gxxver ; then
3.205 +@@ -1308,13 +1326,17 @@
3.206 + AC_DEFINE_UNQUOTED(LIBMYSQLD_ENABLED, 1,
3.207 + [whether the mysql embedded server is enabled])
3.208 +
3.209 +- AC_SEARCH_LIBS(request_init, wrap, [],
3.210 ++ AC_MSG_CHECKING([for mysql external dependencies.: checking for request_init() in libwrap])
3.211 ++ AC_SEARCH_LIBS(request_init, wrap, [],
3.212 + AC_MSG_ERROR([can't find request_init() in libwrap]))
3.213 +- AC_SEARCH_LIBS(exp, m, [],
3.214 ++ AC_MSG_CHECKING([for mysql external dependencies.: checking for exp() in libm])
3.215 ++ AC_SEARCH_LIBS(exp, m, [],
3.216 + AC_MSG_ERROR([can't find exp() in libm]))
3.217 +- AC_SEARCH_LIBS(crypt, crypt, [],
3.218 ++ AC_MSG_CHECKING([for mysql external dependencies.: checking for crypt() in libcrypt])
3.219 ++ AC_SEARCH_LIBS(crypt, crypt, [],
3.220 + AC_MSG_ERROR([can't find crypt() in libcrypt]))
3.221 +- AC_SEARCH_LIBS(compress, z, [],
3.222 ++ AC_MSG_CHECKING([for mysql external dependencies.: checking for compress() in libz])
3.223 ++ AC_SEARCH_LIBS(compress, z, [],
3.224 + AC_MSG_ERROR([can't find compress() in libz]))
3.225 + fi
3.226 +
3.227 +@@ -1502,7 +1524,7 @@
3.228 +
3.229 + AC_DEFUN(AC_OASYS_CONFIG_HELP, [
3.230 + cat <<EOF
3.231 +-
3.232 ++
3.233 + Configure error finding oasys.
3.234 +
3.235 + This script first looks for an oasys installation in the same location
3.236 +@@ -1516,6 +1538,11 @@
3.237 + If problems still exist, then look in the config.log to see exactly
3.238 + what the failing command was.
3.239 +
3.240 ++Download oasys-$ac_oasysver_major.$ac_oasysver_minor (or later)
3.241 ++from http://dtn.hg.sourceforge.net/hgweb/dtn/oasys to $ac_oasysdir.
3.242 ++You will then probably have to run ./configure and make
3.243 ++in the oasys code tree in order to be able to compile DTN2
3.244 ++
3.245 + EOF
3.246 +
3.247 + ])
3.248 +@@ -1540,36 +1567,49 @@
3.249 +
3.250 + ac_oasysdir_ver=`find .. -maxdepth 1 -type d -name $ac_oasysdir_ver_base.* | tail -1`
3.251 + if test "$ac_oasysdir" = "" ; then
3.252 +- if test -d "$ac_oasysdir_ver" ; then
3.253 +- ac_oasysdir=$ac_oasysdir_ver
3.254 +- elif test -d ../oasys ; then
3.255 +- ac_oasysdir=../oasys
3.256 +- else
3.257 +- ac_oasysdir=/usr
3.258 +- fi
3.259 ++ if test -d "$ac_oasysdir_ver" ; then
3.260 ++ ac_oasysdir=$ac_oasysdir_ver
3.261 ++ elif test -d ../oasys ; then
3.262 ++ ac_oasysdir=../oasys
3.263 ++
3.264 ++ else
3.265 ++ ac_oasysdir=/usr
3.266 ++ # Set the oasys paths properly. OASYS_INCDIR points to the parent
3.267 ++ # directory containing the oasys header files or the source
3.268 ++ # directory itself with a symlink (include/oasys -> .),
3.269 ++ # OASYS_LIBDIR points to the directory where the libraries are.
3.270 ++ # OASYS_ETCDIR points to where the various scripts are.
3.271 ++ #
3.272 ++ OASYS_INCDIR="$ac_oasysdir/include"
3.273 ++ OASYS_LIBDIR="$ac_oasysdir/lib"
3.274 ++ OASYS_ETCDIR="$ac_oasysdir/share/oasys"
3.275 ++ fi
3.276 ++ if test -d oasys ; then
3.277 ++ rm -rf oasys
3.278 ++ fi
3.279 ++ mkdir oasys oasys/include
3.280 ++ OASYS_INCDIR="oasys/include/oasys"
3.281 ++ OASYS_LIBDIR="oasys/lib"
3.282 ++ OASYS_ETCDIR="oasys/share"
3.283 ++ ln -s ../../$ac_oasysdir $OASYS_INCDIR
3.284 ++ ln -s ../$ac_oasysdir/lib $OASYS_LIBDIR
3.285 ++ ln -s ../$ac_oasysdir $OASYS_ETCDIR
3.286 + fi
3.287 +
3.288 + #
3.289 +- # Set the oasys paths properly. OASYS_INCDIR points to the parent
3.290 +- # directory containing the oasys header files or the source
3.291 +- # directory itself with a symlink (include/oasys -> .),
3.292 +- # OASYS_LIBDIR points to the directory where the libraries are.
3.293 +- # OASYS_ETCDIR points to where the various scripts are.
3.294 +- #
3.295 +- OASYS_INCDIR="$ac_oasysdir/include"
3.296 +- OASYS_LIBDIR="$ac_oasysdir/lib"
3.297 +- OASYS_ETCDIR="$ac_oasysdir/share/oasys"
3.298 +-
3.299 +- if test ! -d $OASYS_INCDIR ; then
3.300 +- AC_MSG_ERROR(nonexistent oasys include directory $OASYS_INCDIR)
3.301 ++ if test ! -d $OASYS_INCDIR ; then echo ""
3.302 ++ AC_OASYS_CONFIG_HELP
3.303 ++ AC_MSG_ERROR(nonexistent oasys include directory $OASYS_INCDIR)
3.304 + fi
3.305 +
3.306 +- if test ! -d $OASYS_LIBDIR ; then
3.307 +- AC_MSG_ERROR(nonexistent oasys library directory $OASYS_LIBDIR)
3.308 ++ if test ! -d $OASYS_LIBDIR ; then echo ""
3.309 ++ AC_OASYS_CONFIG_HELP
3.310 ++ AC_MSG_ERROR(nonexistent oasys library directory $OASYS_LIBDIR)
3.311 + fi
3.312 +
3.313 +- if test ! -d $OASYS_ETCDIR ; then
3.314 +- AC_MSG_ERROR(nonexistent oasys tools directory $OASYS_ETCDIR)
3.315 ++ if test ! -d $OASYS_ETCDIR ; then echo ""
3.316 ++ AC_OASYS_CONFIG_HELP
3.317 ++ AC_MSG_ERROR(nonexistent oasys tools directory $OASYS_ETCDIR)
3.318 + fi
3.319 +
3.320 + if test "$ac_oasysver_major" = "" ; then
3.321 +@@ -1591,31 +1631,27 @@
3.322 + ac_save_LDFLAGS=$LDFLAGS
3.323 + LDFLAGS="$LDFLAGS $OASYS_LDFLAGS"
3.324 + AC_LINK_IFELSE(
3.325 +- AC_LANG_PROGRAM(
3.326 +- [
3.327 ++ AC_LANG_PROGRAM(
3.328 ++ [
3.329 + #include <oasys/oasys-version.h>
3.330 + #if (OASYS_VERSION_MAJOR != ${ac_oasysver_major}) || \
3.331 + (OASYS_VERSION_MINOR < ${ac_oasysver_minor})
3.332 + #error incorrect oasys version (wanted ${ac_oasysver_major}.${ac_oasysver_minor})
3.333 + #endif
3.334 +- ],
3.335 +- [
3.336 +- const char* s = oasys_version;
3.337 +- (void)s;
3.338 +- ]),
3.339 +- [
3.340 +- AC_MSG_RESULT($ac_oasysdir)
3.341 +- ],
3.342 +- [
3.343 +- AC_MSG_RESULT([no])
3.344 +- AC_MSG_ERROR([can't find compatible oasys install (version $ac_oasysver_major.$ac_oasysver_minor or better) at $ac_oasysdir])
3.345 ++ ],
3.346 ++ [
3.347 ++ const char* s = oasys_version;
3.348 ++ (void)s;
3.349 ++ ]),
3.350 ++ [
3.351 ++ AC_MSG_RESULT($ac_oasysdir)
3.352 ++ ],
3.353 ++ [
3.354 ++ AC_MSG_RESULT([no])
3.355 ++ AC_OASYS_CONFIG_HELP
3.356 ++ AC_MSG_ERROR([Can't find compatible oasys libraries which are a required for DTN2.])
3.357 + ])
3.358 +
3.359 +- #
3.360 +- # Create a symlink to the oasys directory for the test scripts
3.361 +- #
3.362 +- ln -s $ac_oasysdir oasys
3.363 +-
3.364 + CFLAGS=$ac_save_CFLAGS
3.365 + LDFLAGS=$ac_save_LDFLAGS
3.366 + ])
3.367 +@@ -2020,8 +2056,13 @@
3.368 + AC_SEARCH_LIBS(pthread_create, pthread, [],
3.369 + AC_MSG_ERROR([can't find required library function (pthread_create)]))
3.370 +
3.371 +- AC_CHECK_FUNC(pthread_yield, [], [AC_SEARCH_LIBS(sched_yield, rt, [],
3.372 +- AC_MSG_ERROR([can't find required library function (pthread_yield or sched_yield)]))])
3.373 ++ AC_SEARCH_LIBS(pthread_yield, [rt pthread],
3.374 ++ AC_DEFINE_UNQUOTED(HAVE_PTHREAD_YIELD, 1, [wether pthread_yield exists]),
3.375 ++ [])
3.376 ++
3.377 ++ AC_SEARCH_LIBS(sched_yield, [rt],
3.378 ++ AC_DEFINE_UNQUOTED(HAVE_SCHED_YIELD, 1, [wether sched_yield exists]),
3.379 ++ [])
3.380 +
3.381 + AC_SEARCH_LIBS(pthread_setspecific, pthread,
3.382 + AC_DEFINE_UNQUOTED(HAVE_PTHREAD_SETSPECIFIC, 1,
3.383 +@@ -2031,12 +2072,25 @@
3.384 + AC_SEARCH_LIBS(socket, socket, [],
3.385 + AC_MSG_ERROR([can't find required library function (socket)]))
3.386 +
3.387 +- AC_SEARCH_LIBS(gethostbyname, nsl, [],
3.388 +- AC_MSG_ERROR([can't find required library function (gethostbyname)]))
3.389 ++ AC_SEARCH_LIBS(gethostbyname, [socket nsl xnet],
3.390 ++ AC_DEFINE_UNQUOTED(HAVE_GETHOSTBYNAME, 1, [wether gethostbyname exists]),
3.391 ++ [])
3.392 ++
3.393 ++ AC_SEARCH_LIBS(gethostbyname_r, [socket nsl],
3.394 ++ AC_DEFINE_UNQUOTED(HAVE_GETHOSTBYNAME_R, 1, [wether gethostbyname_r exists]),
3.395 ++ [])
3.396 +
3.397 + AC_SEARCH_LIBS(xdr_int, rpc, [],
3.398 + AC_MSG_ERROR([can't find required library function (xdr_int)]))
3.399 +
3.400 ++ AC_SEARCH_LIBS(inet_aton, [nsl resolv socket],
3.401 ++ AC_DEFINE_UNQUOTED(HAVE_INET_ATON, 1, [wether inet_aton exists]),
3.402 ++ [])
3.403 ++
3.404 ++ AC_SEARCH_LIBS(inet_pton, [nsl resolv socket],
3.405 ++ AC_DEFINE_UNQUOTED(HAVE_INET_PTON, 1, [wether inet_pton exists]),
3.406 ++ [])
3.407 ++
3.408 + AC_EXTLIB_SAVE
3.409 + ])
3.410 +
3.411 +@@ -2085,7 +2139,7 @@
3.412 + dnl -------------------------------------------------------------------------
3.413 + AC_DEFUN(AC_OASYS_SYSTEM_FUNCTIONS, [
3.414 + # XXX/demmer get rid of me
3.415 +- AC_CHECK_FUNCS([fdatasync getaddrinfo gethostbyname gethostbyname_r getopt_long inet_aton inet_pton pthread_yield sched_yield])
3.416 ++ AC_CHECK_FUNCS([fdatasync getaddrinfo getopt_long cfmakeraw cfsetspeed])
3.417 + ])
3.418 +
3.419 + dnl -------------------------------------------------------------------------
3.420 +@@ -2123,7 +2177,7 @@
3.421 + dnl Main macro for finding a usable tcl installation
3.422 + dnl
3.423 + AC_DEFUN(AC_CONFIG_TCL, [
3.424 +- ac_tclvers='8.4 8.3'
3.425 ++ ac_tclvers='8.5 8.4 8.3'
3.426 + ac_tcldir='system'
3.427 +
3.428 + AC_ARG_WITH(tcl,
3.429 +@@ -2138,14 +2192,14 @@
3.430 +
3.431 + AC_ARG_WITH(tclver,
3.432 + AC_HELP_STRING([--with-tclver=VERSION],
3.433 +- [tcl version to use (default 8.4 or 8.3)]),
3.434 ++ [tcl version to use (default 8.5 - 8.3)]),
3.435 + ac_tclvers=$withval)
3.436 +
3.437 + dnl
3.438 + dnl We don't accept --without-tcl
3.439 + dnl
3.440 + if test $ac_tcldir = no ; then
3.441 +- AC_MSG_ERROR([cannot configure without tcl])
3.442 ++ AC_MSG_ERROR([tcl MUST be installed to configure])
3.443 + fi
3.444 +
3.445 + dnl
3.446 +@@ -2153,9 +2207,9 @@
3.447 + dnl
3.448 + AC_EXTLIB_PREPARE
3.449 + AC_SEARCH_LIBS(pow, m, [],
3.450 +- AC_MSG_ERROR([can't find required library function (pow)]))
3.451 ++ AC_MSG_ERROR([can't find standard C library function (pow) required by tcl]))
3.452 + AC_SEARCH_LIBS(dlopen, dl, [],
3.453 +- AC_MSG_ERROR([can't find required library function (dlopen)]))
3.454 ++ AC_MSG_ERROR([can't find standard library function (dlopen) required by tcl]))
3.455 + AC_EXTLIB_SAVE
3.456 +
3.457 + dnl
3.458 +@@ -2163,8 +2217,8 @@
3.459 + dnl specified something with --with-tcl, in which case we force
3.460 + dnl it to redo the checks (i.e. ignore the cached values).
3.461 + dnl
3.462 +- if test $ac_tcldir = system -a ! x$oasys_cv_path_tcl_h = x ; then
3.463 +- echo "checking for tcl installation... (cached) $oasys_cv_path_tcl_h/tcl.h, $oasys_cv_path_tcl_lib -l$oasys_cv_lib_tcl"
3.464 ++ if test $ac_tcldir = system -a ! x$oasys_cv_path_tcl_h = x ; then \
3.465 ++ echo "checking for tcl installation... (cached) $oasys_cv_path_tcl_h/tcl.h, $oasys_cv_path_tcl_lib -l$oasys_cv_lib_tcl"
3.466 + else
3.467 + AC_FIND_TCL
3.468 + fi
3.469 +@@ -2200,9 +2254,9 @@
3.470 + ac_tcldir=system
3.471 + ac_tclincdirs="/usr/include /usr/local/include"
3.472 + for ac_tclver in $ac_tclvers ; do
3.473 +- ac_tclincdirs="$ac_tclincdirs /usr/include/tcl$ac_tclver"
3.474 +- ac_tclincdirs="$ac_tclincdirs /usr/local/include/tcl$ac_tclver"
3.475 +- done
3.476 ++ ac_tclincdirs="$ac_tclincdirs /usr/include/tcl$ac_tclver /usr/local/include/tcl$ac_tclver"
3.477 ++ ac_tclincdirs="$ac_tclincdirs"
3.478 ++ done
3.479 + ac_tcllibdirs="/usr/lib /usr/local/lib"
3.480 + else
3.481 + ac_tclincdirs=$ac_tcldir/include
3.482 +@@ -2304,7 +2358,7 @@
3.483 + LIBS="$ac_save_LIBS"
3.484 +
3.485 + if test x$oasys_cv_path_tcl_h = x ; then
3.486 +- AC_MSG_ERROR([can't find usable tcl.h])
3.487 ++ AC_MSG_ERROR([Please install the tcl development files headers and libraries. Can't find usable tcl.h ])
3.488 + fi
3.489 + ])
3.490 + dnl
3.491 +@@ -2328,20 +2382,50 @@
3.492 + dnl
3.493 +
3.494 + dnl
3.495 ++dnl help
3.496 ++dnl
3.497 ++AC_DEFUN(AC_TCLRL_HELP, [
3.498 ++cat <<EOF
3.499 ++
3.500 ++Configure error with tclreadline...
3.501 ++
3.502 ++If you do not want tclreadline support at all, you can specify
3.503 ++--without-tclreadline.
3.504 ++
3.505 ++Download tclreadline from http://tclreadline.sourceforge.net/
3.506 ++
3.507 ++Before trying to compile tclreadline you should do the following things:
3.508 ++
3.509 ++ (a) Make sure you have tcl 8.0 or higher.
3.510 ++ tclreadline relies on a proper tcl installation:
3.511 ++ It uses the tclConfig.sh file, which should reside somewhere
3.512 ++ in /usr/local/lib/ or /usr/local/lib/tcl8.0/...
3.513 ++
3.514 ++ (b) Make sure you have gnu readline 2.2 or higher.
3.515 ++ tclreadline uses the gnu readline callback handler
3.516 ++
3.517 ++ (c) The usual ./configure; make; make install sequence should do the rest.
3.518 ++
3.519 ++
3.520 ++EOF
3.521 ++
3.522 ++])
3.523 ++dnl
3.524 + dnl Main macro for finding a usable db installation
3.525 + dnl
3.526 + AC_DEFUN(AC_CONFIG_TCLREADLINE, [
3.527 ++#ac_tclreadlinedir='system'
3.528 ++
3.529 + AC_ARG_WITH(tclreadline,
3.530 + AC_HELP_STRING([--with-tclreadline],
3.531 + [enable or disable tclreadline (default try)]),
3.532 + [ac_tclreadline=$withval],
3.533 + [ac_tclreadline=try])
3.534 +
3.535 +- AC_MSG_CHECKING([whether tclreadline support should be enabled])
3.536 +-
3.537 + dnl
3.538 + dnl First make sure we even want it
3.539 + dnl
3.540 ++ AC_MSG_CHECKING([whether tclreadline support should be enabled])
3.541 + if test "$ac_tclreadline" = no ; then
3.542 + AC_MSG_RESULT([no])
3.543 + TCLREADLINE_ENABLED=0
3.544 +@@ -2363,11 +2447,13 @@
3.545 + if test $BUILD_SYSTEM = 'CYGWIN' ; then
3.546 + TCLREADLINE_ENABLED=0
3.547 + else
3.548 +- AC_EXTLIB_PREPARE
3.549 +- AC_SEARCH_LIBS(readline,
3.550 +- readline,
3.551 +- [TCLREADLINE_ENABLED=1],
3.552 +- [TCLREADLINE_ENABLED=0])
3.553 ++ dnl
3.554 ++ dnl look for the library and the header
3.555 ++ dnl
3.556 ++ AC_EXTLIB_PREPARE
3.557 ++ AC_MSG_CHECKING([searching for the readline library development headers])
3.558 ++ AC_CHECK_HEADERS([readline/readline.h], TCLREADLINE_ENABLED=1, TCLREADLINE_ENABLED=0)
3.559 ++ AC_SEARCH_LIBS(readline, readline, TCLREADLINE_ENABLED=1, TCLREADLINE_ENABLED=0)
3.560 + AC_EXTLIB_SAVE
3.561 + fi
3.562 +
3.563 +@@ -2375,7 +2461,7 @@
3.564 + dnl Find out if we're using the BSD libedit implementation of
3.565 + dnl readline functionality.
3.566 + dnl
3.567 +- if test $TCLREADLINE_ENABLED = 1 ; then
3.568 ++ if test "$TCLREADLINE_ENABLED" = 1; then
3.569 + AC_CACHE_CHECK([whether readline is GNU readline or BSD editline],
3.570 + [oasys_cv_readline_is_editline],
3.571 + [AC_LINK_IFELSE([AC_LANG_CALL([], [rl_extend_line_buffer])],
3.572 +@@ -2389,10 +2475,16 @@
3.573 + dnl Finally, spit out an informative message
3.574 + AC_MSG_CHECKING([whether tclreadline support was found])
3.575 + AC_MSG_RESULT([yes])
3.576 ++
3.577 + else
3.578 ++
3.579 + dnl Finally, spit out an informative message
3.580 + AC_MSG_CHECKING([whether tclreadline support was found])
3.581 +- AC_MSG_RESULT([no])
3.582 ++ AC_MSG_RESULT([no])
3.583 ++ if test "$ac_tclreadline" = yes; then
3.584 ++ AC_TCLRL_HELP
3.585 ++ AC_MSG_ERROR([can't find usable tclreadline])
3.586 ++ fi
3.587 + fi
3.588 +
3.589 + fi # ac_tclreadline != no
3.590 +@@ -2443,6 +2535,9 @@
3.591 + if test "$ac_with_xerces_c" = no; then
3.592 + AC_MSG_RESULT([no])
3.593 + XERCES_C_ENABLED=0
3.594 ++ echo ""
3.595 ++ AC_MSG_NOTICE([Proceeding without xerces-c support as requested])
3.596 ++ echo ""
3.597 + else
3.598 +
3.599 + dnl
3.600 +diff -r c6dc6a854b31 -r 7ce2b4528dee aclocal/bonjour.ac
3.601 +--- a/aclocal/bonjour.ac Wed Nov 04 21:44:35 2009 -0800
3.602 ++++ b/aclocal/bonjour.ac Wed Nov 04 21:47:13 2009 -0800
3.603 +@@ -18,7 +18,26 @@
3.604 + dnl Autoconf support for configuring whether Apple's Bonjour stack is
3.605 + dnl available on the system
3.606 + dnl
3.607 ++AC_DEFUN(AC_BONJOUR_HELP, [
3.608 ++cat <<EOF
3.609 +
3.610 ++Configure error with bonjour...
3.611 ++
3.612 ++The default is to try to compile in bonjour support and
3.613 ++if development headers and libraries are not present
3.614 ++proceed. You appear to have stated '[$ac_use_bonjour]'
3.615 ++when asked whether bonjour support should be enabled
3.616 ++Can't find the required development headers (dns_sd.h) or
3.617 ++function (DNSServiceRegister) in dns_sd of the Avahi
3.618 ++Apple Bonjour library.
3.619 ++
3.620 ++
3.621 ++If you do not want bonjour support at all, you can specify
3.622 ++--without-bonjour.
3.623 ++
3.624 ++
3.625 ++EOF
3.626 ++])
3.627 + AC_DEFUN(AC_CONFIG_BONJOUR, [
3.628 +
3.629 + AC_ARG_WITH(bonjour,
3.630 +@@ -32,16 +51,18 @@
3.631 +
3.632 + AC_MSG_CHECKING([whether bonjour support should be enabled])
3.633 +
3.634 +- if test "$ac_use_bonjour" = "no"; then
3.635 +- AC_MSG_RESULT(no)
3.636 +
3.637 +- else
3.638 +- AC_MSG_RESULT($ac_use_bonjour)
3.639 ++ if test "$ac_use_bonjour" = "no"; then
3.640 ++ AC_MSG_RESULT(no)
3.641 ++
3.642 ++ else
3.643 ++ AC_MSG_RESULT($ac_use_bonjour)
3.644 +
3.645 + dnl look for the library and the header
3.646 + AC_EXTLIB_PREPARE
3.647 +- AC_CHECK_HEADERS([dns_sd.h], ac_has_bonjour_h=yes)
3.648 +- AC_SEARCH_LIBS(DNSServiceRegister, dns_sd, ac_has_bonjour_lib=yes)
3.649 ++ AC_MSG_CHECKING([searching for the bonjour library development headers])
3.650 ++ AC_CHECK_HEADERS([dns_sd.h], ac_has_bonjour_h=yes, AC_MSG_RESULT(bonjour header not found))
3.651 ++ AC_SEARCH_LIBS(DNSServiceRegister, dns_sd, ac_has_bonjour_lib=yes, AC_MSG_RESULT(function not found in bonjour library))
3.652 + AC_EXTLIB_SAVE
3.653 +
3.654 + dnl print the result
3.655 +@@ -55,7 +76,8 @@
3.656 + AC_MSG_RESULT(no)
3.657 +
3.658 + else
3.659 +- AC_MSG_ERROR([can't find bonjour headers or library])
3.660 ++ AC_BONJOUR_HELP
3.661 ++ AC_MSG_ERROR([can't find the required development headers for the Avahi Apple Bonjour library])
3.662 + fi
3.663 + fi
3.664 + ])
3.665 +diff -r c6dc6a854b31 -r 7ce2b4528dee aclocal/db.ac
3.666 +--- a/aclocal/db.ac Wed Nov 04 21:44:35 2009 -0800
3.667 ++++ b/aclocal/db.ac Wed Nov 04 21:47:13 2009 -0800
3.668 +@@ -49,7 +49,7 @@
3.669 + dnl Main macro for finding a usable db installation
3.670 + dnl
3.671 + AC_DEFUN(AC_CONFIG_DB, [
3.672 +- ac_dbvers='4.6 4.5 4.4 4.3 4.2 4.1'
3.673 ++ ac_dbvers='4.7 4.6 4.5 4.4 4.3 4.2 4.1'
3.674 + ac_dbdir='yes'
3.675 +
3.676 + AC_ARG_WITH(db,
3.677 +@@ -59,7 +59,7 @@
3.678 +
3.679 + AC_ARG_WITH(dbver,
3.680 + AC_HELP_STRING([--with-dbver=VERSION],
3.681 +- Berkeley DB versions to try (default 4.5-4.2)),
3.682 ++ Berkeley DB versions to try (default 4.7-4.2)),
3.683 + ac_dbvers=$withval)
3.684 +
3.685 + dnl
3.686 +diff -r c6dc6a854b31 -r 7ce2b4528dee aclocal/gcc.ac
3.687 +--- a/aclocal/gcc.ac Wed Nov 04 21:44:35 2009 -0800
3.688 ++++ b/aclocal/gcc.ac Wed Nov 04 21:47:13 2009 -0800
3.689 +@@ -35,8 +35,8 @@
3.690 + ac_with_cxx=$withval)
3.691 +
3.692 + if test "x$ac_with_cc" = "x" ; then
3.693 +- ac_try_cc="gcc gcc-4.1 gcc-4.0 gcc-3.4 gcc-3.3"
3.694 +- ac_try_cxx="g++ g++-4.0 g++-4.0 g++-3.4 g++-3.3"
3.695 ++ ac_try_cc="gcc gcc-4.3 gcc-4.2 gcc-4.1 gcc-4.0 gcc-3.4 gcc-3.3"
3.696 ++ ac_try_cxx="g++ g++-4.3 g++-4.2 g++-4.1 g++-4.0 g++-3.4 g++-3.3"
3.697 + else
3.698 + ac_try_cc=$ac_with_cc
3.699 +
3.700 +@@ -83,15 +83,11 @@
3.701 + dnl Figure out the version and set version-specific options
3.702 + dnl
3.703 + AC_CACHE_CHECK(for the version of the GNU C compiler, oasys_cv_prog_gccver, [
3.704 +- oasys_cv_prog_gccver=`$CC --version | head -n 1`
3.705 +- oasys_cv_prog_gccver=`echo $oasys_cv_prog_gccver | sed 's/.*gcc.*(GCC) //'`
3.706 +- oasys_cv_prog_gccver=`echo $oasys_cv_prog_gccver | sed 's/ .*//'`
3.707 ++ oasys_cv_prog_gccver=`$CC -dumpversion | cut -d. -f1-2`
3.708 + ])
3.709 +
3.710 + AC_CACHE_CHECK(for the version of the GNU C++ compiler, oasys_cv_prog_gxxver, [
3.711 +- oasys_cv_prog_gxxver=`$CXX --version | head -n 1`
3.712 +- oasys_cv_prog_gxxver=`echo $oasys_cv_prog_gxxver | sed 's/.*g++.*(GCC) //'`
3.713 +- oasys_cv_prog_gxxver=`echo $oasys_cv_prog_gxxver | sed 's/ .*//'`
3.714 ++ oasys_cv_prog_gxxver=`$CXX -dumpversion | cut -d. -f1-2`
3.715 + ])
3.716 +
3.717 + if test $oasys_cv_prog_gccver != $oasys_cv_prog_gxxver ; then
3.718 +diff -r c6dc6a854b31 -r 7ce2b4528dee aclocal/mysql.ac
3.719 +--- a/aclocal/mysql.ac Wed Nov 04 21:44:35 2009 -0800
3.720 ++++ b/aclocal/mysql.ac Wed Nov 04 21:47:13 2009 -0800
3.721 +@@ -53,13 +53,17 @@
3.722 + AC_DEFINE_UNQUOTED(LIBMYSQLD_ENABLED, 1,
3.723 + [whether the mysql embedded server is enabled])
3.724 +
3.725 +- AC_SEARCH_LIBS(request_init, wrap, [],
3.726 ++ AC_MSG_CHECKING([for mysql external dependencies.: checking for request_init() in libwrap])
3.727 ++ AC_SEARCH_LIBS(request_init, wrap, [],
3.728 + AC_MSG_ERROR([can't find request_init() in libwrap]))
3.729 +- AC_SEARCH_LIBS(exp, m, [],
3.730 ++ AC_MSG_CHECKING([for mysql external dependencies.: checking for exp() in libm])
3.731 ++ AC_SEARCH_LIBS(exp, m, [],
3.732 + AC_MSG_ERROR([can't find exp() in libm]))
3.733 +- AC_SEARCH_LIBS(crypt, crypt, [],
3.734 ++ AC_MSG_CHECKING([for mysql external dependencies.: checking for crypt() in libcrypt])
3.735 ++ AC_SEARCH_LIBS(crypt, crypt, [],
3.736 + AC_MSG_ERROR([can't find crypt() in libcrypt]))
3.737 +- AC_SEARCH_LIBS(compress, z, [],
3.738 ++ AC_MSG_CHECKING([for mysql external dependencies.: checking for compress() in libz])
3.739 ++ AC_SEARCH_LIBS(compress, z, [],
3.740 + AC_MSG_ERROR([can't find compress() in libz]))
3.741 + fi
3.742 +
3.743 +diff -r c6dc6a854b31 -r 7ce2b4528dee aclocal/oasys.ac
3.744 +--- a/aclocal/oasys.ac Wed Nov 04 21:44:35 2009 -0800
3.745 ++++ b/aclocal/oasys.ac Wed Nov 04 21:47:13 2009 -0800
3.746 +@@ -21,7 +21,7 @@
3.747 +
3.748 + AC_DEFUN(AC_OASYS_CONFIG_HELP, [
3.749 + cat <<EOF
3.750 +-
3.751 ++
3.752 + Configure error finding oasys.
3.753 +
3.754 + This script first looks for an oasys installation in the same location
3.755 +@@ -35,6 +35,11 @@
3.756 + If problems still exist, then look in the config.log to see exactly
3.757 + what the failing command was.
3.758 +
3.759 ++Download oasys-$ac_oasysver_major.$ac_oasysver_minor (or later)
3.760 ++from http://dtn.hg.sourceforge.net/hgweb/dtn/oasys to $ac_oasysdir.
3.761 ++You will then probably have to run ./configure and make
3.762 ++in the oasys code tree in order to be able to compile DTN2
3.763 ++
3.764 + EOF
3.765 +
3.766 + ])
3.767 +@@ -59,36 +64,49 @@
3.768 +
3.769 + ac_oasysdir_ver=`find .. -maxdepth 1 -type d -name $ac_oasysdir_ver_base.* | tail -1`
3.770 + if test "$ac_oasysdir" = "" ; then
3.771 +- if test -d "$ac_oasysdir_ver" ; then
3.772 +- ac_oasysdir=$ac_oasysdir_ver
3.773 +- elif test -d ../oasys ; then
3.774 +- ac_oasysdir=../oasys
3.775 +- else
3.776 +- ac_oasysdir=/usr
3.777 +- fi
3.778 ++ if test -d "$ac_oasysdir_ver" ; then
3.779 ++ ac_oasysdir=$ac_oasysdir_ver
3.780 ++ elif test -d ../oasys ; then
3.781 ++ ac_oasysdir=../oasys
3.782 ++
3.783 ++ else
3.784 ++ ac_oasysdir=/usr
3.785 ++ # Set the oasys paths properly. OASYS_INCDIR points to the parent
3.786 ++ # directory containing the oasys header files or the source
3.787 ++ # directory itself with a symlink (include/oasys -> .),
3.788 ++ # OASYS_LIBDIR points to the directory where the libraries are.
3.789 ++ # OASYS_ETCDIR points to where the various scripts are.
3.790 ++ #
3.791 ++ OASYS_INCDIR="$ac_oasysdir/include"
3.792 ++ OASYS_LIBDIR="$ac_oasysdir/lib"
3.793 ++ OASYS_ETCDIR="$ac_oasysdir/share/oasys"
3.794 ++ fi
3.795 ++ if test -d oasys ; then
3.796 ++ rm -rf oasys
3.797 ++ fi
3.798 ++ mkdir oasys oasys/include
3.799 ++ OASYS_INCDIR="oasys/include/oasys"
3.800 ++ OASYS_LIBDIR="oasys/lib"
3.801 ++ OASYS_ETCDIR="oasys/share"
3.802 ++ ln -s ../../$ac_oasysdir $OASYS_INCDIR
3.803 ++ ln -s ../$ac_oasysdir/lib $OASYS_LIBDIR
3.804 ++ ln -s ../$ac_oasysdir $OASYS_ETCDIR
3.805 + fi
3.806 +
3.807 + #
3.808 +- # Set the oasys paths properly. OASYS_INCDIR points to the parent
3.809 +- # directory containing the oasys header files or the source
3.810 +- # directory itself with a symlink (include/oasys -> .),
3.811 +- # OASYS_LIBDIR points to the directory where the libraries are.
3.812 +- # OASYS_ETCDIR points to where the various scripts are.
3.813 +- #
3.814 +- OASYS_INCDIR="$ac_oasysdir/include"
3.815 +- OASYS_LIBDIR="$ac_oasysdir/lib"
3.816 +- OASYS_ETCDIR="$ac_oasysdir/share/oasys"
3.817 +-
3.818 +- if test ! -d $OASYS_INCDIR ; then
3.819 +- AC_MSG_ERROR(nonexistent oasys include directory $OASYS_INCDIR)
3.820 ++ if test ! -d $OASYS_INCDIR ; then echo ""
3.821 ++ AC_OASYS_CONFIG_HELP
3.822 ++ AC_MSG_ERROR(nonexistent oasys include directory $OASYS_INCDIR)
3.823 + fi
3.824 +
3.825 +- if test ! -d $OASYS_LIBDIR ; then
3.826 +- AC_MSG_ERROR(nonexistent oasys library directory $OASYS_LIBDIR)
3.827 ++ if test ! -d $OASYS_LIBDIR ; then echo ""
3.828 ++ AC_OASYS_CONFIG_HELP
3.829 ++ AC_MSG_ERROR(nonexistent oasys library directory $OASYS_LIBDIR)
3.830 + fi
3.831 +
3.832 +- if test ! -d $OASYS_ETCDIR ; then
3.833 +- AC_MSG_ERROR(nonexistent oasys tools directory $OASYS_ETCDIR)
3.834 ++ if test ! -d $OASYS_ETCDIR ; then echo ""
3.835 ++ AC_OASYS_CONFIG_HELP
3.836 ++ AC_MSG_ERROR(nonexistent oasys tools directory $OASYS_ETCDIR)
3.837 + fi
3.838 +
3.839 + if test "$ac_oasysver_major" = "" ; then
3.840 +@@ -110,31 +128,27 @@
3.841 + ac_save_LDFLAGS=$LDFLAGS
3.842 + LDFLAGS="$LDFLAGS $OASYS_LDFLAGS"
3.843 + AC_LINK_IFELSE(
3.844 +- AC_LANG_PROGRAM(
3.845 +- [
3.846 ++ AC_LANG_PROGRAM(
3.847 ++ [
3.848 + #include <oasys/oasys-version.h>
3.849 + #if (OASYS_VERSION_MAJOR != ${ac_oasysver_major}) || \
3.850 + (OASYS_VERSION_MINOR < ${ac_oasysver_minor})
3.851 + #error incorrect oasys version (wanted ${ac_oasysver_major}.${ac_oasysver_minor})
3.852 + #endif
3.853 +- ],
3.854 +- [
3.855 +- const char* s = oasys_version;
3.856 +- (void)s;
3.857 +- ]),
3.858 +- [
3.859 +- AC_MSG_RESULT($ac_oasysdir)
3.860 +- ],
3.861 +- [
3.862 +- AC_MSG_RESULT([no])
3.863 +- AC_MSG_ERROR([can't find compatible oasys install (version $ac_oasysver_major.$ac_oasysver_minor or better) at $ac_oasysdir])
3.864 ++ ],
3.865 ++ [
3.866 ++ const char* s = oasys_version;
3.867 ++ (void)s;
3.868 ++ ]),
3.869 ++ [
3.870 ++ AC_MSG_RESULT($ac_oasysdir)
3.871 ++ ],
3.872 ++ [
3.873 ++ AC_MSG_RESULT([no])
3.874 ++ AC_OASYS_CONFIG_HELP
3.875 ++ AC_MSG_ERROR([Can't find compatible oasys libraries which are a required for DTN2.])
3.876 + ])
3.877 +
3.878 +- #
3.879 +- # Create a symlink to the oasys directory for the test scripts
3.880 +- #
3.881 +- ln -s $ac_oasysdir oasys
3.882 +-
3.883 + CFLAGS=$ac_save_CFLAGS
3.884 + LDFLAGS=$ac_save_LDFLAGS
3.885 + ])
3.886 +diff -r c6dc6a854b31 -r 7ce2b4528dee aclocal/sysdeps.ac
3.887 +--- a/aclocal/sysdeps.ac Wed Nov 04 21:44:35 2009 -0800
3.888 ++++ b/aclocal/sysdeps.ac Wed Nov 04 21:47:13 2009 -0800
3.889 +@@ -33,8 +33,13 @@
3.890 + AC_SEARCH_LIBS(pthread_create, pthread, [],
3.891 + AC_MSG_ERROR([can't find required library function (pthread_create)]))
3.892 +
3.893 +- AC_CHECK_FUNC(pthread_yield, [], [AC_SEARCH_LIBS(sched_yield, rt, [],
3.894 +- AC_MSG_ERROR([can't find required library function (pthread_yield or sched_yield)]))])
3.895 ++ AC_SEARCH_LIBS(pthread_yield, [rt pthread],
3.896 ++ AC_DEFINE_UNQUOTED(HAVE_PTHREAD_YIELD, 1, [wether pthread_yield exists]),
3.897 ++ [])
3.898 ++
3.899 ++ AC_SEARCH_LIBS(sched_yield, [rt],
3.900 ++ AC_DEFINE_UNQUOTED(HAVE_SCHED_YIELD, 1, [wether sched_yield exists]),
3.901 ++ [])
3.902 +
3.903 + AC_SEARCH_LIBS(pthread_setspecific, pthread,
3.904 + AC_DEFINE_UNQUOTED(HAVE_PTHREAD_SETSPECIFIC, 1,
3.905 +@@ -44,12 +49,25 @@
3.906 + AC_SEARCH_LIBS(socket, socket, [],
3.907 + AC_MSG_ERROR([can't find required library function (socket)]))
3.908 +
3.909 +- AC_SEARCH_LIBS(gethostbyname, nsl, [],
3.910 +- AC_MSG_ERROR([can't find required library function (gethostbyname)]))
3.911 ++ AC_SEARCH_LIBS(gethostbyname, [socket nsl xnet],
3.912 ++ AC_DEFINE_UNQUOTED(HAVE_GETHOSTBYNAME, 1, [wether gethostbyname exists]),
3.913 ++ [])
3.914 ++
3.915 ++ AC_SEARCH_LIBS(gethostbyname_r, [socket nsl],
3.916 ++ AC_DEFINE_UNQUOTED(HAVE_GETHOSTBYNAME_R, 1, [wether gethostbyname_r exists]),
3.917 ++ [])
3.918 +
3.919 + AC_SEARCH_LIBS(xdr_int, rpc, [],
3.920 + AC_MSG_ERROR([can't find required library function (xdr_int)]))
3.921 +
3.922 ++ AC_SEARCH_LIBS(inet_aton, [nsl resolv socket],
3.923 ++ AC_DEFINE_UNQUOTED(HAVE_INET_ATON, 1, [wether inet_aton exists]),
3.924 ++ [])
3.925 ++
3.926 ++ AC_SEARCH_LIBS(inet_pton, [nsl resolv socket],
3.927 ++ AC_DEFINE_UNQUOTED(HAVE_INET_PTON, 1, [wether inet_pton exists]),
3.928 ++ [])
3.929 ++
3.930 + AC_EXTLIB_SAVE
3.931 + ])
3.932 +
3.933 +@@ -98,7 +116,7 @@
3.934 + dnl -------------------------------------------------------------------------
3.935 + AC_DEFUN(AC_OASYS_SYSTEM_FUNCTIONS, [
3.936 + # XXX/demmer get rid of me
3.937 +- AC_CHECK_FUNCS([fdatasync getaddrinfo gethostbyname gethostbyname_r getopt_long inet_aton inet_pton pthread_yield sched_yield])
3.938 ++ AC_CHECK_FUNCS([fdatasync getaddrinfo getopt_long cfmakeraw cfsetspeed])
3.939 + ])
3.940 +
3.941 + dnl -------------------------------------------------------------------------
3.942 +diff -r c6dc6a854b31 -r 7ce2b4528dee aclocal/tcl.ac
3.943 +--- a/aclocal/tcl.ac Wed Nov 04 21:44:35 2009 -0800
3.944 ++++ b/aclocal/tcl.ac Wed Nov 04 21:47:13 2009 -0800
3.945 +@@ -22,7 +22,7 @@
3.946 + dnl Main macro for finding a usable tcl installation
3.947 + dnl
3.948 + AC_DEFUN(AC_CONFIG_TCL, [
3.949 +- ac_tclvers='8.4 8.3'
3.950 ++ ac_tclvers='8.5 8.4 8.3'
3.951 + ac_tcldir='system'
3.952 +
3.953 + AC_ARG_WITH(tcl,
3.954 +@@ -37,14 +37,14 @@
3.955 +
3.956 + AC_ARG_WITH(tclver,
3.957 + AC_HELP_STRING([--with-tclver=VERSION],
3.958 +- [tcl version to use (default 8.4 or 8.3)]),
3.959 ++ [tcl version to use (default 8.5 - 8.3)]),
3.960 + ac_tclvers=$withval)
3.961 +
3.962 + dnl
3.963 + dnl We don't accept --without-tcl
3.964 + dnl
3.965 + if test $ac_tcldir = no ; then
3.966 +- AC_MSG_ERROR([cannot configure without tcl])
3.967 ++ AC_MSG_ERROR([tcl MUST be installed to configure])
3.968 + fi
3.969 +
3.970 + dnl
3.971 +@@ -52,9 +52,9 @@
3.972 + dnl
3.973 + AC_EXTLIB_PREPARE
3.974 + AC_SEARCH_LIBS(pow, m, [],
3.975 +- AC_MSG_ERROR([can't find required library function (pow)]))
3.976 ++ AC_MSG_ERROR([can't find standard C library function (pow) required by tcl]))
3.977 + AC_SEARCH_LIBS(dlopen, dl, [],
3.978 +- AC_MSG_ERROR([can't find required library function (dlopen)]))
3.979 ++ AC_MSG_ERROR([can't find standard library function (dlopen) required by tcl]))
3.980 + AC_EXTLIB_SAVE
3.981 +
3.982 + dnl
3.983 +@@ -62,8 +62,8 @@
3.984 + dnl specified something with --with-tcl, in which case we force
3.985 + dnl it to redo the checks (i.e. ignore the cached values).
3.986 + dnl
3.987 +- if test $ac_tcldir = system -a ! x$oasys_cv_path_tcl_h = x ; then
3.988 +- echo "checking for tcl installation... (cached) $oasys_cv_path_tcl_h/tcl.h, $oasys_cv_path_tcl_lib -l$oasys_cv_lib_tcl"
3.989 ++ if test $ac_tcldir = system -a ! x$oasys_cv_path_tcl_h = x ; then \
3.990 ++ echo "checking for tcl installation... (cached) $oasys_cv_path_tcl_h/tcl.h, $oasys_cv_path_tcl_lib -l$oasys_cv_lib_tcl"
3.991 + else
3.992 + AC_FIND_TCL
3.993 + fi
3.994 +@@ -99,9 +99,9 @@
3.995 + ac_tcldir=system
3.996 + ac_tclincdirs="/usr/include /usr/local/include"
3.997 + for ac_tclver in $ac_tclvers ; do
3.998 +- ac_tclincdirs="$ac_tclincdirs /usr/include/tcl$ac_tclver"
3.999 +- ac_tclincdirs="$ac_tclincdirs /usr/local/include/tcl$ac_tclver"
3.1000 +- done
3.1001 ++ ac_tclincdirs="$ac_tclincdirs /usr/include/tcl$ac_tclver /usr/local/include/tcl$ac_tclver"
3.1002 ++ ac_tclincdirs="$ac_tclincdirs"
3.1003 ++ done
3.1004 + ac_tcllibdirs="/usr/lib /usr/local/lib"
3.1005 + else
3.1006 + ac_tclincdirs=$ac_tcldir/include
3.1007 +@@ -203,6 +203,6 @@
3.1008 + LIBS="$ac_save_LIBS"
3.1009 +
3.1010 + if test x$oasys_cv_path_tcl_h = x ; then
3.1011 +- AC_MSG_ERROR([can't find usable tcl.h])
3.1012 ++ AC_MSG_ERROR([Please install the tcl development files headers and libraries. Can't find usable tcl.h ])
3.1013 + fi
3.1014 + ])
3.1015 +diff -r c6dc6a854b31 -r 7ce2b4528dee aclocal/tclreadline.ac
3.1016 +--- a/aclocal/tclreadline.ac Wed Nov 04 21:44:35 2009 -0800
3.1017 ++++ b/aclocal/tclreadline.ac Wed Nov 04 21:47:13 2009 -0800
3.1018 +@@ -19,20 +19,50 @@
3.1019 + dnl
3.1020 +
3.1021 + dnl
3.1022 ++dnl help
3.1023 ++dnl
3.1024 ++AC_DEFUN(AC_TCLRL_HELP, [
3.1025 ++cat <<EOF
3.1026 ++
3.1027 ++Configure error with tclreadline...
3.1028 ++
3.1029 ++If you do not want tclreadline support at all, you can specify
3.1030 ++--without-tclreadline.
3.1031 ++
3.1032 ++Download tclreadline from http://tclreadline.sourceforge.net/
3.1033 ++
3.1034 ++Before trying to compile tclreadline you should do the following things:
3.1035 ++
3.1036 ++ (a) Make sure you have tcl 8.0 or higher.
3.1037 ++ tclreadline relies on a proper tcl installation:
3.1038 ++ It uses the tclConfig.sh file, which should reside somewhere
3.1039 ++ in /usr/local/lib/ or /usr/local/lib/tcl8.0/...
3.1040 ++
3.1041 ++ (b) Make sure you have gnu readline 2.2 or higher.
3.1042 ++ tclreadline uses the gnu readline callback handler
3.1043 ++
3.1044 ++ (c) The usual ./configure; make; make install sequence should do the rest.
3.1045 ++
3.1046 ++
3.1047 ++EOF
3.1048 ++
3.1049 ++])
3.1050 ++dnl
3.1051 + dnl Main macro for finding a usable db installation
3.1052 + dnl
3.1053 + AC_DEFUN(AC_CONFIG_TCLREADLINE, [
3.1054 ++#ac_tclreadlinedir='system'
3.1055 ++
3.1056 + AC_ARG_WITH(tclreadline,
3.1057 + AC_HELP_STRING([--with-tclreadline],
3.1058 + [enable or disable tclreadline (default try)]),
3.1059 + [ac_tclreadline=$withval],
3.1060 + [ac_tclreadline=try])
3.1061 +
3.1062 +- AC_MSG_CHECKING([whether tclreadline support should be enabled])
3.1063 +-
3.1064 + dnl
3.1065 + dnl First make sure we even want it
3.1066 + dnl
3.1067 ++ AC_MSG_CHECKING([whether tclreadline support should be enabled])
3.1068 + if test "$ac_tclreadline" = no ; then
3.1069 + AC_MSG_RESULT([no])
3.1070 + TCLREADLINE_ENABLED=0
3.1071 +@@ -54,11 +84,13 @@
3.1072 + if test $BUILD_SYSTEM = 'CYGWIN' ; then
3.1073 + TCLREADLINE_ENABLED=0
3.1074 + else
3.1075 +- AC_EXTLIB_PREPARE
3.1076 +- AC_SEARCH_LIBS(readline,
3.1077 +- readline,
3.1078 +- [TCLREADLINE_ENABLED=1],
3.1079 +- [TCLREADLINE_ENABLED=0])
3.1080 ++ dnl
3.1081 ++ dnl look for the library and the header
3.1082 ++ dnl
3.1083 ++ AC_EXTLIB_PREPARE
3.1084 ++ AC_MSG_CHECKING([searching for the readline library development headers])
3.1085 ++ AC_CHECK_HEADERS([readline/readline.h], TCLREADLINE_ENABLED=1, TCLREADLINE_ENABLED=0)
3.1086 ++ AC_SEARCH_LIBS(readline, readline, TCLREADLINE_ENABLED=1, TCLREADLINE_ENABLED=0)
3.1087 + AC_EXTLIB_SAVE
3.1088 + fi
3.1089 +
3.1090 +@@ -66,7 +98,7 @@
3.1091 + dnl Find out if we're using the BSD libedit implementation of
3.1092 + dnl readline functionality.
3.1093 + dnl
3.1094 +- if test $TCLREADLINE_ENABLED = 1 ; then
3.1095 ++ if test "$TCLREADLINE_ENABLED" = 1; then
3.1096 + AC_CACHE_CHECK([whether readline is GNU readline or BSD editline],
3.1097 + [oasys_cv_readline_is_editline],
3.1098 + [AC_LINK_IFELSE([AC_LANG_CALL([], [rl_extend_line_buffer])],
3.1099 +@@ -80,10 +112,16 @@
3.1100 + dnl Finally, spit out an informative message
3.1101 + AC_MSG_CHECKING([whether tclreadline support was found])
3.1102 + AC_MSG_RESULT([yes])
3.1103 ++
3.1104 + else
3.1105 ++
3.1106 + dnl Finally, spit out an informative message
3.1107 + AC_MSG_CHECKING([whether tclreadline support was found])
3.1108 +- AC_MSG_RESULT([no])
3.1109 ++ AC_MSG_RESULT([no])
3.1110 ++ if test "$ac_tclreadline" = yes; then
3.1111 ++ AC_TCLRL_HELP
3.1112 ++ AC_MSG_ERROR([can't find usable tclreadline])
3.1113 ++ fi
3.1114 + fi
3.1115 +
3.1116 + fi # ac_tclreadline != no
3.1117 +diff -r c6dc6a854b31 -r 7ce2b4528dee aclocal/xerces-c.ac
3.1118 +--- a/aclocal/xerces-c.ac Wed Nov 04 21:44:35 2009 -0800
3.1119 ++++ b/aclocal/xerces-c.ac Wed Nov 04 21:47:13 2009 -0800
3.1120 +@@ -41,6 +41,9 @@
3.1121 + if test "$ac_with_xerces_c" = no; then
3.1122 + AC_MSG_RESULT([no])
3.1123 + XERCES_C_ENABLED=0
3.1124 ++ echo ""
3.1125 ++ AC_MSG_NOTICE([Proceeding without xerces-c support as requested])
3.1126 ++ echo ""
3.1127 + else
3.1128 +
3.1129 + dnl
3.1130 +diff -r c6dc6a854b31 -r 7ce2b4528dee bluez/Bluetooth.cc
3.1131 +--- a/bluez/Bluetooth.cc Wed Nov 04 21:44:35 2009 -0800
3.1132 ++++ b/bluez/Bluetooth.cc Wed Nov 04 21:47:13 2009 -0800
3.1133 +@@ -20,8 +20,8 @@
3.1134 +
3.1135 + #ifdef OASYS_BLUETOOTH_ENABLED
3.1136 +
3.1137 +-#include <errno.h>
3.1138 +-#include <stdlib.h>
3.1139 ++#include <cerrno>
3.1140 ++#include <cstdlib>
3.1141 + #include <sys/types.h>
3.1142 + #include <sys/fcntl.h>
3.1143 + #include <sys/ioctl.h>
3.1144 +diff -r c6dc6a854b31 -r 7ce2b4528dee bluez/Bluetooth.h
3.1145 +--- a/bluez/Bluetooth.h Wed Nov 04 21:44:35 2009 -0800
3.1146 ++++ b/bluez/Bluetooth.h Wed Nov 04 21:47:13 2009 -0800
3.1147 +@@ -25,7 +25,7 @@
3.1148 + #ifdef OASYS_BLUETOOTH_ENABLED
3.1149 +
3.1150 + #include <fcntl.h>
3.1151 +-#include <stdlib.h>
3.1152 ++#include <cstdlib>
3.1153 + #include <sys/uio.h>
3.1154 + #include <sys/socket.h>
3.1155 +
3.1156 +diff -r c6dc6a854b31 -r 7ce2b4528dee bluez/BluetoothClient.cc
3.1157 +--- a/bluez/BluetoothClient.cc Wed Nov 04 21:44:35 2009 -0800
3.1158 ++++ b/bluez/BluetoothClient.cc Wed Nov 04 21:47:13 2009 -0800
3.1159 +@@ -20,7 +20,7 @@
3.1160 +
3.1161 + #ifdef OASYS_BLUETOOTH_ENABLED
3.1162 +
3.1163 +-#include <errno.h>
3.1164 ++#include <cerrno>
3.1165 + extern int errno;
3.1166 +
3.1167 + #include "BluetoothClient.h"
3.1168 +diff -r c6dc6a854b31 -r 7ce2b4528dee bluez/BluetoothInquiry.cc
3.1169 +--- a/bluez/BluetoothInquiry.cc Wed Nov 04 21:44:35 2009 -0800
3.1170 ++++ b/bluez/BluetoothInquiry.cc Wed Nov 04 21:47:13 2009 -0800
3.1171 +@@ -20,7 +20,7 @@
3.1172 +
3.1173 + #ifdef OASYS_BLUETOOTH_ENABLED
3.1174 +
3.1175 +-#include <stdlib.h>
3.1176 ++#include <cstdlib>
3.1177 + #include <sys/types.h>
3.1178 + #include <sys/fcntl.h>
3.1179 + #include <sys/socket.h>
3.1180 +diff -r c6dc6a854b31 -r 7ce2b4528dee bluez/BluetoothSDP.cc
3.1181 +--- a/bluez/BluetoothSDP.cc Wed Nov 04 21:44:35 2009 -0800
3.1182 ++++ b/bluez/BluetoothSDP.cc Wed Nov 04 21:47:13 2009 -0800
3.1183 +@@ -25,7 +25,7 @@
3.1184 + #include "Bluetooth.h"
3.1185 + #include "BluetoothSDP.h"
3.1186 +
3.1187 +-#include <errno.h>
3.1188 ++#include <cerrno>
3.1189 + extern int errno;
3.1190 +
3.1191 + namespace oasys {
3.1192 +diff -r c6dc6a854b31 -r 7ce2b4528dee bluez/BluetoothSDP.h
3.1193 +--- a/bluez/BluetoothSDP.h Wed Nov 04 21:44:35 2009 -0800
3.1194 ++++ b/bluez/BluetoothSDP.h Wed Nov 04 21:47:13 2009 -0800
3.1195 +@@ -25,9 +25,9 @@
3.1196 +
3.1197 + #include "../debug/Log.h"
3.1198 +
3.1199 +-#include <stdio.h>
3.1200 +-#include <errno.h>
3.1201 +-#include <stdlib.h>
3.1202 ++#include <cstdio>
3.1203 ++#include <cerrno>
3.1204 ++#include <cstdlib>
3.1205 +
3.1206 + #include <bluetooth/bluetooth.h>
3.1207 + #include <bluetooth/sdp.h>
3.1208 +diff -r c6dc6a854b31 -r 7ce2b4528dee bluez/BluetoothServer.cc
3.1209 +--- a/bluez/BluetoothServer.cc Wed Nov 04 21:44:35 2009 -0800
3.1210 ++++ b/bluez/BluetoothServer.cc Wed Nov 04 21:47:13 2009 -0800
3.1211 +@@ -24,7 +24,7 @@
3.1212 + #include "BluetoothServer.h"
3.1213 + #include "debug/Log.h"
3.1214 +
3.1215 +-#include <errno.h>
3.1216 ++#include <cerrno>
3.1217 + #include <sys/types.h>
3.1218 + #include <sys/socket.h>
3.1219 + #include <netinet/in.h>
3.1220 +diff -r c6dc6a854b31 -r 7ce2b4528dee bluez/BluetoothSocket.cc
3.1221 +--- a/bluez/BluetoothSocket.cc Wed Nov 04 21:44:35 2009 -0800
3.1222 ++++ b/bluez/BluetoothSocket.cc Wed Nov 04 21:47:13 2009 -0800
3.1223 +@@ -20,7 +20,7 @@
3.1224 +
3.1225 + #ifdef OASYS_BLUETOOTH_ENABLED
3.1226 +
3.1227 +-#include <errno.h>
3.1228 ++#include <cerrno>
3.1229 + #include "BluetoothSocket.h"
3.1230 +
3.1231 + namespace oasys {
3.1232 +diff -r c6dc6a854b31 -r 7ce2b4528dee bluez/BluetoothSocket.h
3.1233 +--- a/bluez/BluetoothSocket.h Wed Nov 04 21:44:35 2009 -0800
3.1234 ++++ b/bluez/BluetoothSocket.h Wed Nov 04 21:47:13 2009 -0800
3.1235 +@@ -23,7 +23,7 @@
3.1236 +
3.1237 + #ifdef OASYS_BLUETOOTH_ENABLED
3.1238 +
3.1239 +-#include <stdlib.h>
3.1240 ++#include <cstdlib>
3.1241 + #include <sys/types.h>
3.1242 + #include <sys/socket.h>
3.1243 +
3.1244 +diff -r c6dc6a854b31 -r 7ce2b4528dee bluez/RFCOMMClient.cc
3.1245 +--- a/bluez/RFCOMMClient.cc Wed Nov 04 21:44:35 2009 -0800
3.1246 ++++ b/bluez/RFCOMMClient.cc Wed Nov 04 21:47:13 2009 -0800
3.1247 +@@ -22,7 +22,7 @@
3.1248 +
3.1249 + #include "Bluetooth.h"
3.1250 + #include "RFCOMMClient.h"
3.1251 +-#include <errno.h>
3.1252 ++#include <cerrno>
3.1253 +
3.1254 + extern int errno;
3.1255 +
3.1256 +diff -r c6dc6a854b31 -r 7ce2b4528dee compat/cfmakeraw.c
3.1257 +--- /dev/null Thu Jan 01 00:00:00 1970 +0000
3.1258 ++++ b/compat/cfmakeraw.c Wed Nov 04 21:47:13 2009 -0800
3.1259 +@@ -0,0 +1,37 @@
3.1260 ++/*
3.1261 ++ * Copyright 2005-2006 Intel Corporation
3.1262 ++ *
3.1263 ++ * Licensed under the Apache License, Version 2.0 (the "License");
3.1264 ++ * you may not use this file except in compliance with the License.
3.1265 ++ * You may obtain a copy of the License at
3.1266 ++ *
3.1267 ++ * http://www.apache.org/licenses/LICENSE-2.0
3.1268 ++ *
3.1269 ++ * Unless required by applicable law or agreed to in writing, software
3.1270 ++ * distributed under the License is distributed on an "AS IS" BASIS,
3.1271 ++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
3.1272 ++ * See the License for the specific language governing permissions and
3.1273 ++ * limitations under the License.
3.1274 ++ */
3.1275 ++
3.1276 ++#ifdef HAVE_CONFIG_H
3.1277 ++# include <oasys-config.h>
3.1278 ++#endif
3.1279 ++
3.1280 ++#include "cfmakeraw.h"
3.1281 ++
3.1282 ++#if !defined(HAVE_CFMAKERAW)
3.1283 ++
3.1284 ++void
3.1285 ++cfmakeraw(struct termios *t)
3.1286 ++{
3.1287 ++ t->c_iflag &= ~(IGNBRK | BRKINT | PARMRK | ISTRIP | INLCR | IGNCR | ICRNL | IXON);
3.1288 ++ t->c_oflag &= ~OPOST;
3.1289 ++ t->c_lflag &= ~(ECHO | ECHONL | ICANON | ISIG | IEXTEN);
3.1290 ++ t->c_cflag &= ~(CSIZE | PARENB);
3.1291 ++ t->c_cflag |= CS8;
3.1292 ++ t->c_cc[VMIN] = 1;
3.1293 ++ t->c_cc[VTIME] = 0;
3.1294 ++}
3.1295 ++
3.1296 ++#endif
3.1297 +diff -r c6dc6a854b31 -r 7ce2b4528dee compat/cfmakeraw.h
3.1298 +--- /dev/null Thu Jan 01 00:00:00 1970 +0000
3.1299 ++++ b/compat/cfmakeraw.h Wed Nov 04 21:47:13 2009 -0800
3.1300 +@@ -0,0 +1,40 @@
3.1301 ++/*
3.1302 ++ * Copyright 2005-2006 Intel Corporation
3.1303 ++ *
3.1304 ++ * Licensed under the Apache License, Version 2.0 (the "License");
3.1305 ++ * you may not use this file except in compliance with the License.
3.1306 ++ * You may obtain a copy of the License at
3.1307 ++ *
3.1308 ++ * http://www.apache.org/licenses/LICENSE-2.0
3.1309 ++ *
3.1310 ++ * Unless required by applicable law or agreed to in writing, software
3.1311 ++ * distributed under the License is distributed on an "AS IS" BASIS,
3.1312 ++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
3.1313 ++ * See the License for the specific language governing permissions and
3.1314 ++ * limitations under the License.
3.1315 ++ */
3.1316 ++
3.1317 ++#ifndef _OASYS_CFMAKERAW_H_
3.1318 ++#define _OASYS_CFMAKERAW_H_
3.1319 ++
3.1320 ++#ifndef OASYS_CONFIG_STATE
3.1321 ++#error "MUST INCLUDE oasys-config.h before including this file"
3.1322 ++#endif
3.1323 ++
3.1324 ++#include <termios.h>
3.1325 ++
3.1326 ++#ifdef __cplusplus
3.1327 ++#define EXTERN_C extern "C"
3.1328 ++#else
3.1329 ++#define EXTERN_C extern
3.1330 ++#endif
3.1331 ++
3.1332 ++#if !defined(HAVE_CFMAKERAW)
3.1333 ++
3.1334 ++/*
3.1335 ++ * Redefine cfmakeraw to use the compat function.
3.1336 ++ */
3.1337 ++EXTERN_C void cfmakeraw(struct termios *);
3.1338 ++#endif
3.1339 ++
3.1340 ++#endif /* _OASYS_CFMAKERAW_H_ */
3.1341 +diff -r c6dc6a854b31 -r 7ce2b4528dee compat/cfsetspeed.c
3.1342 +--- /dev/null Thu Jan 01 00:00:00 1970 +0000
3.1343 ++++ b/compat/cfsetspeed.c Wed Nov 04 21:47:13 2009 -0800
3.1344 +@@ -0,0 +1,33 @@
3.1345 ++/*
3.1346 ++ * Copyright 2005-2006 Intel Corporation
3.1347 ++ *
3.1348 ++ * Licensed under the Apache License, Version 2.0 (the "License");
3.1349 ++ * you may not use this file except in compliance with the License.
3.1350 ++ * You may obtain a copy of the License at
3.1351 ++ *
3.1352 ++ * http://www.apache.org/licenses/LICENSE-2.0
3.1353 ++ *
3.1354 ++ * Unless required by applicable law or agreed to in writing, software
3.1355 ++ * distributed under the License is distributed on an "AS IS" BASIS,
3.1356 ++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
3.1357 ++ * See the License for the specific language governing permissions and
3.1358 ++ * limitations under the License.
3.1359 ++ */
3.1360 ++
3.1361 ++#ifdef HAVE_CONFIG_H
3.1362 ++# include <oasys-config.h>
3.1363 ++#endif
3.1364 ++
3.1365 ++#include "cfsetspeed.h"
3.1366 ++
3.1367 ++#if !defined(HAVE_CFSETSPEED)
3.1368 ++
3.1369 ++int
3.1370 ++cfsetspeed(struct termios *t, speed_t speed)
3.1371 ++{
3.1372 ++ cfsetispeed(t, speed);
3.1373 ++ cfsetospeed(t, speed);
3.1374 ++ return 0;
3.1375 ++}
3.1376 ++
3.1377 ++#endif
3.1378 +diff -r c6dc6a854b31 -r 7ce2b4528dee compat/cfsetspeed.h
3.1379 +--- /dev/null Thu Jan 01 00:00:00 1970 +0000
3.1380 ++++ b/compat/cfsetspeed.h Wed Nov 04 21:47:13 2009 -0800
3.1381 +@@ -0,0 +1,40 @@
3.1382 ++/*
3.1383 ++ * Copyright 2005-2006 Intel Corporation
3.1384 ++ *
3.1385 ++ * Licensed under the Apache License, Version 2.0 (the "License");
3.1386 ++ * you may not use this file except in compliance with the License.
3.1387 ++ * You may obtain a copy of the License at
3.1388 ++ *
3.1389 ++ * http://www.apache.org/licenses/LICENSE-2.0
3.1390 ++ *
3.1391 ++ * Unless required by applicable law or agreed to in writing, software
3.1392 ++ * distributed under the License is distributed on an "AS IS" BASIS,
3.1393 ++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
3.1394 ++ * See the License for the specific language governing permissions and
3.1395 ++ * limitations under the License.
3.1396 ++ */
3.1397 ++
3.1398 ++#ifndef _OASYS_CFSETSPEED_H_
3.1399 ++#define _OASYS_CFSETSPEED_H_
3.1400 ++
3.1401 ++#ifndef OASYS_CONFIG_STATE
3.1402 ++#error "MUST INCLUDE oasys-config.h before including this file"
3.1403 ++#endif
3.1404 ++
3.1405 ++#include <termios.h>
3.1406 ++
3.1407 ++#ifdef __cplusplus
3.1408 ++#define EXTERN_C extern "C"
3.1409 ++#else
3.1410 ++#define EXTERN_C extern
3.1411 ++#endif
3.1412 ++
3.1413 ++#if !defined(HAVE_CFSETSPEED)
3.1414 ++
3.1415 ++/*
3.1416 ++ * Redefine cfsetspeed to use the compat function.
3.1417 ++ */
3.1418 ++EXTERN_C int cfsetspeed(struct termios *, speed_t);
3.1419 ++#endif
3.1420 ++
3.1421 ++#endif /* _OASYS_CFSETSPEED_H_ */
3.1422 +diff -r c6dc6a854b31 -r 7ce2b4528dee configure
3.1423 +--- a/configure Wed Nov 04 21:44:35 2009 -0800
3.1424 ++++ b/configure Wed Nov 04 21:47:13 2009 -0800
3.1425 +@@ -1,10 +1,10 @@
3.1426 + #! /bin/sh
3.1427 + # From configure.ac -- DO NOT EDIT THIS FILE! See the instructions in configure.ac --.
3.1428 + # Guess values for system-dependent variables and create Makefiles.
3.1429 +-# Generated by GNU Autoconf 2.61.
3.1430 ++# Generated by GNU Autoconf 2.63.
3.1431 + #
3.1432 + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
3.1433 +-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
3.1434 ++# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
3.1435 + # This configure script is free software; the Free Software Foundation
3.1436 + # gives unlimited permission to copy, distribute and modify it.
3.1437 + #
3.1438 +@@ -33,7 +33,7 @@
3.1439 + if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
3.1440 + emulate sh
3.1441 + NULLCMD=:
3.1442 +- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
3.1443 ++ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
3.1444 + # is contrary to our usage. Disable this feature.
3.1445 + alias -g '${1+"$@"}'='"$@"'
3.1446 + setopt NO_GLOB_SUBST
3.1447 +@@ -55,17 +55,45 @@
3.1448 + as_cr_digits='0123456789'
3.1449 + as_cr_alnum=$as_cr_Letters$as_cr_digits
3.1450 +
3.1451 ++as_nl='
3.1452 ++'
3.1453 ++export as_nl
3.1454 ++# Printing a long string crashes Solaris 7 /usr/bin/printf.
3.1455 ++as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
3.1456 ++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
3.1457 ++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
3.1458 ++if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
3.1459 ++ as_echo='printf %s\n'
3.1460 ++ as_echo_n='printf %s'
3.1461 ++else
3.1462 ++ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
3.1463 ++ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
3.1464 ++ as_echo_n='/usr/ucb/echo -n'
3.1465 ++ else
3.1466 ++ as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
3.1467 ++ as_echo_n_body='eval
3.1468 ++ arg=$1;
3.1469 ++ case $arg in
3.1470 ++ *"$as_nl"*)
3.1471 ++ expr "X$arg" : "X\\(.*\\)$as_nl";
3.1472 ++ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
3.1473 ++ esac;
3.1474 ++ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
3.1475 ++ '
3.1476 ++ export as_echo_n_body
3.1477 ++ as_echo_n='sh -c $as_echo_n_body as_echo'
3.1478 ++ fi
3.1479 ++ export as_echo_body
3.1480 ++ as_echo='sh -c $as_echo_body as_echo'
3.1481 ++fi
3.1482 ++
3.1483 + # The user is always right.
3.1484 + if test "${PATH_SEPARATOR+set}" != set; then
3.1485 +- echo "#! /bin/sh" >conf$$.sh
3.1486 +- echo "exit 0" >>conf$$.sh
3.1487 +- chmod +x conf$$.sh
3.1488 +- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
3.1489 +- PATH_SEPARATOR=';'
3.1490 +- else
3.1491 +- PATH_SEPARATOR=:
3.1492 +- fi
3.1493 +- rm -f conf$$.sh
3.1494 ++ PATH_SEPARATOR=:
3.1495 ++ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
3.1496 ++ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
3.1497 ++ PATH_SEPARATOR=';'
3.1498 ++ }
3.1499 + fi
3.1500 +
3.1501 + # Support unset when possible.
3.1502 +@@ -81,8 +109,6 @@
3.1503 + # there to prevent editors from complaining about space-tab.
3.1504 + # (If _AS_PATH_WALK were called with IFS unset, it would disable word
3.1505 + # splitting by setting IFS to empty value.)
3.1506 +-as_nl='
3.1507 +-'
3.1508 + IFS=" "" $as_nl"
3.1509 +
3.1510 + # Find who we are. Look in the path if we contain no directory separator.
3.1511 +@@ -105,7 +131,7 @@
3.1512 + as_myself=$0
3.1513 + fi
3.1514 + if test ! -f "$as_myself"; then
3.1515 +- echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
3.1516 ++ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
3.1517 + { (exit 1); exit 1; }
3.1518 + fi
3.1519 +
3.1520 +@@ -118,17 +144,10 @@
3.1521 + PS4='+ '
3.1522 +
3.1523 + # NLS nuisances.
3.1524 +-for as_var in \
3.1525 +- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
3.1526 +- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
3.1527 +- LC_TELEPHONE LC_TIME
3.1528 +-do
3.1529 +- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
3.1530 +- eval $as_var=C; export $as_var
3.1531 +- else
3.1532 +- ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
3.1533 +- fi
3.1534 +-done
3.1535 ++LC_ALL=C
3.1536 ++export LC_ALL
3.1537 ++LANGUAGE=C
3.1538 ++export LANGUAGE
3.1539 +
3.1540 + # Required to use basename.
3.1541 + if expr a : '\(a\)' >/dev/null 2>&1 &&
3.1542 +@@ -150,7 +169,7 @@
3.1543 + $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
3.1544 + X"$0" : 'X\(//\)$' \| \
3.1545 + X"$0" : 'X\(/\)' \| . 2>/dev/null ||
3.1546 +-echo X/"$0" |
3.1547 ++$as_echo X/"$0" |
3.1548 + sed '/^.*\/\([^/][^/]*\)\/*$/{
3.1549 + s//\1/
3.1550 + q
3.1551 +@@ -176,7 +195,7 @@
3.1552 + as_have_required=no
3.1553 + fi
3.1554 +
3.1555 +- if test $as_have_required = yes && (eval ":
3.1556 ++ if test $as_have_required = yes && (eval ":
3.1557 + (as_func_return () {
3.1558 + (exit \$1)
3.1559 + }
3.1560 +@@ -258,7 +277,7 @@
3.1561 + if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
3.1562 + emulate sh
3.1563 + NULLCMD=:
3.1564 +- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
3.1565 ++ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
3.1566 + # is contrary to our usage. Disable this feature.
3.1567 + alias -g '${1+"$@"}'='"$@"'
3.1568 + setopt NO_GLOB_SUBST
3.1569 +@@ -279,7 +298,7 @@
3.1570 + if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
3.1571 + emulate sh
3.1572 + NULLCMD=:
3.1573 +- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
3.1574 ++ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
3.1575 + # is contrary to our usage. Disable this feature.
3.1576 + alias -g '${1+"$@"}'='"$@"'
3.1577 + setopt NO_GLOB_SUBST
3.1578 +@@ -359,10 +378,10 @@
3.1579 +
3.1580 + if test "x$CONFIG_SHELL" != x; then
3.1581 + for as_var in BASH_ENV ENV
3.1582 +- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
3.1583 +- done
3.1584 +- export CONFIG_SHELL
3.1585 +- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
3.1586 ++ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
3.1587 ++ done
3.1588 ++ export CONFIG_SHELL
3.1589 ++ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
3.1590 + fi
3.1591 +
3.1592 +
3.1593 +@@ -431,9 +450,10 @@
3.1594 +
3.1595 + test \$exitcode = 0") || {
3.1596 + echo No shell found that supports shell functions.
3.1597 +- echo Please tell autoconf@gnu.org about your system,
3.1598 +- echo including any error possibly output before this
3.1599 +- echo message
3.1600 ++ echo Please tell bug-autoconf@gnu.org about your system,
3.1601 ++ echo including any error possibly output before this message.
3.1602 ++ echo This can help us improve future autoconf versions.
3.1603 ++ echo Configuration will now proceed without shell functions.
3.1604 + }
3.1605 +
3.1606 +
3.1607 +@@ -469,7 +489,7 @@
3.1608 + s/-\n.*//
3.1609 + ' >$as_me.lineno &&
3.1610 + chmod +x "$as_me.lineno" ||
3.1611 +- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
3.1612 ++ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
3.1613 + { (exit 1); exit 1; }; }
3.1614 +
3.1615 + # Don't try to exec as it changes $[0], causing all sort of problems
3.1616 +@@ -497,7 +517,6 @@
3.1617 + *)
3.1618 + ECHO_N='-n';;
3.1619 + esac
3.1620 +-
3.1621 + if expr a : '\(a\)' >/dev/null 2>&1 &&
3.1622 + test "X`expr 00001 : '.*\(...\)'`" = X001; then
3.1623 + as_expr=expr
3.1624 +@@ -510,19 +529,22 @@
3.1625 + rm -f conf$$.dir/conf$$.file
3.1626 + else
3.1627 + rm -f conf$$.dir
3.1628 +- mkdir conf$$.dir
3.1629 +-fi
3.1630 +-echo >conf$$.file
3.1631 +-if ln -s conf$$.file conf$$ 2>/dev/null; then
3.1632 +- as_ln_s='ln -s'
3.1633 +- # ... but there are two gotchas:
3.1634 +- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
3.1635 +- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
3.1636 +- # In both cases, we have to default to `cp -p'.
3.1637 +- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
3.1638 ++ mkdir conf$$.dir 2>/dev/null
3.1639 ++fi
3.1640 ++if (echo >conf$$.file) 2>/dev/null; then
3.1641 ++ if ln -s conf$$.file conf$$ 2>/dev/null; then
3.1642 ++ as_ln_s='ln -s'
3.1643 ++ # ... but there are two gotchas:
3.1644 ++ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
3.1645 ++ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
3.1646 ++ # In both cases, we have to default to `cp -p'.
3.1647 ++ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
3.1648 ++ as_ln_s='cp -p'
3.1649 ++ elif ln conf$$.file conf$$ 2>/dev/null; then
3.1650 ++ as_ln_s=ln
3.1651 ++ else
3.1652 + as_ln_s='cp -p'
3.1653 +-elif ln conf$$.file conf$$ 2>/dev/null; then
3.1654 +- as_ln_s=ln
3.1655 ++ fi
3.1656 + else
3.1657 + as_ln_s='cp -p'
3.1658 + fi
3.1659 +@@ -547,10 +569,10 @@
3.1660 + as_test_x='
3.1661 + eval sh -c '\''
3.1662 + if test -d "$1"; then
3.1663 +- test -d "$1/.";
3.1664 ++ test -d "$1/.";
3.1665 + else
3.1666 + case $1 in
3.1667 +- -*)set "./$1";;
3.1668 ++ -*)set "./$1";;
3.1669 + esac;
3.1670 + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
3.1671 + ???[sx]*):;;*)false;;esac;fi
3.1672 +@@ -633,101 +655,139 @@
3.1673 + # include <unistd.h>
3.1674 + #endif"
3.1675 +
3.1676 +-ac_subst_vars='SHELL
3.1677 ++ac_subst_vars='LTLIBOBJS
3.1678 ++LIBOBJS
3.1679 ++SUBDIR
3.1680 ++SYS_EXTLIB_LDFLAGS
3.1681 ++SYS_EXTLIB_CFLAGS
3.1682 ++EXTLIB_LDFLAGS
3.1683 ++EXTLIB_CFLAGS
3.1684 ++OASYS_VERSION
3.1685 ++OASYS_COMPAT_LDFLAGS
3.1686 ++OASYS_LDFLAGS_STATIC
3.1687 ++OASYS_LDFLAGS
3.1688 ++OASYS_ETCDIR
3.1689 ++OASYS_LIBDIR
3.1690 ++OASYS_INCDIR
3.1691 ++INCFLAGS
3.1692 ++XSD_TOOL
3.1693 ++CXXCPP
3.1694 ++TCL_LDFLAGS
3.1695 ++PYTHON_BUILD_EXT
3.1696 ++PYTHON
3.1697 ++SYS_CFLAGS
3.1698 ++EGREP
3.1699 ++GREP
3.1700 ++SET_MAKE
3.1701 ++INSTALL_DATA
3.1702 ++INSTALL_SCRIPT
3.1703 ++INSTALL_PROGRAM
3.1704 ++AWK
3.1705 ++BUILD_SYSTEM
3.1706 ++EXTRA_LDFLAGS
3.1707 ++EXTRA_CFLAGS
3.1708 ++LDFLAGS_SHLIB
3.1709 ++RPATH
3.1710 ++PICFLAGS
3.1711 ++SHLIB_EXT
3.1712 ++SHLIBS
3.1713 ++STATIC
3.1714 ++PROFILE
3.1715 ++OPTIMIZE_WARN
3.1716 ++OPTIMIZE
3.1717 ++DEBUG
3.1718 ++RANLIB
3.1719 ++AR
3.1720 ++DEPFLAGS
3.1721 ++CPP
3.1722 ++ac_ct_CXX
3.1723 ++CXXFLAGS
3.1724 ++CXX
3.1725 ++OBJEXT
3.1726 ++EXEEXT
3.1727 ++ac_ct_CC
3.1728 ++CPPFLAGS
3.1729 ++LDFLAGS
3.1730 ++CFLAGS
3.1731 ++CC
3.1732 ++TARGET
3.1733 ++BUILDDIR
3.1734 ++SRCDIR
3.1735 ++target_alias
3.1736 ++host_alias
3.1737 ++build_alias
3.1738 ++LIBS
3.1739 ++ECHO_T
3.1740 ++ECHO_N
3.1741 ++ECHO_C
3.1742 ++DEFS
3.1743 ++mandir
3.1744 ++localedir
3.1745 ++libdir
3.1746 ++psdir
3.1747 ++pdfdir
3.1748 ++dvidir
3.1749 ++htmldir
3.1750 ++infodir
3.1751 ++docdir
3.1752 ++oldincludedir
3.1753 ++includedir
3.1754 ++localstatedir
3.1755 ++sharedstatedir
3.1756 ++sysconfdir
3.1757 ++datadir
3.1758 ++datarootdir
3.1759 ++libexecdir
3.1760 ++sbindir
3.1761 ++bindir
3.1762 ++program_transform_name
3.1763 ++prefix
3.1764 ++exec_prefix
3.1765 ++PACKAGE_BUGREPORT
3.1766 ++PACKAGE_STRING
3.1767 ++PACKAGE_VERSION
3.1768 ++PACKAGE_TARNAME
3.1769 ++PACKAGE_NAME
3.1770 + PATH_SEPARATOR
3.1771 +-PACKAGE_NAME
3.1772 +-PACKAGE_TARNAME
3.1773 +-PACKAGE_VERSION
3.1774 +-PACKAGE_STRING
3.1775 +-PACKAGE_BUGREPORT
3.1776 +-exec_prefix
3.1777 +-prefix
3.1778 +-program_transform_name
3.1779 +-bindir
3.1780 +-sbindir
3.1781 +-libexecdir
3.1782 +-datarootdir
3.1783 +-datadir
3.1784 +-sysconfdir
3.1785 +-sharedstatedir
3.1786 +-localstatedir
3.1787 +-includedir
3.1788 +-oldincludedir
3.1789 +-docdir
3.1790 +-infodir
3.1791 +-htmldir
3.1792 +-dvidir
3.1793 +-pdfdir
3.1794 +-psdir
3.1795 +-libdir
3.1796 +-localedir
3.1797 +-mandir
3.1798 +-DEFS
3.1799 +-ECHO_C
3.1800 +-ECHO_N
3.1801 +-ECHO_T
3.1802 +-LIBS
3.1803 +-build_alias
3.1804 +-host_alias
3.1805 +-target_alias
3.1806 +-SRCDIR
3.1807 +-BUILDDIR
3.1808 +-TARGET
3.1809 +-CC
3.1810 +-CFLAGS
3.1811 +-LDFLAGS
3.1812 +-CPPFLAGS
3.1813 +-ac_ct_CC
3.1814 +-EXEEXT
3.1815 +-OBJEXT
3.1816 +-CXX
3.1817 +-CXXFLAGS
3.1818 +-ac_ct_CXX
3.1819 +-CPP
3.1820 +-DEPFLAGS
3.1821 +-AR
3.1822 +-RANLIB
3.1823 +-DEBUG
3.1824 +-OPTIMIZE
3.1825 +-OPTIMIZE_WARN
3.1826 +-PROFILE
3.1827 +-STATIC
3.1828 +-SHLIBS
3.1829 +-SHLIB_EXT
3.1830 +-PICFLAGS
3.1831 +-RPATH
3.1832 +-LDFLAGS_SHLIB
3.1833 +-EXTRA_CFLAGS
3.1834 +-EXTRA_LDFLAGS
3.1835 +-BUILD_SYSTEM
3.1836 +-AWK
3.1837 +-INSTALL_PROGRAM
3.1838 +-INSTALL_SCRIPT
3.1839 +-INSTALL_DATA
3.1840 +-SET_MAKE
3.1841 +-GREP
3.1842 +-EGREP
3.1843 +-SYS_CFLAGS
3.1844 +-PYTHON
3.1845 +-PYTHON_BUILD_EXT
3.1846 +-TCL_LDFLAGS
3.1847 +-XSD_TOOL
3.1848 +-INCFLAGS
3.1849 +-OASYS_INCDIR
3.1850 +-OASYS_LIBDIR
3.1851 +-OASYS_ETCDIR
3.1852 +-OASYS_LDFLAGS
3.1853 +-OASYS_LDFLAGS_STATIC
3.1854 +-OASYS_COMPAT_LDFLAGS
3.1855 +-OASYS_VERSION
3.1856 +-EXTLIB_CFLAGS
3.1857 +-EXTLIB_LDFLAGS
3.1858 +-SYS_EXTLIB_CFLAGS
3.1859 +-SYS_EXTLIB_LDFLAGS
3.1860 +-SUBDIR
3.1861 +-LIBOBJS
3.1862 +-LTLIBOBJS'
3.1863 ++SHELL'
3.1864 + ac_subst_files=''
3.1865 ++ac_user_opts='
3.1866 ++enable_option_checking
3.1867 ++with_previous_options
3.1868 ++with_cc
3.1869 ++with_cxx
3.1870 ++enable_debug
3.1871 ++enable_debug_memory
3.1872 ++enable_debug_locking
3.1873 ++enable_optimize
3.1874 ++enable_profile
3.1875 ++enable_static
3.1876 ++enable_static_external_libs
3.1877 ++enable_shlibs
3.1878 ++with_extra_cflags
3.1879 ++with_extra_ldflags
3.1880 ++with_file_offset_bits
3.1881 ++enable_atomic_nonatomic
3.1882 ++enable_atomic_asm
3.1883 ++with_python
3.1884 ++with_tcl
3.1885 ++with_tcldir
3.1886 ++with_tclver
3.1887 ++with_google_perftools
3.1888 ++enable_google_profiling
3.1889 ++with_bluez
3.1890 ++with_expat
3.1891 ++with_xerces_c
3.1892 ++with_tclreadline
3.1893 ++with_zlib
3.1894 ++with_xsd_tool
3.1895 ++with_db
3.1896 ++with_dbver
3.1897 ++with_mysql
3.1898 ++with_mysql_daemon
3.1899 ++with_postgres
3.1900 ++enable_eds
3.1901 ++'
3.1902 + ac_precious_vars='build_alias
3.1903 + host_alias
3.1904 + target_alias
3.1905 +@@ -740,12 +800,15 @@
3.1906 + CXXFLAGS
3.1907 + CCC
3.1908 + CPP
3.1909 +-PYTHON'
3.1910 ++PYTHON
3.1911 ++CXXCPP'
3.1912 +
3.1913 +
3.1914 + # Initialize some variables set by options.
3.1915 + ac_init_help=
3.1916 + ac_init_version=false
3.1917 ++ac_unrecognized_opts=
3.1918 ++ac_unrecognized_sep=
3.1919 + # The variables have the same names as the options, with
3.1920 + # dashes changed to underlines.
3.1921 + cache_file=/dev/null
3.1922 +@@ -844,13 +907,21 @@
3.1923 + datarootdir=$ac_optarg ;;
3.1924 +
3.1925 + -disable-* | --disable-*)
3.1926 +- ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
3.1927 ++ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
3.1928 + # Reject names that are not valid shell variable names.
3.1929 +- expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
3.1930 +- { echo "$as_me: error: invalid feature name: $ac_feature" >&2
3.1931 +- { (exit 1); exit 1; }; }
3.1932 +- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
3.1933 +- eval enable_$ac_feature=no ;;
3.1934 ++ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
3.1935 ++ { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
3.1936 ++ { (exit 1); exit 1; }; }
3.1937 ++ ac_useropt_orig=$ac_useropt
3.1938 ++ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
3.1939 ++ case $ac_user_opts in
3.1940 ++ *"
3.1941 ++"enable_$ac_useropt"
3.1942 ++"*) ;;
3.1943 ++ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
3.1944 ++ ac_unrecognized_sep=', ';;
3.1945 ++ esac
3.1946 ++ eval enable_$ac_useropt=no ;;
3.1947 +
3.1948 + -docdir | --docdir | --docdi | --doc | --do)
3.1949 + ac_prev=docdir ;;
3.1950 +@@ -863,13 +934,21 @@
3.1951 + dvidir=$ac_optarg ;;
3.1952 +
3.1953 + -enable-* | --enable-*)
3.1954 +- ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
3.1955 ++ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
3.1956 + # Reject names that are not valid shell variable names.
3.1957 +- expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
3.1958 +- { echo "$as_me: error: invalid feature name: $ac_feature" >&2
3.1959 +- { (exit 1); exit 1; }; }
3.1960 +- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
3.1961 +- eval enable_$ac_feature=\$ac_optarg ;;
3.1962 ++ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
3.1963 ++ { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
3.1964 ++ { (exit 1); exit 1; }; }
3.1965 ++ ac_useropt_orig=$ac_useropt
3.1966 ++ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
3.1967 ++ case $ac_user_opts in
3.1968 ++ *"
3.1969 ++"enable_$ac_useropt"
3.1970 ++"*) ;;
3.1971 ++ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
3.1972 ++ ac_unrecognized_sep=', ';;
3.1973 ++ esac
3.1974 ++ eval enable_$ac_useropt=\$ac_optarg ;;
3.1975 +
3.1976 + -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
3.1977 + | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
3.1978 +@@ -1060,22 +1139,38 @@
3.1979 + ac_init_version=: ;;
3.1980 +
3.1981 + -with-* | --with-*)
3.1982 +- ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
3.1983 ++ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
3.1984 + # Reject names that are not valid shell variable names.
3.1985 +- expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
3.1986 +- { echo "$as_me: error: invalid package name: $ac_package" >&2
3.1987 +- { (exit 1); exit 1; }; }
3.1988 +- ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
3.1989 +- eval with_$ac_package=\$ac_optarg ;;
3.1990 ++ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
3.1991 ++ { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
3.1992 ++ { (exit 1); exit 1; }; }
3.1993 ++ ac_useropt_orig=$ac_useropt
3.1994 ++ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
3.1995 ++ case $ac_user_opts in
3.1996 ++ *"
3.1997 ++"with_$ac_useropt"
3.1998 ++"*) ;;
3.1999 ++ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
3.2000 ++ ac_unrecognized_sep=', ';;
3.2001 ++ esac
3.2002 ++ eval with_$ac_useropt=\$ac_optarg ;;
3.2003 +
3.2004 + -without-* | --without-*)
3.2005 +- ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
3.2006 ++ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
3.2007 + # Reject names that are not valid shell variable names.
3.2008 +- expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
3.2009 +- { echo "$as_me: error: invalid package name: $ac_package" >&2
3.2010 +- { (exit 1); exit 1; }; }
3.2011 +- ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
3.2012 +- eval with_$ac_package=no ;;
3.2013 ++ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
3.2014 ++ { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
3.2015 ++ { (exit 1); exit 1; }; }
3.2016 ++ ac_useropt_orig=$ac_useropt
3.2017 ++ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
3.2018 ++ case $ac_user_opts in
3.2019 ++ *"
3.2020 ++"with_$ac_useropt"
3.2021 ++"*) ;;
3.2022 ++ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
3.2023 ++ ac_unrecognized_sep=', ';;
3.2024 ++ esac
3.2025 ++ eval with_$ac_useropt=no ;;
3.2026 +
3.2027 + --x)
3.2028 + # Obsolete; use --with-x.
3.2029 +@@ -1095,7 +1190,7 @@
3.2030 + | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
3.2031 + x_libraries=$ac_optarg ;;
3.2032 +
3.2033 +- -*) { echo "$as_me: error: unrecognized option: $ac_option
3.2034 ++ -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
3.2035 + Try \`$0 --help' for more information." >&2
3.2036 + { (exit 1); exit 1; }; }
3.2037 + ;;
3.2038 +@@ -1104,16 +1199,16 @@
3.2039 + ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
3.2040 + # Reject names that are not valid shell variable names.
3.2041 + expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
3.2042 +- { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
3.2043 ++ { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
3.2044 + { (exit 1); exit 1; }; }
3.2045 + eval $ac_envvar=\$ac_optarg
3.2046 + export $ac_envvar ;;
3.2047 +
3.2048 + *)
3.2049 + # FIXME: should be removed in autoconf 3.0.
3.2050 +- echo "$as_me: WARNING: you should use --build, --host, --target" >&2
3.2051 ++ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
3.2052 + expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
3.2053 +- echo "$as_me: WARNING: invalid host type: $ac_option" >&2
3.2054 ++ $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
3.2055 + : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
3.2056 + ;;
3.2057 +
3.2058 +@@ -1122,22 +1217,38 @@
3.2059 +
3.2060 + if test -n "$ac_prev"; then
3.2061 + ac_option=--`echo $ac_prev | sed 's/_/-/g'`
3.2062 +- { echo "$as_me: error: missing argument to $ac_option" >&2
3.2063 +- { (exit 1); exit 1; }; }
3.2064 +-fi
3.2065 +-
3.2066 +-# Be sure to have absolute directory names.
3.2067 ++ { $as_echo "$as_me: error: missing argument to $ac_option" >&2
3.2068 ++ { (exit 1); exit 1; }; }
3.2069 ++fi
3.2070 ++
3.2071 ++if test -n "$ac_unrecognized_opts"; then
3.2072 ++ case $enable_option_checking in
3.2073 ++ no) ;;
3.2074 ++ fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
3.2075 ++ { (exit 1); exit 1; }; } ;;
3.2076 ++ *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
3.2077 ++ esac
3.2078 ++fi
3.2079 ++
3.2080 ++# Check all directory arguments for consistency.
3.2081 + for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
3.2082 + datadir sysconfdir sharedstatedir localstatedir includedir \
3.2083 + oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
3.2084 + libdir localedir mandir
3.2085 + do
3.2086 + eval ac_val=\$$ac_var
3.2087 ++ # Remove trailing slashes.
3.2088 ++ case $ac_val in
3.2089 ++ */ )
3.2090 ++ ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
3.2091 ++ eval $ac_var=\$ac_val;;
3.2092 ++ esac
3.2093 ++ # Be sure to have absolute directory names.
3.2094 + case $ac_val in
3.2095 + [\\/$]* | ?:[\\/]* ) continue;;
3.2096 + NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
3.2097 + esac
3.2098 +- { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
3.2099 ++ { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
3.2100 + { (exit 1); exit 1; }; }
3.2101 + done
3.2102 +
3.2103 +@@ -1152,7 +1263,7 @@
3.2104 + if test "x$host_alias" != x; then
3.2105 + if test "x$build_alias" = x; then
3.2106 + cross_compiling=maybe
3.2107 +- echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
3.2108 ++ $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
3.2109 + If a cross compiler is detected then cross compile mode will be used." >&2
3.2110 + elif test "x$build_alias" != "x$host_alias"; then
3.2111 + cross_compiling=yes
3.2112 +@@ -1168,10 +1279,10 @@
3.2113 + ac_pwd=`pwd` && test -n "$ac_pwd" &&
3.2114 + ac_ls_di=`ls -di .` &&
3.2115 + ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
3.2116 +- { echo "$as_me: error: Working directory cannot be determined" >&2
3.2117 ++ { $as_echo "$as_me: error: working directory cannot be determined" >&2
3.2118 + { (exit 1); exit 1; }; }
3.2119 + test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
3.2120 +- { echo "$as_me: error: pwd does not report name of working directory" >&2
3.2121 ++ { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
3.2122 + { (exit 1); exit 1; }; }
3.2123 +
3.2124 +
3.2125 +@@ -1179,12 +1290,12 @@
3.2126 + if test -z "$srcdir"; then
3.2127 + ac_srcdir_defaulted=yes
3.2128 + # Try the directory containing this script, then the parent directory.
3.2129 +- ac_confdir=`$as_dirname -- "$0" ||
3.2130 +-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
3.2131 +- X"$0" : 'X\(//\)[^/]' \| \
3.2132 +- X"$0" : 'X\(//\)$' \| \
3.2133 +- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
3.2134 +-echo X"$0" |
3.2135 ++ ac_confdir=`$as_dirname -- "$as_myself" ||
3.2136 ++$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
3.2137 ++ X"$as_myself" : 'X\(//\)[^/]' \| \
3.2138 ++ X"$as_myself" : 'X\(//\)$' \| \
3.2139 ++ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
3.2140 ++$as_echo X"$as_myself" |
3.2141 + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
3.2142 + s//\1/
3.2143 + q
3.2144 +@@ -1211,12 +1322,12 @@
3.2145 + fi
3.2146 + if test ! -r "$srcdir/$ac_unique_file"; then
3.2147 + test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
3.2148 +- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
3.2149 ++ { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
3.2150 + { (exit 1); exit 1; }; }
3.2151 + fi
3.2152 + ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
3.2153 + ac_abs_confdir=`(
3.2154 +- cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
3.2155 ++ cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
3.2156 + { (exit 1); exit 1; }; }
3.2157 + pwd)`
3.2158 + # When building in place, set srcdir=.
3.2159 +@@ -1265,9 +1376,9 @@
3.2160 +
3.2161 + Installation directories:
3.2162 + --prefix=PREFIX install architecture-independent files in PREFIX
3.2163 +- [$ac_default_prefix]
3.2164 ++ [$ac_default_prefix]
3.2165 + --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
3.2166 +- [PREFIX]
3.2167 ++ [PREFIX]
3.2168 +
3.2169 + By default, \`make install' will install all the files in
3.2170 + \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
3.2171 +@@ -1277,25 +1388,25 @@
3.2172 + For better control, use the options below.
3.2173 +
3.2174 + Fine tuning of the installation directories:
3.2175 +- --bindir=DIR user executables [EPREFIX/bin]
3.2176 +- --sbindir=DIR system admin executables [EPREFIX/sbin]
3.2177 +- --libexecdir=DIR program executables [EPREFIX/libexec]
3.2178 +- --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
3.2179 +- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
3.2180 +- --localstatedir=DIR modifiable single-machine data [PREFIX/var]
3.2181 +- --libdir=DIR object code libraries [EPREFIX/lib]
3.2182 +- --includedir=DIR C header files [PREFIX/include]
3.2183 +- --oldincludedir=DIR C header files for non-gcc [/usr/include]
3.2184 +- --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
3.2185 +- --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
3.2186 +- --infodir=DIR info documentation [DATAROOTDIR/info]
3.2187 +- --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
3.2188 +- --mandir=DIR man documentation [DATAROOTDIR/man]
3.2189 +- --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE]
3.2190 +- --htmldir=DIR html documentation [DOCDIR]
3.2191 +- --dvidir=DIR dvi documentation [DOCDIR]
3.2192 +- --pdfdir=DIR pdf documentation [DOCDIR]
3.2193 +- --psdir=DIR ps documentation [DOCDIR]
3.2194 ++ --bindir=DIR user executables [EPREFIX/bin]
3.2195 ++ --sbindir=DIR system admin executables [EPREFIX/sbin]
3.2196 ++ --libexecdir=DIR program executables [EPREFIX/libexec]
3.2197 ++ --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
3.2198 ++ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
3.2199 ++ --localstatedir=DIR modifiable single-machine data [PREFIX/var]
3.2200 ++ --libdir=DIR object code libraries [EPREFIX/lib]
3.2201 ++ --includedir=DIR C header files [PREFIX/include]
3.2202 ++ --oldincludedir=DIR C header files for non-gcc [/usr/include]
3.2203 ++ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
3.2204 ++ --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
3.2205 ++ --infodir=DIR info documentation [DATAROOTDIR/info]
3.2206 ++ --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
3.2207 ++ --mandir=DIR man documentation [DATAROOTDIR/man]
3.2208 ++ --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE]
3.2209 ++ --htmldir=DIR html documentation [DOCDIR]
3.2210 ++ --dvidir=DIR dvi documentation [DOCDIR]
3.2211 ++ --pdfdir=DIR pdf documentation [DOCDIR]
3.2212 ++ --psdir=DIR ps documentation [DOCDIR]
3.2213 + _ACEOF
3.2214 +
3.2215 + cat <<\_ACEOF
3.2216 +@@ -1307,6 +1418,7 @@
3.2217 + cat <<\_ACEOF
3.2218 +
3.2219 + Optional Features:
3.2220 ++ --disable-option-checking ignore unrecognized --enable/--with options
3.2221 + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
3.2222 + --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
3.2223 + --disable-debug compile with debugging turned off
3.2224 +@@ -1339,7 +1451,7 @@
3.2225 + --with-python=PYTHON absolute path name of Python executable
3.2226 + --with-tcl=DIR location of a tcl installation (default system)
3.2227 + --with-tcldir=DIR same as --with-tcl
3.2228 +- --with-tclver=VERSION tcl version to use (default 8.4 or 8.3)
3.2229 ++ --with-tclver=VERSION tcl version to use (default 8.5 - 8.3)
3.2230 + --with-google-perftools=DIR
3.2231 + location of a google perftools installation (default
3.2232 + none)
3.2233 +@@ -1351,7 +1463,7 @@
3.2234 + --with-xsd-tool=xsd name or path of the xsd tool (default: xsd)
3.2235 + --with-db=DIR location of a Berkeley DB installation (default
3.2236 + system)
3.2237 +- --with-dbver=VERSION Berkeley DB versions to try (default 4.5-4.2)
3.2238 ++ --with-dbver=VERSION Berkeley DB versions to try (default 4.7-4.2)
3.2239 + --with-mysql=DIR location of a mysql installation (default none)
3.2240 + --with-mysql-daemon use the daemon library (not the client library)
3.2241 + --with-postgres=DIR location of a postgres installation (default none)
3.2242 +@@ -1368,6 +1480,7 @@
3.2243 + CXXFLAGS C++ compiler flags
3.2244 + CPP C preprocessor
3.2245 + PYTHON
3.2246 ++ CXXCPP C++ preprocessor
3.2247 +
3.2248 + Use these variables to override the choices made by `configure' or to help
3.2249 + it to find libraries and programs with nonstandard names/locations.
3.2250 +@@ -1379,15 +1492,17 @@
3.2251 + if test "$ac_init_help" = "recursive"; then
3.2252 + # If there are subdirs, report their specific --help.
3.2253 + for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
3.2254 +- test -d "$ac_dir" || continue
3.2255 ++ test -d "$ac_dir" ||
3.2256 ++ { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
3.2257 ++ continue
3.2258 + ac_builddir=.
3.2259 +
3.2260 + case "$ac_dir" in
3.2261 + .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
3.2262 + *)
3.2263 +- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
3.2264 ++ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
3.2265 + # A ".." for each directory in $ac_dir_suffix.
3.2266 +- ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
3.2267 ++ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
3.2268 + case $ac_top_builddir_sub in
3.2269 + "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
3.2270 + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
3.2271 +@@ -1423,7 +1538,7 @@
3.2272 + echo &&
3.2273 + $SHELL "$ac_srcdir/configure" --help=recursive
3.2274 + else
3.2275 +- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
3.2276 ++ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
3.2277 + fi || ac_status=$?
3.2278 + cd "$ac_pwd" || { ac_status=$?; break; }
3.2279 + done
3.2280 +@@ -1433,10 +1548,10 @@
3.2281 + if $ac_init_version; then
3.2282 + cat <<\_ACEOF
3.2283 + configure
3.2284 +-generated by GNU Autoconf 2.61
3.2285 ++generated by GNU Autoconf 2.63
3.2286 +
3.2287 + Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
3.2288 +-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
3.2289 ++2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
3.2290 + This configure script is free software; the Free Software Foundation
3.2291 + gives unlimited permission to copy, distribute and modify it.
3.2292 +
3.2293 +@@ -1464,7 +1579,7 @@
3.2294 + running configure, to aid debugging if configure makes a mistake.
3.2295 +
3.2296 + It was created by $as_me, which was
3.2297 +-generated by GNU Autoconf 2.61. Invocation command line was
3.2298 ++generated by GNU Autoconf 2.63. Invocation command line was
3.2299 +
3.2300 + $ $0 $@
3.2301 +
3.2302 +@@ -1500,7 +1615,7 @@
3.2303 + do
3.2304 + IFS=$as_save_IFS
3.2305 + test -z "$as_dir" && as_dir=.
3.2306 +- echo "PATH: $as_dir"
3.2307 ++ $as_echo "PATH: $as_dir"
3.2308 + done
3.2309 + IFS=$as_save_IFS
3.2310 +
3.2311 +@@ -1535,7 +1650,7 @@
3.2312 + | -silent | --silent | --silen | --sile | --sil)
3.2313 + continue ;;
3.2314 + *\'*)
3.2315 +- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
3.2316 ++ ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
3.2317 + esac
3.2318 + case $ac_pass in
3.2319 + 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
3.2320 +@@ -1587,11 +1702,12 @@
3.2321 + case $ac_val in #(
3.2322 + *${as_nl}*)
3.2323 + case $ac_var in #(
3.2324 +- *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
3.2325 +-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
3.2326 ++ *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
3.2327 ++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
3.2328 + esac
3.2329 + case $ac_var in #(
3.2330 + _ | IFS | as_nl) ;; #(
3.2331 ++ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
3.2332 + *) $as_unset $ac_var ;;
3.2333 + esac ;;
3.2334 + esac
3.2335 +@@ -1621,9 +1737,9 @@
3.2336 + do
3.2337 + eval ac_val=\$$ac_var
3.2338 + case $ac_val in
3.2339 +- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
3.2340 ++ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
3.2341 + esac
3.2342 +- echo "$ac_var='\''$ac_val'\''"
3.2343 ++ $as_echo "$ac_var='\''$ac_val'\''"
3.2344 + done | sort
3.2345 + echo
3.2346 +
3.2347 +@@ -1638,9 +1754,9 @@
3.2348 + do
3.2349 + eval ac_val=\$$ac_var
3.2350 + case $ac_val in
3.2351 +- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
3.2352 ++ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
3.2353 + esac
3.2354 +- echo "$ac_var='\''$ac_val'\''"
3.2355 ++ $as_echo "$ac_var='\''$ac_val'\''"
3.2356 + done | sort
3.2357 + echo
3.2358 + fi
3.2359 +@@ -1656,8 +1772,8 @@
3.2360 + echo
3.2361 + fi
3.2362 + test "$ac_signal" != 0 &&
3.2363 +- echo "$as_me: caught signal $ac_signal"
3.2364 +- echo "$as_me: exit $exit_status"
3.2365 ++ $as_echo "$as_me: caught signal $ac_signal"
3.2366 ++ $as_echo "$as_me: exit $exit_status"
3.2367 + } >&5
3.2368 + rm -f core *.core core.conftest.* &&
3.2369 + rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
3.2370 +@@ -1699,21 +1815,24 @@
3.2371 +
3.2372 +
3.2373 + # Let the site file select an alternate cache file if it wants to.
3.2374 +-# Prefer explicitly selected file to automatically selected ones.
3.2375 ++# Prefer an explicitly selected file to automatically selected ones.
3.2376 ++ac_site_file1=NONE
3.2377 ++ac_site_file2=NONE
3.2378 + if test -n "$CONFIG_SITE"; then
3.2379 +- set x "$CONFIG_SITE"
3.2380 ++ ac_site_file1=$CONFIG_SITE
3.2381 + elif test "x$prefix" != xNONE; then
3.2382 +- set x "$prefix/share/config.site" "$prefix/etc/config.site"
3.2383 +-else
3.2384 +- set x "$ac_default_prefix/share/config.site" \
3.2385 +- "$ac_default_prefix/etc/config.site"
3.2386 +-fi
3.2387 +-shift
3.2388 +-for ac_site_file
3.2389 +-do
3.2390 ++ ac_site_file1=$prefix/share/config.site
3.2391 ++ ac_site_file2=$prefix/etc/config.site
3.2392 ++else
3.2393 ++ ac_site_file1=$ac_default_prefix/share/config.site
3.2394 ++ ac_site_file2=$ac_default_prefix/etc/config.site
3.2395 ++fi
3.2396 ++for ac_site_file in "$ac_site_file1" "$ac_site_file2"
3.2397 ++do
3.2398 ++ test "x$ac_site_file" = xNONE && continue
3.2399 + if test -r "$ac_site_file"; then
3.2400 +- { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
3.2401 +-echo "$as_me: loading site script $ac_site_file" >&6;}
3.2402 ++ { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
3.2403 ++$as_echo "$as_me: loading site script $ac_site_file" >&6;}
3.2404 + sed 's/^/| /' "$ac_site_file" >&5
3.2405 + . "$ac_site_file"
3.2406 + fi
3.2407 +@@ -1723,16 +1842,16 @@
3.2408 + # Some versions of bash will fail to source /dev/null (special
3.2409 + # files actually), so we avoid doing that.
3.2410 + if test -f "$cache_file"; then
3.2411 +- { echo "$as_me:$LINENO: loading cache $cache_file" >&5
3.2412 +-echo "$as_me: loading cache $cache_file" >&6;}
3.2413 ++ { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
3.2414 ++$as_echo "$as_me: loading cache $cache_file" >&6;}
3.2415 + case $cache_file in
3.2416 + [\\/]* | ?:[\\/]* ) . "$cache_file";;
3.2417 + *) . "./$cache_file";;
3.2418 + esac
3.2419 + fi
3.2420 + else
3.2421 +- { echo "$as_me:$LINENO: creating cache $cache_file" >&5
3.2422 +-echo "$as_me: creating cache $cache_file" >&6;}
3.2423 ++ { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
3.2424 ++$as_echo "$as_me: creating cache $cache_file" >&6;}
3.2425 + >$cache_file
3.2426 + fi
3.2427 +
3.2428 +@@ -1746,29 +1865,38 @@
3.2429 + eval ac_new_val=\$ac_env_${ac_var}_value
3.2430 + case $ac_old_set,$ac_new_set in
3.2431 + set,)
3.2432 +- { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
3.2433 +-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
3.2434 ++ { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
3.2435 ++$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
3.2436 + ac_cache_corrupted=: ;;
3.2437 + ,set)
3.2438 +- { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
3.2439 +-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
3.2440 ++ { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
3.2441 ++$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
3.2442 + ac_cache_corrupted=: ;;
3.2443 + ,);;
3.2444 + *)
3.2445 + if test "x$ac_old_val" != "x$ac_new_val"; then
3.2446 +- { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
3.2447 +-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
3.2448 +- { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
3.2449 +-echo "$as_me: former value: $ac_old_val" >&2;}
3.2450 +- { echo "$as_me:$LINENO: current value: $ac_new_val" >&5
3.2451 +-echo "$as_me: current value: $ac_new_val" >&2;}
3.2452 +- ac_cache_corrupted=:
3.2453 ++ # differences in whitespace do not lead to failure.
3.2454 ++ ac_old_val_w=`echo x $ac_old_val`
3.2455 ++ ac_new_val_w=`echo x $ac_new_val`
3.2456 ++ if test "$ac_old_val_w" != "$ac_new_val_w"; then
3.2457 ++ { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
3.2458 ++$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
3.2459 ++ ac_cache_corrupted=:
3.2460 ++ else
3.2461 ++ { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
3.2462 ++$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
3.2463 ++ eval $ac_var=\$ac_old_val
3.2464 ++ fi
3.2465 ++ { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5
3.2466 ++$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
3.2467 ++ { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5
3.2468 ++$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
3.2469 + fi;;
3.2470 + esac
3.2471 + # Pass precious variables to config.status.
3.2472 + if test "$ac_new_set" = set; then
3.2473 + case $ac_new_val in
3.2474 +- *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
3.2475 ++ *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
3.2476 + *) ac_arg=$ac_var=$ac_new_val ;;
3.2477 + esac
3.2478 + case " $ac_configure_args " in
3.2479 +@@ -1778,10 +1906,12 @@
3.2480 + fi
3.2481 + done
3.2482 + if $ac_cache_corrupted; then
3.2483 +- { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
3.2484 +-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
3.2485 +- { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
3.2486 +-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
3.2487 ++ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
3.2488 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3.2489 ++ { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
3.2490 ++$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
3.2491 ++ { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
3.2492 ++$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
3.2493 + { (exit 1); exit 1; }; }
3.2494 + fi
3.2495 +
3.2496 +@@ -1840,18 +1970,18 @@
3.2497 +
3.2498 +
3.2499 + # First set srcdir and builddir, calculated above in AC_CONFIG_SRCDIR
3.2500 +-{ echo "$as_me:$LINENO: checking location of source directory" >&5
3.2501 +-echo $ECHO_N "checking location of source directory... $ECHO_C" >&6; }
3.2502 ++{ $as_echo "$as_me:$LINENO: checking location of source directory" >&5
3.2503 ++$as_echo_n "checking location of source directory... " >&6; }
3.2504 + SRCDIR=`(cd $srcdir && pwd)`
3.2505 +-{ echo "$as_me:$LINENO: result: \"$SRCDIR\"" >&5
3.2506 +-echo "${ECHO_T}\"$SRCDIR\"" >&6; }
3.2507 ++{ $as_echo "$as_me:$LINENO: result: \"$SRCDIR\"" >&5
3.2508 ++$as_echo "\"$SRCDIR\"" >&6; }
3.2509 +
3.2510 +
3.2511 + builddir=`pwd`
3.2512 +-{ echo "$as_me:$LINENO: checking location of build directory" >&5
3.2513 +-echo $ECHO_N "checking location of build directory... $ECHO_C" >&6; }
3.2514 +-{ echo "$as_me:$LINENO: result: \"$builddir\"" >&5
3.2515 +-echo "${ECHO_T}\"$builddir\"" >&6; }
3.2516 ++{ $as_echo "$as_me:$LINENO: checking location of build directory" >&5
3.2517 ++$as_echo_n "checking location of build directory... " >&6; }
3.2518 ++{ $as_echo "$as_me:$LINENO: result: \"$builddir\"" >&5
3.2519 ++$as_echo "\"$builddir\"" >&6; }
3.2520 + BUILDDIR=$builddir
3.2521 +
3.2522 +
3.2523 +@@ -1890,15 +2020,15 @@
3.2524 +
3.2525 +
3.2526 + if test "x$ac_with_cc" = "x" ; then
3.2527 +- ac_try_cc="gcc gcc-4.1 gcc-4.0 gcc-3.4 gcc-3.3"
3.2528 +- ac_try_cxx="g++ g++-4.0 g++-4.0 g++-3.4 g++-3.3"
3.2529 ++ ac_try_cc="gcc gcc-4.3 gcc-4.2 gcc-4.1 gcc-4.0 gcc-3.4 gcc-3.3"
3.2530 ++ ac_try_cxx="g++ g++-4.3 g++-4.2 g++-4.1 g++-4.0 g++-3.4 g++-3.3"
3.2531 + else
3.2532 + ac_try_cc=$ac_with_cc
3.2533 +
3.2534 + if test x"$ac_with_cxx" = x ; then
3.2535 + ac_try_cxx=`echo $ac_with_cc | sed 's/cc/++/'`
3.2536 +- { echo "$as_me:$LINENO: inferring C++ compiler '$ac_try_cxx' from C compiler setting" >&5
3.2537 +-echo "$as_me: inferring C++ compiler '$ac_try_cxx' from C compiler setting" >&6;}
3.2538 ++ { $as_echo "$as_me:$LINENO: inferring C++ compiler '$ac_try_cxx' from C compiler setting" >&5
3.2539 ++$as_echo "$as_me: inferring C++ compiler '$ac_try_cxx' from C compiler setting" >&6;}
3.2540 + else
3.2541 + ac_try_cxx=$ac_with_cxx
3.2542 + fi
3.2543 +@@ -1907,10 +2037,10 @@
3.2544 + CXX=$ac_try_cxx
3.2545 + fi
3.2546 +
3.2547 +- { echo "$as_me:$LINENO: checking for a C compiler (trying $ac_try_cc)" >&5
3.2548 +-echo $ECHO_N "checking for a C compiler (trying $ac_try_cc)... $ECHO_C" >&6; }
3.2549 +- { echo "$as_me:$LINENO: result: " >&5
3.2550 +-echo "${ECHO_T}" >&6; }
3.2551 ++ { $as_echo "$as_me:$LINENO: checking for a C compiler (trying $ac_try_cc)" >&5
3.2552 ++$as_echo_n "checking for a C compiler (trying $ac_try_cc)... " >&6; }
3.2553 ++ { $as_echo "$as_me:$LINENO: result: " >&5
3.2554 ++$as_echo "" >&6; }
3.2555 + ac_ext=c
3.2556 + ac_cpp='$CPP $CPPFLAGS'
3.2557 + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
3.2558 +@@ -1921,10 +2051,10 @@
3.2559 + do
3.2560 + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
3.2561 + set dummy $ac_tool_prefix$ac_prog; ac_word=$2
3.2562 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
3.2563 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
3.2564 ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
3.2565 ++$as_echo_n "checking for $ac_word... " >&6; }
3.2566 + if test "${ac_cv_prog_CC+set}" = set; then
3.2567 +- echo $ECHO_N "(cached) $ECHO_C" >&6
3.2568 ++ $as_echo_n "(cached) " >&6
3.2569 + else
3.2570 + if test -n "$CC"; then
3.2571 + ac_cv_prog_CC="$CC" # Let the user override the test.
3.2572 +@@ -1937,7 +2067,7 @@
3.2573 + for ac_exec_ext in '' $ac_executable_extensions; do
3.2574 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3.2575 + ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
3.2576 +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3.2577 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3.2578 + break 2
3.2579 + fi
3.2580 + done
3.2581 +@@ -1948,11 +2078,11 @@
3.2582 + fi
3.2583 + CC=$ac_cv_prog_CC
3.2584 + if test -n "$CC"; then
3.2585 +- { echo "$as_me:$LINENO: result: $CC" >&5
3.2586 +-echo "${ECHO_T}$CC" >&6; }
3.2587 +-else
3.2588 +- { echo "$as_me:$LINENO: result: no" >&5
3.2589 +-echo "${ECHO_T}no" >&6; }
3.2590 ++ { $as_echo "$as_me:$LINENO: result: $CC" >&5
3.2591 ++$as_echo "$CC" >&6; }
3.2592 ++else
3.2593 ++ { $as_echo "$as_me:$LINENO: result: no" >&5
3.2594 ++$as_echo "no" >&6; }
3.2595 + fi
3.2596 +
3.2597 +
3.2598 +@@ -1965,10 +2095,10 @@
3.2599 + do
3.2600 + # Extract the first word of "$ac_prog", so it can be a program name with args.
3.2601 + set dummy $ac_prog; ac_word=$2
3.2602 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
3.2603 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
3.2604 ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
3.2605 ++$as_echo_n "checking for $ac_word... " >&6; }
3.2606 + if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
3.2607 +- echo $ECHO_N "(cached) $ECHO_C" >&6
3.2608 ++ $as_echo_n "(cached) " >&6
3.2609 + else
3.2610 + if test -n "$ac_ct_CC"; then
3.2611 + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
3.2612 +@@ -1981,7 +2111,7 @@
3.2613 + for ac_exec_ext in '' $ac_executable_extensions; do
3.2614 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3.2615 + ac_cv_prog_ac_ct_CC="$ac_prog"
3.2616 +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3.2617 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3.2618 + break 2
3.2619 + fi
3.2620 + done
3.2621 +@@ -1992,11 +2122,11 @@
3.2622 + fi
3.2623 + ac_ct_CC=$ac_cv_prog_ac_ct_CC
3.2624 + if test -n "$ac_ct_CC"; then
3.2625 +- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
3.2626 +-echo "${ECHO_T}$ac_ct_CC" >&6; }
3.2627 +-else
3.2628 +- { echo "$as_me:$LINENO: result: no" >&5
3.2629 +-echo "${ECHO_T}no" >&6; }
3.2630 ++ { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
3.2631 ++$as_echo "$ac_ct_CC" >&6; }
3.2632 ++else
3.2633 ++ { $as_echo "$as_me:$LINENO: result: no" >&5
3.2634 ++$as_echo "no" >&6; }
3.2635 + fi
3.2636 +
3.2637 +
3.2638 +@@ -2008,12 +2138,8 @@
3.2639 + else
3.2640 + case $cross_compiling:$ac_tool_warned in
3.2641 + yes:)
3.2642 +-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
3.2643 +-whose name does not start with the host triplet. If you think this
3.2644 +-configuration is useful to you, please write to autoconf@gnu.org." >&5
3.2645 +-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
3.2646 +-whose name does not start with the host triplet. If you think this
3.2647 +-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
3.2648 ++{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
3.2649 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
3.2650 + ac_tool_warned=yes ;;
3.2651 + esac
3.2652 + CC=$ac_ct_CC
3.2653 +@@ -2021,44 +2147,50 @@
3.2654 + fi
3.2655 +
3.2656 +
3.2657 +-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
3.2658 ++test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
3.2659 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3.2660 ++{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
3.2661 + See \`config.log' for more details." >&5
3.2662 +-echo "$as_me: error: no acceptable C compiler found in \$PATH
3.2663 ++$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
3.2664 + See \`config.log' for more details." >&2;}
3.2665 +- { (exit 1); exit 1; }; }
3.2666 ++ { (exit 1); exit 1; }; }; }
3.2667 +
3.2668 + # Provide some information about the compiler.
3.2669 +-echo "$as_me:$LINENO: checking for C compiler version" >&5
3.2670 +-ac_compiler=`set X $ac_compile; echo $2`
3.2671 ++$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
3.2672 ++set X $ac_compile
3.2673 ++ac_compiler=$2
3.2674 + { (ac_try="$ac_compiler --version >&5"
3.2675 + case "(($ac_try" in
3.2676 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.2677 + *) ac_try_echo=$ac_try;;
3.2678 + esac
3.2679 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.2680 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.2681 ++$as_echo "$ac_try_echo") >&5
3.2682 + (eval "$ac_compiler --version >&5") 2>&5
3.2683 + ac_status=$?
3.2684 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.2685 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.2686 + (exit $ac_status); }
3.2687 + { (ac_try="$ac_compiler -v >&5"
3.2688 + case "(($ac_try" in
3.2689 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.2690 + *) ac_try_echo=$ac_try;;
3.2691 + esac
3.2692 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.2693 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.2694 ++$as_echo "$ac_try_echo") >&5
3.2695 + (eval "$ac_compiler -v >&5") 2>&5
3.2696 + ac_status=$?
3.2697 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.2698 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.2699 + (exit $ac_status); }
3.2700 + { (ac_try="$ac_compiler -V >&5"
3.2701 + case "(($ac_try" in
3.2702 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.2703 + *) ac_try_echo=$ac_try;;
3.2704 + esac
3.2705 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.2706 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.2707 ++$as_echo "$ac_try_echo") >&5
3.2708 + (eval "$ac_compiler -V >&5") 2>&5
3.2709 + ac_status=$?
3.2710 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.2711 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.2712 + (exit $ac_status); }
3.2713 +
3.2714 + cat >conftest.$ac_ext <<_ACEOF
3.2715 +@@ -2077,27 +2209,22 @@
3.2716 + }
3.2717 + _ACEOF
3.2718 + ac_clean_files_save=$ac_clean_files
3.2719 +-ac_clean_files="$ac_clean_files a.out a.exe b.out"
3.2720 ++ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
3.2721 + # Try to create an executable without -o first, disregard a.out.
3.2722 + # It will help us diagnose broken compilers, and finding out an intuition
3.2723 + # of exeext.
3.2724 +-{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
3.2725 +-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
3.2726 +-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
3.2727 +-#
3.2728 +-# List of possible output files, starting from the most likely.
3.2729 +-# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
3.2730 +-# only as a last resort. b.out is created by i960 compilers.
3.2731 +-ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
3.2732 +-#
3.2733 +-# The IRIX 6 linker writes into existing files which may not be
3.2734 +-# executable, retaining their permissions. Remove them first so a
3.2735 +-# subsequent execution test works.
3.2736 ++{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
3.2737 ++$as_echo_n "checking for C compiler default output file name... " >&6; }
3.2738 ++ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
3.2739 ++
3.2740 ++# The possible output files:
3.2741 ++ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
3.2742 ++
3.2743 + ac_rmfiles=
3.2744 + for ac_file in $ac_files
3.2745 + do
3.2746 + case $ac_file in
3.2747 +- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
3.2748 ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
3.2749 + * ) ac_rmfiles="$ac_rmfiles $ac_file";;
3.2750 + esac
3.2751 + done
3.2752 +@@ -2108,10 +2235,11 @@
3.2753 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.2754 + *) ac_try_echo=$ac_try;;
3.2755 + esac
3.2756 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.2757 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.2758 ++$as_echo "$ac_try_echo") >&5
3.2759 + (eval "$ac_link_default") 2>&5
3.2760 + ac_status=$?
3.2761 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.2762 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.2763 + (exit $ac_status); }; then
3.2764 + # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
3.2765 + # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
3.2766 +@@ -2122,7 +2250,7 @@
3.2767 + do
3.2768 + test -f "$ac_file" || continue
3.2769 + case $ac_file in
3.2770 +- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
3.2771 ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
3.2772 + ;;
3.2773 + [ab].out )
3.2774 + # We found the default executable, but exeext='' is most
3.2775 +@@ -2149,25 +2277,27 @@
3.2776 + ac_file=''
3.2777 + fi
3.2778 +
3.2779 +-{ echo "$as_me:$LINENO: result: $ac_file" >&5
3.2780 +-echo "${ECHO_T}$ac_file" >&6; }
3.2781 ++{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
3.2782 ++$as_echo "$ac_file" >&6; }
3.2783 + if test -z "$ac_file"; then
3.2784 +- echo "$as_me: failed program was:" >&5
3.2785 +-sed 's/^/| /' conftest.$ac_ext >&5
3.2786 +-
3.2787 +-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
3.2788 ++ $as_echo "$as_me: failed program was:" >&5
3.2789 ++sed 's/^/| /' conftest.$ac_ext >&5
3.2790 ++
3.2791 ++{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
3.2792 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3.2793 ++{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
3.2794 + See \`config.log' for more details." >&5
3.2795 +-echo "$as_me: error: C compiler cannot create executables
3.2796 ++$as_echo "$as_me: error: C compiler cannot create executables
3.2797 + See \`config.log' for more details." >&2;}
3.2798 +- { (exit 77); exit 77; }; }
3.2799 ++ { (exit 77); exit 77; }; }; }
3.2800 + fi
3.2801 +
3.2802 + ac_exeext=$ac_cv_exeext
3.2803 +
3.2804 + # Check that the compiler produces executables we can run. If not, either
3.2805 + # the compiler is broken, or we cross compile.
3.2806 +-{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
3.2807 +-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
3.2808 ++{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
3.2809 ++$as_echo_n "checking whether the C compiler works... " >&6; }
3.2810 + # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
3.2811 + # If not cross compiling, check that we can run a simple program.
3.2812 + if test "$cross_compiling" != yes; then
3.2813 +@@ -2176,49 +2306,53 @@
3.2814 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.2815 + *) ac_try_echo=$ac_try;;
3.2816 + esac
3.2817 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.2818 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.2819 ++$as_echo "$ac_try_echo") >&5
3.2820 + (eval "$ac_try") 2>&5
3.2821 + ac_status=$?
3.2822 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.2823 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.2824 + (exit $ac_status); }; }; then
3.2825 + cross_compiling=no
3.2826 + else
3.2827 + if test "$cross_compiling" = maybe; then
3.2828 + cross_compiling=yes
3.2829 + else
3.2830 +- { { echo "$as_me:$LINENO: error: cannot run C compiled programs.
3.2831 ++ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
3.2832 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3.2833 ++{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
3.2834 + If you meant to cross compile, use \`--host'.
3.2835 + See \`config.log' for more details." >&5
3.2836 +-echo "$as_me: error: cannot run C compiled programs.
3.2837 ++$as_echo "$as_me: error: cannot run C compiled programs.
3.2838 + If you meant to cross compile, use \`--host'.
3.2839 + See \`config.log' for more details." >&2;}
3.2840 +- { (exit 1); exit 1; }; }
3.2841 +- fi
3.2842 +- fi
3.2843 +-fi
3.2844 +-{ echo "$as_me:$LINENO: result: yes" >&5
3.2845 +-echo "${ECHO_T}yes" >&6; }
3.2846 +-
3.2847 +-rm -f a.out a.exe conftest$ac_cv_exeext b.out
3.2848 ++ { (exit 1); exit 1; }; }; }
3.2849 ++ fi
3.2850 ++ fi
3.2851 ++fi
3.2852 ++{ $as_echo "$as_me:$LINENO: result: yes" >&5
3.2853 ++$as_echo "yes" >&6; }
3.2854 ++
3.2855 ++rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
3.2856 + ac_clean_files=$ac_clean_files_save
3.2857 + # Check that the compiler produces executables we can run. If not, either
3.2858 + # the compiler is broken, or we cross compile.
3.2859 +-{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
3.2860 +-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
3.2861 +-{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
3.2862 +-echo "${ECHO_T}$cross_compiling" >&6; }
3.2863 +-
3.2864 +-{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
3.2865 +-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
3.2866 +-if { (ac_try="$ac_link"
3.2867 +-case "(($ac_try" in
3.2868 +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.2869 +- *) ac_try_echo=$ac_try;;
3.2870 +-esac
3.2871 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.2872 ++{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
3.2873 ++$as_echo_n "checking whether we are cross compiling... " >&6; }
3.2874 ++{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
3.2875 ++$as_echo "$cross_compiling" >&6; }
3.2876 ++
3.2877 ++{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
3.2878 ++$as_echo_n "checking for suffix of executables... " >&6; }
3.2879 ++if { (ac_try="$ac_link"
3.2880 ++case "(($ac_try" in
3.2881 ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.2882 ++ *) ac_try_echo=$ac_try;;
3.2883 ++esac
3.2884 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.2885 ++$as_echo "$ac_try_echo") >&5
3.2886 + (eval "$ac_link") 2>&5
3.2887 + ac_status=$?
3.2888 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.2889 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.2890 + (exit $ac_status); }; then
3.2891 + # If both `conftest.exe' and `conftest' are `present' (well, observable)
3.2892 + # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
3.2893 +@@ -2227,31 +2361,33 @@
3.2894 + for ac_file in conftest.exe conftest conftest.*; do
3.2895 + test -f "$ac_file" || continue
3.2896 + case $ac_file in
3.2897 +- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
3.2898 ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
3.2899 + *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
3.2900 + break;;
3.2901 + * ) break;;
3.2902 + esac
3.2903 + done
3.2904 + else
3.2905 +- { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
3.2906 ++ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
3.2907 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3.2908 ++{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
3.2909 + See \`config.log' for more details." >&5
3.2910 +-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
3.2911 ++$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
3.2912 + See \`config.log' for more details." >&2;}
3.2913 +- { (exit 1); exit 1; }; }
3.2914 ++ { (exit 1); exit 1; }; }; }
3.2915 + fi
3.2916 +
3.2917 + rm -f conftest$ac_cv_exeext
3.2918 +-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
3.2919 +-echo "${ECHO_T}$ac_cv_exeext" >&6; }
3.2920 ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
3.2921 ++$as_echo "$ac_cv_exeext" >&6; }
3.2922 +
3.2923 + rm -f conftest.$ac_ext
3.2924 + EXEEXT=$ac_cv_exeext
3.2925 + ac_exeext=$EXEEXT
3.2926 +-{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
3.2927 +-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
3.2928 ++{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
3.2929 ++$as_echo_n "checking for suffix of object files... " >&6; }
3.2930 + if test "${ac_cv_objext+set}" = set; then
3.2931 +- echo $ECHO_N "(cached) $ECHO_C" >&6
3.2932 ++ $as_echo_n "(cached) " >&6
3.2933 + else
3.2934 + cat >conftest.$ac_ext <<_ACEOF
3.2935 + /* confdefs.h. */
3.2936 +@@ -2274,40 +2410,43 @@
3.2937 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.2938 + *) ac_try_echo=$ac_try;;
3.2939 + esac
3.2940 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.2941 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.2942 ++$as_echo "$ac_try_echo") >&5
3.2943 + (eval "$ac_compile") 2>&5
3.2944 + ac_status=$?
3.2945 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.2946 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.2947 + (exit $ac_status); }; then
3.2948 + for ac_file in conftest.o conftest.obj conftest.*; do
3.2949 + test -f "$ac_file" || continue;
3.2950 + case $ac_file in
3.2951 +- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
3.2952 ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
3.2953 + *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
3.2954 + break;;
3.2955 + esac
3.2956 + done
3.2957 + else
3.2958 +- echo "$as_me: failed program was:" >&5
3.2959 +-sed 's/^/| /' conftest.$ac_ext >&5
3.2960 +-
3.2961 +-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
3.2962 ++ $as_echo "$as_me: failed program was:" >&5
3.2963 ++sed 's/^/| /' conftest.$ac_ext >&5
3.2964 ++
3.2965 ++{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
3.2966 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3.2967 ++{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
3.2968 + See \`config.log' for more details." >&5
3.2969 +-echo "$as_me: error: cannot compute suffix of object files: cannot compile
3.2970 ++$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
3.2971 + See \`config.log' for more details." >&2;}
3.2972 +- { (exit 1); exit 1; }; }
3.2973 ++ { (exit 1); exit 1; }; }; }
3.2974 + fi
3.2975 +
3.2976 + rm -f conftest.$ac_cv_objext conftest.$ac_ext
3.2977 + fi
3.2978 +-{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
3.2979 +-echo "${ECHO_T}$ac_cv_objext" >&6; }
3.2980 ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
3.2981 ++$as_echo "$ac_cv_objext" >&6; }
3.2982 + OBJEXT=$ac_cv_objext
3.2983 + ac_objext=$OBJEXT
3.2984 +-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
3.2985 +-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
3.2986 ++{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
3.2987 ++$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
3.2988 + if test "${ac_cv_c_compiler_gnu+set}" = set; then
3.2989 +- echo $ECHO_N "(cached) $ECHO_C" >&6
3.2990 ++ $as_echo_n "(cached) " >&6
3.2991 + else
3.2992 + cat >conftest.$ac_ext <<_ACEOF
3.2993 + /* confdefs.h. */
3.2994 +@@ -2333,20 +2472,21 @@
3.2995 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.2996 + *) ac_try_echo=$ac_try;;
3.2997 + esac
3.2998 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.2999 +- (eval "$ac_compile") 2>conftest.er1
3.3000 +- ac_status=$?
3.3001 +- grep -v '^ *+' conftest.er1 >conftest.err
3.3002 +- rm -f conftest.er1
3.3003 +- cat conftest.err >&5
3.3004 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.3005 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.3006 ++$as_echo "$ac_try_echo") >&5
3.3007 ++ (eval "$ac_compile") 2>conftest.er1
3.3008 ++ ac_status=$?
3.3009 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.3010 ++ rm -f conftest.er1
3.3011 ++ cat conftest.err >&5
3.3012 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.3013 + (exit $ac_status); } && {
3.3014 + test -z "$ac_c_werror_flag" ||
3.3015 + test ! -s conftest.err
3.3016 + } && test -s conftest.$ac_objext; then
3.3017 + ac_compiler_gnu=yes
3.3018 + else
3.3019 +- echo "$as_me: failed program was:" >&5
3.3020 ++ $as_echo "$as_me: failed program was:" >&5
3.3021 + sed 's/^/| /' conftest.$ac_ext >&5
3.3022 +
3.3023 + ac_compiler_gnu=no
3.3024 +@@ -2356,15 +2496,19 @@
3.3025 + ac_cv_c_compiler_gnu=$ac_compiler_gnu
3.3026 +
3.3027 + fi
3.3028 +-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
3.3029 +-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
3.3030 +-GCC=`test $ac_compiler_gnu = yes && echo yes`
3.3031 ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
3.3032 ++$as_echo "$ac_cv_c_compiler_gnu" >&6; }
3.3033 ++if test $ac_compiler_gnu = yes; then
3.3034 ++ GCC=yes
3.3035 ++else
3.3036 ++ GCC=
3.3037 ++fi
3.3038 + ac_test_CFLAGS=${CFLAGS+set}
3.3039 + ac_save_CFLAGS=$CFLAGS
3.3040 +-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
3.3041 +-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
3.3042 ++{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
3.3043 ++$as_echo_n "checking whether $CC accepts -g... " >&6; }
3.3044 + if test "${ac_cv_prog_cc_g+set}" = set; then
3.3045 +- echo $ECHO_N "(cached) $ECHO_C" >&6
3.3046 ++ $as_echo_n "(cached) " >&6
3.3047 + else
3.3048 + ac_save_c_werror_flag=$ac_c_werror_flag
3.3049 + ac_c_werror_flag=yes
3.3050 +@@ -2391,20 +2535,21 @@
3.3051 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.3052 + *) ac_try_echo=$ac_try;;
3.3053 + esac
3.3054 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.3055 +- (eval "$ac_compile") 2>conftest.er1
3.3056 +- ac_status=$?
3.3057 +- grep -v '^ *+' conftest.er1 >conftest.err
3.3058 +- rm -f conftest.er1
3.3059 +- cat conftest.err >&5
3.3060 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.3061 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.3062 ++$as_echo "$ac_try_echo") >&5
3.3063 ++ (eval "$ac_compile") 2>conftest.er1
3.3064 ++ ac_status=$?
3.3065 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.3066 ++ rm -f conftest.er1
3.3067 ++ cat conftest.err >&5
3.3068 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.3069 + (exit $ac_status); } && {
3.3070 + test -z "$ac_c_werror_flag" ||
3.3071 + test ! -s conftest.err
3.3072 + } && test -s conftest.$ac_objext; then
3.3073 + ac_cv_prog_cc_g=yes
3.3074 + else
3.3075 +- echo "$as_me: failed program was:" >&5
3.3076 ++ $as_echo "$as_me: failed program was:" >&5
3.3077 + sed 's/^/| /' conftest.$ac_ext >&5
3.3078 +
3.3079 + CFLAGS=""
3.3080 +@@ -2429,20 +2574,21 @@
3.3081 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.3082 + *) ac_try_echo=$ac_try;;
3.3083 + esac
3.3084 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.3085 +- (eval "$ac_compile") 2>conftest.er1
3.3086 +- ac_status=$?
3.3087 +- grep -v '^ *+' conftest.er1 >conftest.err
3.3088 +- rm -f conftest.er1
3.3089 +- cat conftest.err >&5
3.3090 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.3091 +- (exit $ac_status); } && {
3.3092 +- test -z "$ac_c_werror_flag" ||
3.3093 +- test ! -s conftest.err
3.3094 +- } && test -s conftest.$ac_objext; then
3.3095 +- :
3.3096 +-else
3.3097 +- echo "$as_me: failed program was:" >&5
3.3098 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.3099 ++$as_echo "$ac_try_echo") >&5
3.3100 ++ (eval "$ac_compile") 2>conftest.er1
3.3101 ++ ac_status=$?
3.3102 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.3103 ++ rm -f conftest.er1
3.3104 ++ cat conftest.err >&5
3.3105 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.3106 ++ (exit $ac_status); } && {
3.3107 ++ test -z "$ac_c_werror_flag" ||
3.3108 ++ test ! -s conftest.err
3.3109 ++ } && test -s conftest.$ac_objext; then
3.3110 ++ :
3.3111 ++else
3.3112 ++ $as_echo "$as_me: failed program was:" >&5
3.3113 + sed 's/^/| /' conftest.$ac_ext >&5
3.3114 +
3.3115 + ac_c_werror_flag=$ac_save_c_werror_flag
3.3116 +@@ -2468,20 +2614,21 @@
3.3117 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.3118 + *) ac_try_echo=$ac_try;;
3.3119 + esac
3.3120 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.3121 +- (eval "$ac_compile") 2>conftest.er1
3.3122 +- ac_status=$?
3.3123 +- grep -v '^ *+' conftest.er1 >conftest.err
3.3124 +- rm -f conftest.er1
3.3125 +- cat conftest.err >&5
3.3126 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.3127 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.3128 ++$as_echo "$ac_try_echo") >&5
3.3129 ++ (eval "$ac_compile") 2>conftest.er1
3.3130 ++ ac_status=$?
3.3131 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.3132 ++ rm -f conftest.er1
3.3133 ++ cat conftest.err >&5
3.3134 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.3135 + (exit $ac_status); } && {
3.3136 + test -z "$ac_c_werror_flag" ||
3.3137 + test ! -s conftest.err
3.3138 + } && test -s conftest.$ac_objext; then
3.3139 + ac_cv_prog_cc_g=yes
3.3140 + else
3.3141 +- echo "$as_me: failed program was:" >&5
3.3142 ++ $as_echo "$as_me: failed program was:" >&5
3.3143 + sed 's/^/| /' conftest.$ac_ext >&5
3.3144 +
3.3145 +
3.3146 +@@ -2496,8 +2643,8 @@
3.3147 + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3.3148 + ac_c_werror_flag=$ac_save_c_werror_flag
3.3149 + fi
3.3150 +-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
3.3151 +-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
3.3152 ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
3.3153 ++$as_echo "$ac_cv_prog_cc_g" >&6; }
3.3154 + if test "$ac_test_CFLAGS" = set; then
3.3155 + CFLAGS=$ac_save_CFLAGS
3.3156 + elif test $ac_cv_prog_cc_g = yes; then
3.3157 +@@ -2513,10 +2660,10 @@
3.3158 + CFLAGS=
3.3159 + fi
3.3160 + fi
3.3161 +-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
3.3162 +-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
3.3163 ++{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
3.3164 ++$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
3.3165 + if test "${ac_cv_prog_cc_c89+set}" = set; then
3.3166 +- echo $ECHO_N "(cached) $ECHO_C" >&6
3.3167 ++ $as_echo_n "(cached) " >&6
3.3168 + else
3.3169 + ac_cv_prog_cc_c89=no
3.3170 + ac_save_CC=$CC
3.3171 +@@ -2587,20 +2734,21 @@
3.3172 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.3173 + *) ac_try_echo=$ac_try;;
3.3174 + esac
3.3175 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.3176 +- (eval "$ac_compile") 2>conftest.er1
3.3177 +- ac_status=$?
3.3178 +- grep -v '^ *+' conftest.er1 >conftest.err
3.3179 +- rm -f conftest.er1
3.3180 +- cat conftest.err >&5
3.3181 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.3182 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.3183 ++$as_echo "$ac_try_echo") >&5
3.3184 ++ (eval "$ac_compile") 2>conftest.er1
3.3185 ++ ac_status=$?
3.3186 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.3187 ++ rm -f conftest.er1
3.3188 ++ cat conftest.err >&5
3.3189 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.3190 + (exit $ac_status); } && {
3.3191 + test -z "$ac_c_werror_flag" ||
3.3192 + test ! -s conftest.err
3.3193 + } && test -s conftest.$ac_objext; then
3.3194 + ac_cv_prog_cc_c89=$ac_arg
3.3195 + else
3.3196 +- echo "$as_me: failed program was:" >&5
3.3197 ++ $as_echo "$as_me: failed program was:" >&5
3.3198 + sed 's/^/| /' conftest.$ac_ext >&5
3.3199 +
3.3200 +
3.3201 +@@ -2616,15 +2764,15 @@
3.3202 + # AC_CACHE_VAL
3.3203 + case "x$ac_cv_prog_cc_c89" in
3.3204 + x)
3.3205 +- { echo "$as_me:$LINENO: result: none needed" >&5
3.3206 +-echo "${ECHO_T}none needed" >&6; } ;;
3.3207 ++ { $as_echo "$as_me:$LINENO: result: none needed" >&5
3.3208 ++$as_echo "none needed" >&6; } ;;
3.3209 + xno)
3.3210 +- { echo "$as_me:$LINENO: result: unsupported" >&5
3.3211 +-echo "${ECHO_T}unsupported" >&6; } ;;
3.3212 ++ { $as_echo "$as_me:$LINENO: result: unsupported" >&5
3.3213 ++$as_echo "unsupported" >&6; } ;;
3.3214 + *)
3.3215 + CC="$CC $ac_cv_prog_cc_c89"
3.3216 +- { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
3.3217 +-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
3.3218 ++ { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
3.3219 ++$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
3.3220 + esac
3.3221 +
3.3222 +
3.3223 +@@ -2635,10 +2783,10 @@
3.3224 + ac_compiler_gnu=$ac_cv_c_compiler_gnu
3.3225 +
3.3226 +
3.3227 +- { echo "$as_me:$LINENO: checking for a C++ compiler (trying $ac_try_cxx)" >&5
3.3228 +-echo $ECHO_N "checking for a C++ compiler (trying $ac_try_cxx)... $ECHO_C" >&6; }
3.3229 +- { echo "$as_me:$LINENO: result: " >&5
3.3230 +-echo "${ECHO_T}" >&6; }
3.3231 ++ { $as_echo "$as_me:$LINENO: checking for a C++ compiler (trying $ac_try_cxx)" >&5
3.3232 ++$as_echo_n "checking for a C++ compiler (trying $ac_try_cxx)... " >&6; }
3.3233 ++ { $as_echo "$as_me:$LINENO: result: " >&5
3.3234 ++$as_echo "" >&6; }
3.3235 + ac_ext=cpp
3.3236 + ac_cpp='$CXXCPP $CPPFLAGS'
3.3237 + ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
3.3238 +@@ -2653,10 +2801,10 @@
3.3239 + do
3.3240 + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
3.3241 + set dummy $ac_tool_prefix$ac_prog; ac_word=$2
3.3242 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
3.3243 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
3.3244 ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
3.3245 ++$as_echo_n "checking for $ac_word... " >&6; }
3.3246 + if test "${ac_cv_prog_CXX+set}" = set; then
3.3247 +- echo $ECHO_N "(cached) $ECHO_C" >&6
3.3248 ++ $as_echo_n "(cached) " >&6
3.3249 + else
3.3250 + if test -n "$CXX"; then
3.3251 + ac_cv_prog_CXX="$CXX" # Let the user override the test.
3.3252 +@@ -2669,7 +2817,7 @@
3.3253 + for ac_exec_ext in '' $ac_executable_extensions; do
3.3254 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3.3255 + ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
3.3256 +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3.3257 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3.3258 + break 2
3.3259 + fi
3.3260 + done
3.3261 +@@ -2680,11 +2828,11 @@
3.3262 + fi
3.3263 + CXX=$ac_cv_prog_CXX
3.3264 + if test -n "$CXX"; then
3.3265 +- { echo "$as_me:$LINENO: result: $CXX" >&5
3.3266 +-echo "${ECHO_T}$CXX" >&6; }
3.3267 +-else
3.3268 +- { echo "$as_me:$LINENO: result: no" >&5
3.3269 +-echo "${ECHO_T}no" >&6; }
3.3270 ++ { $as_echo "$as_me:$LINENO: result: $CXX" >&5
3.3271 ++$as_echo "$CXX" >&6; }
3.3272 ++else
3.3273 ++ { $as_echo "$as_me:$LINENO: result: no" >&5
3.3274 ++$as_echo "no" >&6; }
3.3275 + fi
3.3276 +
3.3277 +
3.3278 +@@ -2697,10 +2845,10 @@
3.3279 + do
3.3280 + # Extract the first word of "$ac_prog", so it can be a program name with args.
3.3281 + set dummy $ac_prog; ac_word=$2
3.3282 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
3.3283 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
3.3284 ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
3.3285 ++$as_echo_n "checking for $ac_word... " >&6; }
3.3286 + if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
3.3287 +- echo $ECHO_N "(cached) $ECHO_C" >&6
3.3288 ++ $as_echo_n "(cached) " >&6
3.3289 + else
3.3290 + if test -n "$ac_ct_CXX"; then
3.3291 + ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
3.3292 +@@ -2713,7 +2861,7 @@
3.3293 + for ac_exec_ext in '' $ac_executable_extensions; do
3.3294 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3.3295 + ac_cv_prog_ac_ct_CXX="$ac_prog"
3.3296 +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3.3297 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3.3298 + break 2
3.3299 + fi
3.3300 + done
3.3301 +@@ -2724,11 +2872,11 @@
3.3302 + fi
3.3303 + ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
3.3304 + if test -n "$ac_ct_CXX"; then
3.3305 +- { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
3.3306 +-echo "${ECHO_T}$ac_ct_CXX" >&6; }
3.3307 +-else
3.3308 +- { echo "$as_me:$LINENO: result: no" >&5
3.3309 +-echo "${ECHO_T}no" >&6; }
3.3310 ++ { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
3.3311 ++$as_echo "$ac_ct_CXX" >&6; }
3.3312 ++else
3.3313 ++ { $as_echo "$as_me:$LINENO: result: no" >&5
3.3314 ++$as_echo "no" >&6; }
3.3315 + fi
3.3316 +
3.3317 +
3.3318 +@@ -2740,12 +2888,8 @@
3.3319 + else
3.3320 + case $cross_compiling:$ac_tool_warned in
3.3321 + yes:)
3.3322 +-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
3.3323 +-whose name does not start with the host triplet. If you think this
3.3324 +-configuration is useful to you, please write to autoconf@gnu.org." >&5
3.3325 +-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
3.3326 +-whose name does not start with the host triplet. If you think this
3.3327 +-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
3.3328 ++{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
3.3329 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
3.3330 + ac_tool_warned=yes ;;
3.3331 + esac
3.3332 + CXX=$ac_ct_CXX
3.3333 +@@ -2755,43 +2899,47 @@
3.3334 + fi
3.3335 + fi
3.3336 + # Provide some information about the compiler.
3.3337 +-echo "$as_me:$LINENO: checking for C++ compiler version" >&5
3.3338 +-ac_compiler=`set X $ac_compile; echo $2`
3.3339 ++$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5
3.3340 ++set X $ac_compile
3.3341 ++ac_compiler=$2
3.3342 + { (ac_try="$ac_compiler --version >&5"
3.3343 + case "(($ac_try" in
3.3344 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.3345 + *) ac_try_echo=$ac_try;;
3.3346 + esac
3.3347 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.3348 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.3349 ++$as_echo "$ac_try_echo") >&5
3.3350 + (eval "$ac_compiler --version >&5") 2>&5
3.3351 + ac_status=$?
3.3352 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.3353 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.3354 + (exit $ac_status); }
3.3355 + { (ac_try="$ac_compiler -v >&5"
3.3356 + case "(($ac_try" in
3.3357 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.3358 + *) ac_try_echo=$ac_try;;
3.3359 + esac
3.3360 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.3361 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.3362 ++$as_echo "$ac_try_echo") >&5
3.3363 + (eval "$ac_compiler -v >&5") 2>&5
3.3364 + ac_status=$?
3.3365 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.3366 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.3367 + (exit $ac_status); }
3.3368 + { (ac_try="$ac_compiler -V >&5"
3.3369 + case "(($ac_try" in
3.3370 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.3371 + *) ac_try_echo=$ac_try;;
3.3372 + esac
3.3373 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.3374 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.3375 ++$as_echo "$ac_try_echo") >&5
3.3376 + (eval "$ac_compiler -V >&5") 2>&5
3.3377 + ac_status=$?
3.3378 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.3379 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.3380 + (exit $ac_status); }
3.3381 +
3.3382 +-{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
3.3383 +-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }
3.3384 ++{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
3.3385 ++$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
3.3386 + if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
3.3387 +- echo $ECHO_N "(cached) $ECHO_C" >&6
3.3388 ++ $as_echo_n "(cached) " >&6
3.3389 + else
3.3390 + cat >conftest.$ac_ext <<_ACEOF
3.3391 + /* confdefs.h. */
3.3392 +@@ -2817,20 +2965,21 @@
3.3393 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.3394 + *) ac_try_echo=$ac_try;;
3.3395 + esac
3.3396 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.3397 +- (eval "$ac_compile") 2>conftest.er1
3.3398 +- ac_status=$?
3.3399 +- grep -v '^ *+' conftest.er1 >conftest.err
3.3400 +- rm -f conftest.er1
3.3401 +- cat conftest.err >&5
3.3402 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.3403 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.3404 ++$as_echo "$ac_try_echo") >&5
3.3405 ++ (eval "$ac_compile") 2>conftest.er1
3.3406 ++ ac_status=$?
3.3407 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.3408 ++ rm -f conftest.er1
3.3409 ++ cat conftest.err >&5
3.3410 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.3411 + (exit $ac_status); } && {
3.3412 + test -z "$ac_cxx_werror_flag" ||
3.3413 + test ! -s conftest.err
3.3414 + } && test -s conftest.$ac_objext; then
3.3415 + ac_compiler_gnu=yes
3.3416 + else
3.3417 +- echo "$as_me: failed program was:" >&5
3.3418 ++ $as_echo "$as_me: failed program was:" >&5
3.3419 + sed 's/^/| /' conftest.$ac_ext >&5
3.3420 +
3.3421 + ac_compiler_gnu=no
3.3422 +@@ -2840,15 +2989,19 @@
3.3423 + ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
3.3424 +
3.3425 + fi
3.3426 +-{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
3.3427 +-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }
3.3428 +-GXX=`test $ac_compiler_gnu = yes && echo yes`
3.3429 ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
3.3430 ++$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
3.3431 ++if test $ac_compiler_gnu = yes; then
3.3432 ++ GXX=yes
3.3433 ++else
3.3434 ++ GXX=
3.3435 ++fi
3.3436 + ac_test_CXXFLAGS=${CXXFLAGS+set}
3.3437 + ac_save_CXXFLAGS=$CXXFLAGS
3.3438 +-{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
3.3439 +-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }
3.3440 ++{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
3.3441 ++$as_echo_n "checking whether $CXX accepts -g... " >&6; }
3.3442 + if test "${ac_cv_prog_cxx_g+set}" = set; then
3.3443 +- echo $ECHO_N "(cached) $ECHO_C" >&6
3.3444 ++ $as_echo_n "(cached) " >&6
3.3445 + else
3.3446 + ac_save_cxx_werror_flag=$ac_cxx_werror_flag
3.3447 + ac_cxx_werror_flag=yes
3.3448 +@@ -2875,20 +3028,21 @@
3.3449 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.3450 + *) ac_try_echo=$ac_try;;
3.3451 + esac
3.3452 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.3453 +- (eval "$ac_compile") 2>conftest.er1
3.3454 +- ac_status=$?
3.3455 +- grep -v '^ *+' conftest.er1 >conftest.err
3.3456 +- rm -f conftest.er1
3.3457 +- cat conftest.err >&5
3.3458 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.3459 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.3460 ++$as_echo "$ac_try_echo") >&5
3.3461 ++ (eval "$ac_compile") 2>conftest.er1
3.3462 ++ ac_status=$?
3.3463 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.3464 ++ rm -f conftest.er1
3.3465 ++ cat conftest.err >&5
3.3466 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.3467 + (exit $ac_status); } && {
3.3468 + test -z "$ac_cxx_werror_flag" ||
3.3469 + test ! -s conftest.err
3.3470 + } && test -s conftest.$ac_objext; then
3.3471 + ac_cv_prog_cxx_g=yes
3.3472 + else
3.3473 +- echo "$as_me: failed program was:" >&5
3.3474 ++ $as_echo "$as_me: failed program was:" >&5
3.3475 + sed 's/^/| /' conftest.$ac_ext >&5
3.3476 +
3.3477 + CXXFLAGS=""
3.3478 +@@ -2913,20 +3067,21 @@
3.3479 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.3480 + *) ac_try_echo=$ac_try;;
3.3481 + esac
3.3482 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.3483 +- (eval "$ac_compile") 2>conftest.er1
3.3484 +- ac_status=$?
3.3485 +- grep -v '^ *+' conftest.er1 >conftest.err
3.3486 +- rm -f conftest.er1
3.3487 +- cat conftest.err >&5
3.3488 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.3489 +- (exit $ac_status); } && {
3.3490 +- test -z "$ac_cxx_werror_flag" ||
3.3491 +- test ! -s conftest.err
3.3492 +- } && test -s conftest.$ac_objext; then
3.3493 +- :
3.3494 +-else
3.3495 +- echo "$as_me: failed program was:" >&5
3.3496 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.3497 ++$as_echo "$ac_try_echo") >&5
3.3498 ++ (eval "$ac_compile") 2>conftest.er1
3.3499 ++ ac_status=$?
3.3500 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.3501 ++ rm -f conftest.er1
3.3502 ++ cat conftest.err >&5
3.3503 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.3504 ++ (exit $ac_status); } && {
3.3505 ++ test -z "$ac_cxx_werror_flag" ||
3.3506 ++ test ! -s conftest.err
3.3507 ++ } && test -s conftest.$ac_objext; then
3.3508 ++ :
3.3509 ++else
3.3510 ++ $as_echo "$as_me: failed program was:" >&5
3.3511 + sed 's/^/| /' conftest.$ac_ext >&5
3.3512 +
3.3513 + ac_cxx_werror_flag=$ac_save_cxx_werror_flag
3.3514 +@@ -2952,20 +3107,21 @@
3.3515 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.3516 + *) ac_try_echo=$ac_try;;
3.3517 + esac
3.3518 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.3519 +- (eval "$ac_compile") 2>conftest.er1
3.3520 +- ac_status=$?
3.3521 +- grep -v '^ *+' conftest.er1 >conftest.err
3.3522 +- rm -f conftest.er1
3.3523 +- cat conftest.err >&5
3.3524 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.3525 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.3526 ++$as_echo "$ac_try_echo") >&5
3.3527 ++ (eval "$ac_compile") 2>conftest.er1
3.3528 ++ ac_status=$?
3.3529 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.3530 ++ rm -f conftest.er1
3.3531 ++ cat conftest.err >&5
3.3532 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.3533 + (exit $ac_status); } && {
3.3534 + test -z "$ac_cxx_werror_flag" ||
3.3535 + test ! -s conftest.err
3.3536 + } && test -s conftest.$ac_objext; then
3.3537 + ac_cv_prog_cxx_g=yes
3.3538 + else
3.3539 +- echo "$as_me: failed program was:" >&5
3.3540 ++ $as_echo "$as_me: failed program was:" >&5
3.3541 + sed 's/^/| /' conftest.$ac_ext >&5
3.3542 +
3.3543 +
3.3544 +@@ -2980,8 +3136,8 @@
3.3545 + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3.3546 + ac_cxx_werror_flag=$ac_save_cxx_werror_flag
3.3547 + fi
3.3548 +-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
3.3549 +-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
3.3550 ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
3.3551 ++$as_echo "$ac_cv_prog_cxx_g" >&6; }
3.3552 + if test "$ac_test_CXXFLAGS" = set; then
3.3553 + CXXFLAGS=$ac_save_CXXFLAGS
3.3554 + elif test $ac_cv_prog_cxx_g = yes; then
3.3555 +@@ -3004,8 +3160,8 @@
3.3556 + ac_compiler_gnu=$ac_cv_c_compiler_gnu
3.3557 +
3.3558 +
3.3559 +- { echo "$as_me:$LINENO: checking whether the C++ compiler works" >&5
3.3560 +-echo $ECHO_N "checking whether the C++ compiler works... $ECHO_C" >&6; }
3.3561 ++ { $as_echo "$as_me:$LINENO: checking whether the C++ compiler works" >&5
3.3562 ++$as_echo_n "checking whether the C++ compiler works... " >&6; }
3.3563 + ac_ext=cpp
3.3564 + ac_cpp='$CXXCPP $CPPFLAGS'
3.3565 + ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
3.3566 +@@ -3033,33 +3189,39 @@
3.3567 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.3568 + *) ac_try_echo=$ac_try;;
3.3569 + esac
3.3570 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.3571 +- (eval "$ac_link") 2>conftest.er1
3.3572 +- ac_status=$?
3.3573 +- grep -v '^ *+' conftest.er1 >conftest.err
3.3574 +- rm -f conftest.er1
3.3575 +- cat conftest.err >&5
3.3576 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.3577 +- (exit $ac_status); } && {
3.3578 +- test -z "$ac_cxx_werror_flag" ||
3.3579 +- test ! -s conftest.err
3.3580 +- } && test -s conftest$ac_exeext &&
3.3581 +- $as_test_x conftest$ac_exeext; then
3.3582 +- { echo "$as_me:$LINENO: result: yes" >&5
3.3583 +-echo "${ECHO_T}yes" >&6; }
3.3584 +-else
3.3585 +- echo "$as_me: failed program was:" >&5
3.3586 +-sed 's/^/| /' conftest.$ac_ext >&5
3.3587 +-
3.3588 +- { echo "$as_me:$LINENO: result: no" >&5
3.3589 +-echo "${ECHO_T}no" >&6; }
3.3590 +- { { echo "$as_me:$LINENO: error: C++ compiler does not work
3.3591 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.3592 ++$as_echo "$ac_try_echo") >&5
3.3593 ++ (eval "$ac_link") 2>conftest.er1
3.3594 ++ ac_status=$?
3.3595 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.3596 ++ rm -f conftest.er1
3.3597 ++ cat conftest.err >&5
3.3598 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.3599 ++ (exit $ac_status); } && {
3.3600 ++ test -z "$ac_cxx_werror_flag" ||
3.3601 ++ test ! -s conftest.err
3.3602 ++ } && test -s conftest$ac_exeext && {
3.3603 ++ test "$cross_compiling" = yes ||
3.3604 ++ $as_test_x conftest$ac_exeext
3.3605 ++ }; then
3.3606 ++ { $as_echo "$as_me:$LINENO: result: yes" >&5
3.3607 ++$as_echo "yes" >&6; }
3.3608 ++else
3.3609 ++ $as_echo "$as_me: failed program was:" >&5
3.3610 ++sed 's/^/| /' conftest.$ac_ext >&5
3.3611 ++
3.3612 ++ { $as_echo "$as_me:$LINENO: result: no" >&5
3.3613 ++$as_echo "no" >&6; }
3.3614 ++ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
3.3615 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3.3616 ++{ { $as_echo "$as_me:$LINENO: error: C++ compiler does not work
3.3617 + See \`config.log' for more details." >&5
3.3618 +-echo "$as_me: error: C++ compiler does not work
3.3619 ++$as_echo "$as_me: error: C++ compiler does not work
3.3620 + See \`config.log' for more details." >&2;}
3.3621 +- { (exit 1); exit 1; }; }
3.3622 +-fi
3.3623 +-
3.3624 ++ { (exit 1); exit 1; }; }; }
3.3625 ++fi
3.3626 ++
3.3627 ++rm -rf conftest.dSYM
3.3628 + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
3.3629 + conftest$ac_exeext conftest.$ac_ext
3.3630 + ac_ext=c
3.3631 +@@ -3074,15 +3236,15 @@
3.3632 + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
3.3633 + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
3.3634 + ac_compiler_gnu=$ac_cv_c_compiler_gnu
3.3635 +-{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
3.3636 +-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
3.3637 ++{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
3.3638 ++$as_echo_n "checking how to run the C preprocessor... " >&6; }
3.3639 + # On Suns, sometimes $CPP names a directory.
3.3640 + if test -n "$CPP" && test -d "$CPP"; then
3.3641 + CPP=
3.3642 + fi
3.3643 + if test -z "$CPP"; then
3.3644 + if test "${ac_cv_prog_CPP+set}" = set; then
3.3645 +- echo $ECHO_N "(cached) $ECHO_C" >&6
3.3646 ++ $as_echo_n "(cached) " >&6
3.3647 + else
3.3648 + # Double quotes because CPP needs to be expanded
3.3649 + for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
3.3650 +@@ -3114,20 +3276,21 @@
3.3651 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.3652 + *) ac_try_echo=$ac_try;;
3.3653 + esac
3.3654 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.3655 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.3656 ++$as_echo "$ac_try_echo") >&5
3.3657 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
3.3658 + ac_status=$?
3.3659 + grep -v '^ *+' conftest.er1 >conftest.err
3.3660 + rm -f conftest.er1
3.3661 + cat conftest.err >&5
3.3662 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.3663 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.3664 + (exit $ac_status); } >/dev/null && {
3.3665 + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
3.3666 + test ! -s conftest.err
3.3667 + }; then
3.3668 + :
3.3669 + else
3.3670 +- echo "$as_me: failed program was:" >&5
3.3671 ++ $as_echo "$as_me: failed program was:" >&5
3.3672 + sed 's/^/| /' conftest.$ac_ext >&5
3.3673 +
3.3674 + # Broken: fails on valid input.
3.3675 +@@ -3151,13 +3314,14 @@
3.3676 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.3677 + *) ac_try_echo=$ac_try;;
3.3678 + esac
3.3679 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.3680 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.3681 ++$as_echo "$ac_try_echo") >&5
3.3682 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
3.3683 + ac_status=$?
3.3684 + grep -v '^ *+' conftest.er1 >conftest.err
3.3685 + rm -f conftest.er1
3.3686 + cat conftest.err >&5
3.3687 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.3688 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.3689 + (exit $ac_status); } >/dev/null && {
3.3690 + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
3.3691 + test ! -s conftest.err
3.3692 +@@ -3165,7 +3329,7 @@
3.3693 + # Broken: success on invalid input.
3.3694 + continue
3.3695 + else
3.3696 +- echo "$as_me: failed program was:" >&5
3.3697 ++ $as_echo "$as_me: failed program was:" >&5
3.3698 + sed 's/^/| /' conftest.$ac_ext >&5
3.3699 +
3.3700 + # Passes both tests.
3.3701 +@@ -3190,8 +3354,8 @@
3.3702 + else
3.3703 + ac_cv_prog_CPP=$CPP
3.3704 + fi
3.3705 +-{ echo "$as_me:$LINENO: result: $CPP" >&5
3.3706 +-echo "${ECHO_T}$CPP" >&6; }
3.3707 ++{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
3.3708 ++$as_echo "$CPP" >&6; }
3.3709 + ac_preproc_ok=false
3.3710 + for ac_c_preproc_warn_flag in '' yes
3.3711 + do
3.3712 +@@ -3219,20 +3383,21 @@
3.3713 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.3714 + *) ac_try_echo=$ac_try;;
3.3715 + esac
3.3716 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.3717 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.3718 ++$as_echo "$ac_try_echo") >&5
3.3719 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
3.3720 + ac_status=$?
3.3721 + grep -v '^ *+' conftest.er1 >conftest.err
3.3722 + rm -f conftest.er1
3.3723 + cat conftest.err >&5
3.3724 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.3725 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.3726 + (exit $ac_status); } >/dev/null && {
3.3727 + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
3.3728 + test ! -s conftest.err
3.3729 + }; then
3.3730 + :
3.3731 + else
3.3732 +- echo "$as_me: failed program was:" >&5
3.3733 ++ $as_echo "$as_me: failed program was:" >&5
3.3734 + sed 's/^/| /' conftest.$ac_ext >&5
3.3735 +
3.3736 + # Broken: fails on valid input.
3.3737 +@@ -3256,13 +3421,14 @@
3.3738 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.3739 + *) ac_try_echo=$ac_try;;
3.3740 + esac
3.3741 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.3742 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.3743 ++$as_echo "$ac_try_echo") >&5
3.3744 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
3.3745 + ac_status=$?
3.3746 + grep -v '^ *+' conftest.er1 >conftest.err
3.3747 + rm -f conftest.er1
3.3748 + cat conftest.err >&5
3.3749 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.3750 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.3751 + (exit $ac_status); } >/dev/null && {
3.3752 + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
3.3753 + test ! -s conftest.err
3.3754 +@@ -3270,7 +3436,7 @@
3.3755 + # Broken: success on invalid input.
3.3756 + continue
3.3757 + else
3.3758 +- echo "$as_me: failed program was:" >&5
3.3759 ++ $as_echo "$as_me: failed program was:" >&5
3.3760 + sed 's/^/| /' conftest.$ac_ext >&5
3.3761 +
3.3762 + # Passes both tests.
3.3763 +@@ -3286,11 +3452,13 @@
3.3764 + if $ac_preproc_ok; then
3.3765 + :
3.3766 + else
3.3767 +- { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
3.3768 ++ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
3.3769 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3.3770 ++{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
3.3771 + See \`config.log' for more details." >&5
3.3772 +-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
3.3773 ++$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
3.3774 + See \`config.log' for more details." >&2;}
3.3775 +- { (exit 1); exit 1; }; }
3.3776 ++ { (exit 1); exit 1; }; }; }
3.3777 + fi
3.3778 +
3.3779 + ac_ext=c
3.3780 +@@ -3300,33 +3468,29 @@
3.3781 + ac_compiler_gnu=$ac_cv_c_compiler_gnu
3.3782 +
3.3783 +
3.3784 +- { echo "$as_me:$LINENO: checking for the version of the GNU C compiler" >&5
3.3785 +-echo $ECHO_N "checking for the version of the GNU C compiler... $ECHO_C" >&6; }
3.3786 ++ { $as_echo "$as_me:$LINENO: checking for the version of the GNU C compiler" >&5
3.3787 ++$as_echo_n "checking for the version of the GNU C compiler... " >&6; }
3.3788 + if test "${oasys_cv_prog_gccver+set}" = set; then
3.3789 +- echo $ECHO_N "(cached) $ECHO_C" >&6
3.3790 +-else
3.3791 +-
3.3792 +- oasys_cv_prog_gccver=`$CC --version | head -n 1`
3.3793 +- oasys_cv_prog_gccver=`echo $oasys_cv_prog_gccver | sed 's/.*gcc.*(GCC) //'`
3.3794 +- oasys_cv_prog_gccver=`echo $oasys_cv_prog_gccver | sed 's/ .*//'`
3.3795 +-
3.3796 +-fi
3.3797 +-{ echo "$as_me:$LINENO: result: $oasys_cv_prog_gccver" >&5
3.3798 +-echo "${ECHO_T}$oasys_cv_prog_gccver" >&6; }
3.3799 +-
3.3800 +- { echo "$as_me:$LINENO: checking for the version of the GNU C++ compiler" >&5
3.3801 +-echo $ECHO_N "checking for the version of the GNU C++ compiler... $ECHO_C" >&6; }
3.3802 ++ $as_echo_n "(cached) " >&6
3.3803 ++else
3.3804 ++
3.3805 ++ oasys_cv_prog_gccver=`$CC -dumpversion | cut -d. -f1-2`
3.3806 ++
3.3807 ++fi
3.3808 ++{ $as_echo "$as_me:$LINENO: result: $oasys_cv_prog_gccver" >&5
3.3809 ++$as_echo "$oasys_cv_prog_gccver" >&6; }
3.3810 ++
3.3811 ++ { $as_echo "$as_me:$LINENO: checking for the version of the GNU C++ compiler" >&5
3.3812 ++$as_echo_n "checking for the version of the GNU C++ compiler... " >&6; }
3.3813 + if test "${oasys_cv_prog_gxxver+set}" = set; then
3.3814 +- echo $ECHO_N "(cached) $ECHO_C" >&6
3.3815 +-else
3.3816 +-
3.3817 +- oasys_cv_prog_gxxver=`$CXX --version | head -n 1`
3.3818 +- oasys_cv_prog_gxxver=`echo $oasys_cv_prog_gxxver | sed 's/.*g++.*(GCC) //'`
3.3819 +- oasys_cv_prog_gxxver=`echo $oasys_cv_prog_gxxver | sed 's/ .*//'`
3.3820 +-
3.3821 +-fi
3.3822 +-{ echo "$as_me:$LINENO: result: $oasys_cv_prog_gxxver" >&5
3.3823 +-echo "${ECHO_T}$oasys_cv_prog_gxxver" >&6; }
3.3824 ++ $as_echo_n "(cached) " >&6
3.3825 ++else
3.3826 ++
3.3827 ++ oasys_cv_prog_gxxver=`$CXX -dumpversion | cut -d. -f1-2`
3.3828 ++
3.3829 ++fi
3.3830 ++{ $as_echo "$as_me:$LINENO: result: $oasys_cv_prog_gxxver" >&5
3.3831 ++$as_echo "$oasys_cv_prog_gxxver" >&6; }
3.3832 +
3.3833 + if test $oasys_cv_prog_gccver != $oasys_cv_prog_gxxver ; then
3.3834 + echo "*** "
3.3835 +@@ -3371,10 +3535,10 @@
3.3836 + if test -n "$ac_tool_prefix"; then
3.3837 + # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
3.3838 + set dummy ${ac_tool_prefix}ar; ac_word=$2
3.3839 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
3.3840 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
3.3841 ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
3.3842 ++$as_echo_n "checking for $ac_word... " >&6; }
3.3843 + if test "${ac_cv_prog_AR+set}" = set; then
3.3844 +- echo $ECHO_N "(cached) $ECHO_C" >&6
3.3845 ++ $as_echo_n "(cached) " >&6
3.3846 + else
3.3847 + if test -n "$AR"; then
3.3848 + ac_cv_prog_AR="$AR" # Let the user override the test.
3.3849 +@@ -3387,7 +3551,7 @@
3.3850 + for ac_exec_ext in '' $ac_executable_extensions; do
3.3851 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3.3852 + ac_cv_prog_AR="${ac_tool_prefix}ar"
3.3853 +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3.3854 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3.3855 + break 2
3.3856 + fi
3.3857 + done
3.3858 +@@ -3398,11 +3562,11 @@
3.3859 + fi
3.3860 + AR=$ac_cv_prog_AR
3.3861 + if test -n "$AR"; then
3.3862 +- { echo "$as_me:$LINENO: result: $AR" >&5
3.3863 +-echo "${ECHO_T}$AR" >&6; }
3.3864 +-else
3.3865 +- { echo "$as_me:$LINENO: result: no" >&5
3.3866 +-echo "${ECHO_T}no" >&6; }
3.3867 ++ { $as_echo "$as_me:$LINENO: result: $AR" >&5
3.3868 ++$as_echo "$AR" >&6; }
3.3869 ++else
3.3870 ++ { $as_echo "$as_me:$LINENO: result: no" >&5
3.3871 ++$as_echo "no" >&6; }
3.3872 + fi
3.3873 +
3.3874 +
3.3875 +@@ -3411,10 +3575,10 @@
3.3876 + ac_ct_AR=$AR
3.3877 + # Extract the first word of "ar", so it can be a program name with args.
3.3878 + set dummy ar; ac_word=$2
3.3879 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
3.3880 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
3.3881 ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
3.3882 ++$as_echo_n "checking for $ac_word... " >&6; }
3.3883 + if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
3.3884 +- echo $ECHO_N "(cached) $ECHO_C" >&6
3.3885 ++ $as_echo_n "(cached) " >&6
3.3886 + else
3.3887 + if test -n "$ac_ct_AR"; then
3.3888 + ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
3.3889 +@@ -3427,7 +3591,7 @@
3.3890 + for ac_exec_ext in '' $ac_executable_extensions; do
3.3891 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3.3892 + ac_cv_prog_ac_ct_AR="ar"
3.3893 +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3.3894 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3.3895 + break 2
3.3896 + fi
3.3897 + done
3.3898 +@@ -3438,11 +3602,11 @@
3.3899 + fi
3.3900 + ac_ct_AR=$ac_cv_prog_ac_ct_AR
3.3901 + if test -n "$ac_ct_AR"; then
3.3902 +- { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
3.3903 +-echo "${ECHO_T}$ac_ct_AR" >&6; }
3.3904 +-else
3.3905 +- { echo "$as_me:$LINENO: result: no" >&5
3.3906 +-echo "${ECHO_T}no" >&6; }
3.3907 ++ { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
3.3908 ++$as_echo "$ac_ct_AR" >&6; }
3.3909 ++else
3.3910 ++ { $as_echo "$as_me:$LINENO: result: no" >&5
3.3911 ++$as_echo "no" >&6; }
3.3912 + fi
3.3913 +
3.3914 + if test "x$ac_ct_AR" = x; then
3.3915 +@@ -3450,12 +3614,8 @@
3.3916 + else
3.3917 + case $cross_compiling:$ac_tool_warned in
3.3918 + yes:)
3.3919 +-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
3.3920 +-whose name does not start with the host triplet. If you think this
3.3921 +-configuration is useful to you, please write to autoconf@gnu.org." >&5
3.3922 +-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
3.3923 +-whose name does not start with the host triplet. If you think this
3.3924 +-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
3.3925 ++{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
3.3926 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
3.3927 + ac_tool_warned=yes ;;
3.3928 + esac
3.3929 + AR=$ac_ct_AR
3.3930 +@@ -3467,10 +3627,10 @@
3.3931 + if test -n "$ac_tool_prefix"; then
3.3932 + # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
3.3933 + set dummy ${ac_tool_prefix}ranlib; ac_word=$2
3.3934 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
3.3935 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
3.3936 ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
3.3937 ++$as_echo_n "checking for $ac_word... " >&6; }
3.3938 + if test "${ac_cv_prog_RANLIB+set}" = set; then
3.3939 +- echo $ECHO_N "(cached) $ECHO_C" >&6
3.3940 ++ $as_echo_n "(cached) " >&6
3.3941 + else
3.3942 + if test -n "$RANLIB"; then
3.3943 + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
3.3944 +@@ -3483,7 +3643,7 @@
3.3945 + for ac_exec_ext in '' $ac_executable_extensions; do
3.3946 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3.3947 + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
3.3948 +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3.3949 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3.3950 + break 2
3.3951 + fi
3.3952 + done
3.3953 +@@ -3494,11 +3654,11 @@
3.3954 + fi
3.3955 + RANLIB=$ac_cv_prog_RANLIB
3.3956 + if test -n "$RANLIB"; then
3.3957 +- { echo "$as_me:$LINENO: result: $RANLIB" >&5
3.3958 +-echo "${ECHO_T}$RANLIB" >&6; }
3.3959 +-else
3.3960 +- { echo "$as_me:$LINENO: result: no" >&5
3.3961 +-echo "${ECHO_T}no" >&6; }
3.3962 ++ { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
3.3963 ++$as_echo "$RANLIB" >&6; }
3.3964 ++else
3.3965 ++ { $as_echo "$as_me:$LINENO: result: no" >&5
3.3966 ++$as_echo "no" >&6; }
3.3967 + fi
3.3968 +
3.3969 +
3.3970 +@@ -3507,10 +3667,10 @@
3.3971 + ac_ct_RANLIB=$RANLIB
3.3972 + # Extract the first word of "ranlib", so it can be a program name with args.
3.3973 + set dummy ranlib; ac_word=$2
3.3974 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
3.3975 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
3.3976 ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
3.3977 ++$as_echo_n "checking for $ac_word... " >&6; }
3.3978 + if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
3.3979 +- echo $ECHO_N "(cached) $ECHO_C" >&6
3.3980 ++ $as_echo_n "(cached) " >&6
3.3981 + else
3.3982 + if test -n "$ac_ct_RANLIB"; then
3.3983 + ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
3.3984 +@@ -3523,7 +3683,7 @@
3.3985 + for ac_exec_ext in '' $ac_executable_extensions; do
3.3986 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3.3987 + ac_cv_prog_ac_ct_RANLIB="ranlib"
3.3988 +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3.3989 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3.3990 + break 2
3.3991 + fi
3.3992 + done
3.3993 +@@ -3534,11 +3694,11 @@
3.3994 + fi
3.3995 + ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
3.3996 + if test -n "$ac_ct_RANLIB"; then
3.3997 +- { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
3.3998 +-echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
3.3999 +-else
3.4000 +- { echo "$as_me:$LINENO: result: no" >&5
3.4001 +-echo "${ECHO_T}no" >&6; }
3.4002 ++ { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
3.4003 ++$as_echo "$ac_ct_RANLIB" >&6; }
3.4004 ++else
3.4005 ++ { $as_echo "$as_me:$LINENO: result: no" >&5
3.4006 ++$as_echo "no" >&6; }
3.4007 + fi
3.4008 +
3.4009 + if test "x$ac_ct_RANLIB" = x; then
3.4010 +@@ -3546,12 +3706,8 @@
3.4011 + else
3.4012 + case $cross_compiling:$ac_tool_warned in
3.4013 + yes:)
3.4014 +-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
3.4015 +-whose name does not start with the host triplet. If you think this
3.4016 +-configuration is useful to you, please write to autoconf@gnu.org." >&5
3.4017 +-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
3.4018 +-whose name does not start with the host triplet. If you think this
3.4019 +-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
3.4020 ++{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
3.4021 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
3.4022 + ac_tool_warned=yes ;;
3.4023 + esac
3.4024 + RANLIB=$ac_ct_RANLIB
3.4025 +@@ -3562,8 +3718,8 @@
3.4026 +
3.4027 +
3.4028 + if test -z "$AR" ; then
3.4029 +- { { echo "$as_me:$LINENO: error: can't find a working ar tool" >&5
3.4030 +-echo "$as_me: error: can't find a working ar tool" >&2;}
3.4031 ++ { { $as_echo "$as_me:$LINENO: error: can't find a working ar tool" >&5
3.4032 ++$as_echo "$as_me: error: can't find a working ar tool" >&2;}
3.4033 + { (exit 1); exit 1; }; }
3.4034 + fi
3.4035 +
3.4036 +@@ -3576,10 +3732,10 @@
3.4037 + fi
3.4038 +
3.4039 +
3.4040 +- { echo "$as_me:$LINENO: checking whether to compile with debugging" >&5
3.4041 +-echo $ECHO_N "checking whether to compile with debugging... $ECHO_C" >&6; }
3.4042 +- { echo "$as_me:$LINENO: result: $debug" >&5
3.4043 +-echo "${ECHO_T}$debug" >&6; }
3.4044 ++ { $as_echo "$as_me:$LINENO: checking whether to compile with debugging" >&5
3.4045 ++$as_echo_n "checking whether to compile with debugging... " >&6; }
3.4046 ++ { $as_echo "$as_me:$LINENO: result: $debug" >&5
3.4047 ++$as_echo "$debug" >&6; }
3.4048 +
3.4049 + DEBUG=
3.4050 + if test $debug = yes ; then
3.4051 +@@ -3597,10 +3753,10 @@
3.4052 + fi
3.4053 +
3.4054 +
3.4055 +- { echo "$as_me:$LINENO: checking whether to compile with memory debugging" >&5
3.4056 +-echo $ECHO_N "checking whether to compile with memory debugging... $ECHO_C" >&6; }
3.4057 +- { echo "$as_me:$LINENO: result: $debug_memory" >&5
3.4058 +-echo "${ECHO_T}$debug_memory" >&6; }
3.4059 ++ { $as_echo "$as_me:$LINENO: checking whether to compile with memory debugging" >&5
3.4060 ++$as_echo_n "checking whether to compile with memory debugging... " >&6; }
3.4061 ++ { $as_echo "$as_me:$LINENO: result: $debug_memory" >&5
3.4062 ++$as_echo "$debug_memory" >&6; }
3.4063 +
3.4064 + if test $debug_memory = yes ; then
3.4065 +
3.4066 +@@ -3618,10 +3774,10 @@
3.4067 + fi
3.4068 +
3.4069 +
3.4070 +- { echo "$as_me:$LINENO: checking whether to compile with lock debugging (default $debug)" >&5
3.4071 +-echo $ECHO_N "checking whether to compile with lock debugging (default $debug)... $ECHO_C" >&6; }
3.4072 +- { echo "$as_me:$LINENO: result: $debug_locking" >&5
3.4073 +-echo "${ECHO_T}$debug_locking" >&6; }
3.4074 ++ { $as_echo "$as_me:$LINENO: checking whether to compile with lock debugging (default $debug)" >&5
3.4075 ++$as_echo_n "checking whether to compile with lock debugging (default $debug)... " >&6; }
3.4076 ++ { $as_echo "$as_me:$LINENO: result: $debug_locking" >&5
3.4077 ++$as_echo "$debug_locking" >&6; }
3.4078 +
3.4079 + if test $debug_locking = yes ; then
3.4080 +
3.4081 +@@ -3640,10 +3796,10 @@
3.4082 + fi
3.4083 +
3.4084 +
3.4085 +- { echo "$as_me:$LINENO: checking whether to compile with optimization" >&5
3.4086 +-echo $ECHO_N "checking whether to compile with optimization... $ECHO_C" >&6; }
3.4087 +- { echo "$as_me:$LINENO: result: $optimize" >&5
3.4088 +-echo "${ECHO_T}$optimize" >&6; }
3.4089 ++ { $as_echo "$as_me:$LINENO: checking whether to compile with optimization" >&5
3.4090 ++$as_echo_n "checking whether to compile with optimization... " >&6; }
3.4091 ++ { $as_echo "$as_me:$LINENO: result: $optimize" >&5
3.4092 ++$as_echo "$optimize" >&6; }
3.4093 +
3.4094 + OPTIMIZE=
3.4095 + OPTIMIZE_WARN=
3.4096 +@@ -3663,10 +3819,10 @@
3.4097 + fi
3.4098 +
3.4099 +
3.4100 +- { echo "$as_me:$LINENO: checking whether to compile with profiling" >&5
3.4101 +-echo $ECHO_N "checking whether to compile with profiling... $ECHO_C" >&6; }
3.4102 +- { echo "$as_me:$LINENO: result: $profile" >&5
3.4103 +-echo "${ECHO_T}$profile" >&6; }
3.4104 ++ { $as_echo "$as_me:$LINENO: checking whether to compile with profiling" >&5
3.4105 ++$as_echo_n "checking whether to compile with profiling... " >&6; }
3.4106 ++ { $as_echo "$as_me:$LINENO: result: $profile" >&5
3.4107 ++$as_echo "$profile" >&6; }
3.4108 +
3.4109 + PROFILE=
3.4110 + if test $profile = yes ; then
3.4111 +@@ -3682,10 +3838,10 @@
3.4112 + fi
3.4113 +
3.4114 +
3.4115 +- { echo "$as_me:$LINENO: checking whether to link statically" >&5
3.4116 +-echo $ECHO_N "checking whether to link statically... $ECHO_C" >&6; }
3.4117 +- { echo "$as_me:$LINENO: result: $static" >&5
3.4118 +-echo "${ECHO_T}$static" >&6; }
3.4119 ++ { $as_echo "$as_me:$LINENO: checking whether to link statically" >&5
3.4120 ++$as_echo_n "checking whether to link statically... " >&6; }
3.4121 ++ { $as_echo "$as_me:$LINENO: result: $static" >&5
3.4122 ++$as_echo "$static" >&6; }
3.4123 +
3.4124 + # Check whether --enable-static-external-libs was given.
3.4125 + if test "${enable_static_external_libs+set}" = set; then
3.4126 +@@ -3695,10 +3851,10 @@
3.4127 + fi
3.4128 +
3.4129 +
3.4130 +- { echo "$as_me:$LINENO: checking whether to link using static external libraries" >&5
3.4131 +-echo $ECHO_N "checking whether to link using static external libraries... $ECHO_C" >&6; }
3.4132 +- { echo "$as_me:$LINENO: result: $staticextlibs" >&5
3.4133 +-echo "${ECHO_T}$staticextlibs" >&6; }
3.4134 ++ { $as_echo "$as_me:$LINENO: checking whether to link using static external libraries" >&5
3.4135 ++$as_echo_n "checking whether to link using static external libraries... " >&6; }
3.4136 ++ { $as_echo "$as_me:$LINENO: result: $staticextlibs" >&5
3.4137 ++$as_echo "$staticextlibs" >&6; }
3.4138 +
3.4139 + STATIC=no
3.4140 + if [ $static = yes ] ; then
3.4141 +@@ -3709,11 +3865,11 @@
3.4142 + fi
3.4143 +
3.4144 +
3.4145 +- { echo "$as_me:$LINENO: checking whether to try to build shared libraries" >&5
3.4146 +-echo $ECHO_N "checking whether to try to build shared libraries... $ECHO_C" >&6; }
3.4147 ++ { $as_echo "$as_me:$LINENO: checking whether to try to build shared libraries" >&5
3.4148 ++$as_echo_n "checking whether to try to build shared libraries... " >&6; }
3.4149 + if [ $static = yes ] ; then
3.4150 +- { echo "$as_me:$LINENO: result: no" >&5
3.4151 +-echo "${ECHO_T}no" >&6; }
3.4152 ++ { $as_echo "$as_me:$LINENO: result: no" >&5
3.4153 ++$as_echo "no" >&6; }
3.4154 + else
3.4155 +
3.4156 + # Check whether --enable-shlibs was given.
3.4157 +@@ -3724,8 +3880,8 @@
3.4158 + fi
3.4159 +
3.4160 +
3.4161 +- { echo "$as_me:$LINENO: result: $shlibs" >&5
3.4162 +-echo "${ECHO_T}$shlibs" >&6; }
3.4163 ++ { $as_echo "$as_me:$LINENO: result: $shlibs" >&5
3.4164 ++$as_echo "$shlibs" >&6; }
3.4165 +
3.4166 + SHLIBS=no
3.4167 + PICFLAGS=""
3.4168 +@@ -3735,8 +3891,8 @@
3.4169 + ac_save_CFLAGS=$CFLAGS
3.4170 + picflags="-fPIC -DPIC"
3.4171 + CFLAGS="$picflags $ac_save_CFLAGS -Werror"
3.4172 +- { echo "$as_me:$LINENO: checking whether the compiler supports -fPIC" >&5
3.4173 +-echo $ECHO_N "checking whether the compiler supports -fPIC... $ECHO_C" >&6; }
3.4174 ++ { $as_echo "$as_me:$LINENO: checking whether the compiler supports -fPIC" >&5
3.4175 ++$as_echo_n "checking whether the compiler supports -fPIC... " >&6; }
3.4176 + cat >conftest.$ac_ext <<_ACEOF
3.4177 + int myfunc() {return 0;}
3.4178 + _ACEOF
3.4179 +@@ -3746,34 +3902,35 @@
3.4180 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.4181 + *) ac_try_echo=$ac_try;;
3.4182 + esac
3.4183 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.4184 +- (eval "$ac_compile") 2>conftest.er1
3.4185 +- ac_status=$?
3.4186 +- grep -v '^ *+' conftest.er1 >conftest.err
3.4187 +- rm -f conftest.er1
3.4188 +- cat conftest.err >&5
3.4189 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.4190 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.4191 ++$as_echo "$ac_try_echo") >&5
3.4192 ++ (eval "$ac_compile") 2>conftest.er1
3.4193 ++ ac_status=$?
3.4194 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.4195 ++ rm -f conftest.er1
3.4196 ++ cat conftest.err >&5
3.4197 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.4198 + (exit $ac_status); } && {
3.4199 + test -z "$ac_c_werror_flag" ||
3.4200 + test ! -s conftest.err
3.4201 + } && test -s conftest.$ac_objext; then
3.4202 + pic=yes
3.4203 + else
3.4204 +- echo "$as_me: failed program was:" >&5
3.4205 ++ $as_echo "$as_me: failed program was:" >&5
3.4206 + sed 's/^/| /' conftest.$ac_ext >&5
3.4207 +
3.4208 + pic=no
3.4209 + fi
3.4210 +
3.4211 + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3.4212 +- { echo "$as_me:$LINENO: result: $pic" >&5
3.4213 +-echo "${ECHO_T}$pic" >&6; }
3.4214 ++ { $as_echo "$as_me:$LINENO: result: $pic" >&5
3.4215 ++$as_echo "$pic" >&6; }
3.4216 +
3.4217 + if [ $pic = yes ] ; then
3.4218 +
3.4219 + for shopt in -shared "-dynamiclib -single_module" ; do
3.4220 +- { echo "$as_me:$LINENO: checking whether the compiler can link a dynamic library with $shopt" >&5
3.4221 +-echo $ECHO_N "checking whether the compiler can link a dynamic library with $shopt... $ECHO_C" >&6; }
3.4222 ++ { $as_echo "$as_me:$LINENO: checking whether the compiler can link a dynamic library with $shopt" >&5
3.4223 ++$as_echo_n "checking whether the compiler can link a dynamic library with $shopt... " >&6; }
3.4224 + LDFLAGS="$shopt $ac_save_LDFLAGS"
3.4225 + cat >conftest.$ac_ext <<_ACEOF
3.4226 + void myfunc() {}
3.4227 +@@ -3784,53 +3941,57 @@
3.4228 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.4229 + *) ac_try_echo=$ac_try;;
3.4230 + esac
3.4231 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.4232 +- (eval "$ac_link") 2>conftest.er1
3.4233 +- ac_status=$?
3.4234 +- grep -v '^ *+' conftest.er1 >conftest.err
3.4235 +- rm -f conftest.er1
3.4236 +- cat conftest.err >&5
3.4237 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.4238 +- (exit $ac_status); } && {
3.4239 +- test -z "$ac_c_werror_flag" ||
3.4240 +- test ! -s conftest.err
3.4241 +- } && test -s conftest$ac_exeext &&
3.4242 +- $as_test_x conftest$ac_exeext; then
3.4243 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.4244 ++$as_echo "$ac_try_echo") >&5
3.4245 ++ (eval "$ac_link") 2>conftest.er1
3.4246 ++ ac_status=$?
3.4247 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.4248 ++ rm -f conftest.er1
3.4249 ++ cat conftest.err >&5
3.4250 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.4251 ++ (exit $ac_status); } && {
3.4252 ++ test -z "$ac_c_werror_flag" ||
3.4253 ++ test ! -s conftest.err
3.4254 ++ } && test -s conftest$ac_exeext && {
3.4255 ++ test "$cross_compiling" = yes ||
3.4256 ++ $as_test_x conftest$ac_exeext
3.4257 ++ }; then
3.4258 + shlink=yes
3.4259 + else
3.4260 +- echo "$as_me: failed program was:" >&5
3.4261 ++ $as_echo "$as_me: failed program was:" >&5
3.4262 + sed 's/^/| /' conftest.$ac_ext >&5
3.4263 +
3.4264 + shlink=no
3.4265 + fi
3.4266 +
3.4267 +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
3.4268 +- conftest$ac_exeext conftest.$ac_ext
3.4269 +- { echo "$as_me:$LINENO: result: $shlink" >&5
3.4270 +-echo "${ECHO_T}$shlink" >&6; }
3.4271 ++rm -rf conftest.dSYM
3.4272 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
3.4273 ++ conftest$ac_exeext conftest.$ac_ext
3.4274 ++ { $as_echo "$as_me:$LINENO: result: $shlink" >&5
3.4275 ++$as_echo "$shlink" >&6; }
3.4276 +
3.4277 + if [ $shlink = yes ] ; then
3.4278 + SHLIBS=yes
3.4279 + PICFLAGS=$picflags
3.4280 + LDFLAGS_SHLIB="$shopt $PICFLAGS"
3.4281 +
3.4282 +- { echo "$as_me:$LINENO: checking extension for dynamic libraries" >&5
3.4283 +-echo $ECHO_N "checking extension for dynamic libraries... $ECHO_C" >&6; }
3.4284 ++ { $as_echo "$as_me:$LINENO: checking extension for dynamic libraries" >&5
3.4285 ++$as_echo_n "checking extension for dynamic libraries... " >&6; }
3.4286 + if [ "$shopt" = "-dynamiclib -single_module" ] ; then
3.4287 + SHLIB_EXT=dylib
3.4288 + elif [ $shopt = -shared ] ; then
3.4289 + SHLIB_EXT=so
3.4290 + else
3.4291 + # shouldn't happen if above options are correctly checked
3.4292 +- { { echo "$as_me:$LINENO: error: internal error in configure script" >&5
3.4293 +-echo "$as_me: error: internal error in configure script" >&2;}
3.4294 ++ { { $as_echo "$as_me:$LINENO: error: internal error in configure script" >&5
3.4295 ++$as_echo "$as_me: error: internal error in configure script" >&2;}
3.4296 + { (exit 1); exit 1; }; }
3.4297 + fi
3.4298 +- { echo "$as_me:$LINENO: result: $SHLIB_EXT" >&5
3.4299 +-echo "${ECHO_T}$SHLIB_EXT" >&6; }
3.4300 +-
3.4301 +- { echo "$as_me:$LINENO: checking if the compiler supports -Wl,--rpath=." >&5
3.4302 +-echo $ECHO_N "checking if the compiler supports -Wl,--rpath=.... $ECHO_C" >&6; }
3.4303 ++ { $as_echo "$as_me:$LINENO: result: $SHLIB_EXT" >&5
3.4304 ++$as_echo "$SHLIB_EXT" >&6; }
3.4305 ++
3.4306 ++ { $as_echo "$as_me:$LINENO: checking if the compiler supports -Wl,--rpath=." >&5
3.4307 ++$as_echo_n "checking if the compiler supports -Wl,--rpath=.... " >&6; }
3.4308 + LDFLAGS="$LDFLAGS -Wl,-rpath=/foo"
3.4309 + cat >conftest.$ac_ext <<_ACEOF
3.4310 + void myfunc() {}
3.4311 +@@ -3841,30 +4002,34 @@
3.4312 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.4313 + *) ac_try_echo=$ac_try;;
3.4314 + esac
3.4315 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.4316 +- (eval "$ac_link") 2>conftest.er1
3.4317 +- ac_status=$?
3.4318 +- grep -v '^ *+' conftest.er1 >conftest.err
3.4319 +- rm -f conftest.er1
3.4320 +- cat conftest.err >&5
3.4321 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.4322 +- (exit $ac_status); } && {
3.4323 +- test -z "$ac_c_werror_flag" ||
3.4324 +- test ! -s conftest.err
3.4325 +- } && test -s conftest$ac_exeext &&
3.4326 +- $as_test_x conftest$ac_exeext; then
3.4327 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.4328 ++$as_echo "$ac_try_echo") >&5
3.4329 ++ (eval "$ac_link") 2>conftest.er1
3.4330 ++ ac_status=$?
3.4331 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.4332 ++ rm -f conftest.er1
3.4333 ++ cat conftest.err >&5
3.4334 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.4335 ++ (exit $ac_status); } && {
3.4336 ++ test -z "$ac_c_werror_flag" ||
3.4337 ++ test ! -s conftest.err
3.4338 ++ } && test -s conftest$ac_exeext && {
3.4339 ++ test "$cross_compiling" = yes ||
3.4340 ++ $as_test_x conftest$ac_exeext
3.4341 ++ }; then
3.4342 + rpath=yes
3.4343 + else
3.4344 +- echo "$as_me: failed program was:" >&5
3.4345 ++ $as_echo "$as_me: failed program was:" >&5
3.4346 + sed 's/^/| /' conftest.$ac_ext >&5
3.4347 +
3.4348 + rpath=no
3.4349 + fi
3.4350 +
3.4351 +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
3.4352 +- conftest$ac_exeext conftest.$ac_ext
3.4353 +- { echo "$as_me:$LINENO: result: $rpath" >&5
3.4354 +-echo "${ECHO_T}$rpath" >&6; }
3.4355 ++rm -rf conftest.dSYM
3.4356 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
3.4357 ++ conftest$ac_exeext conftest.$ac_ext
3.4358 ++ { $as_echo "$as_me:$LINENO: result: $rpath" >&5
3.4359 ++$as_echo "$rpath" >&6; }
3.4360 + if [ $rpath = yes ] ; then
3.4361 + RPATH="-Wl,-rpath=. -Wl,-rpath=\$(prefix)/lib"
3.4362 + fi
3.4363 +@@ -3923,8 +4088,8 @@
3.4364 + fi
3.4365 + done
3.4366 + if test -z "$ac_aux_dir"; then
3.4367 +- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
3.4368 +-echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
3.4369 ++ { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
3.4370 ++$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
3.4371 + { (exit 1); exit 1; }; }
3.4372 + fi
3.4373 +
3.4374 +@@ -3938,42 +4103,37 @@
3.4375 +
3.4376 +
3.4377 +
3.4378 +-{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
3.4379 +-echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
3.4380 ++{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
3.4381 ++$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
3.4382 + if test "${ac_cv_path_GREP+set}" = set; then
3.4383 +- echo $ECHO_N "(cached) $ECHO_C" >&6
3.4384 +-else
3.4385 +- # Extract the first word of "grep ggrep" to use in msg output
3.4386 +-if test -z "$GREP"; then
3.4387 +-set dummy grep ggrep; ac_prog_name=$2
3.4388 +-if test "${ac_cv_path_GREP+set}" = set; then
3.4389 +- echo $ECHO_N "(cached) $ECHO_C" >&6
3.4390 +-else
3.4391 ++ $as_echo_n "(cached) " >&6
3.4392 ++else
3.4393 ++ if test -z "$GREP"; then
3.4394 + ac_path_GREP_found=false
3.4395 +-# Loop through the user's path and test for each of PROGNAME-LIST
3.4396 +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3.4397 ++ # Loop through the user's path and test for each of PROGNAME-LIST
3.4398 ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3.4399 + for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
3.4400 + do
3.4401 + IFS=$as_save_IFS
3.4402 + test -z "$as_dir" && as_dir=.
3.4403 + for ac_prog in grep ggrep; do
3.4404 +- for ac_exec_ext in '' $ac_executable_extensions; do
3.4405 +- ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
3.4406 +- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
3.4407 +- # Check for GNU ac_path_GREP and select it if it is found.
3.4408 ++ for ac_exec_ext in '' $ac_executable_extensions; do
3.4409 ++ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
3.4410 ++ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
3.4411 ++# Check for GNU ac_path_GREP and select it if it is found.
3.4412 + # Check for GNU $ac_path_GREP
3.4413 + case `"$ac_path_GREP" --version 2>&1` in
3.4414 + *GNU*)
3.4415 + ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
3.4416 + *)
3.4417 + ac_count=0
3.4418 +- echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
3.4419 ++ $as_echo_n 0123456789 >"conftest.in"
3.4420 + while :
3.4421 + do
3.4422 + cat "conftest.in" "conftest.in" >"conftest.tmp"
3.4423 + mv "conftest.tmp" "conftest.in"
3.4424 + cp "conftest.in" "conftest.nl"
3.4425 +- echo 'GREP' >> "conftest.nl"
3.4426 ++ $as_echo 'GREP' >> "conftest.nl"
3.4427 + "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
3.4428 + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
3.4429 + ac_count=`expr $ac_count + 1`
3.4430 +@@ -3988,74 +4148,60 @@
3.4431 + rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
3.4432 + esac
3.4433 +
3.4434 +-
3.4435 +- $ac_path_GREP_found && break 3
3.4436 +- done
3.4437 +-done
3.4438 +-
3.4439 +-done
3.4440 +-IFS=$as_save_IFS
3.4441 +-
3.4442 +-
3.4443 +-fi
3.4444 +-
3.4445 +-GREP="$ac_cv_path_GREP"
3.4446 +-if test -z "$GREP"; then
3.4447 +- { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
3.4448 +-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
3.4449 +- { (exit 1); exit 1; }; }
3.4450 +-fi
3.4451 +-
3.4452 ++ $ac_path_GREP_found && break 3
3.4453 ++ done
3.4454 ++ done
3.4455 ++done
3.4456 ++IFS=$as_save_IFS
3.4457 ++ if test -z "$ac_cv_path_GREP"; then
3.4458 ++ { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
3.4459 ++$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
3.4460 ++ { (exit 1); exit 1; }; }
3.4461 ++ fi
3.4462 + else
3.4463 + ac_cv_path_GREP=$GREP
3.4464 + fi
3.4465 +
3.4466 +-
3.4467 +-fi
3.4468 +-{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
3.4469 +-echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
3.4470 ++fi
3.4471 ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
3.4472 ++$as_echo "$ac_cv_path_GREP" >&6; }
3.4473 + GREP="$ac_cv_path_GREP"
3.4474 +
3.4475 +
3.4476 +-{ echo "$as_me:$LINENO: checking for egrep" >&5
3.4477 +-echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
3.4478 ++{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
3.4479 ++$as_echo_n "checking for egrep... " >&6; }
3.4480 + if test "${ac_cv_path_EGREP+set}" = set; then
3.4481 +- echo $ECHO_N "(cached) $ECHO_C" >&6
3.4482 ++ $as_echo_n "(cached) " >&6
3.4483 + else
3.4484 + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
3.4485 + then ac_cv_path_EGREP="$GREP -E"
3.4486 + else
3.4487 +- # Extract the first word of "egrep" to use in msg output
3.4488 +-if test -z "$EGREP"; then
3.4489 +-set dummy egrep; ac_prog_name=$2
3.4490 +-if test "${ac_cv_path_EGREP+set}" = set; then
3.4491 +- echo $ECHO_N "(cached) $ECHO_C" >&6
3.4492 +-else
3.4493 ++ if test -z "$EGREP"; then
3.4494 + ac_path_EGREP_found=false
3.4495 +-# Loop through the user's path and test for each of PROGNAME-LIST
3.4496 +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3.4497 ++ # Loop through the user's path and test for each of PROGNAME-LIST
3.4498 ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3.4499 + for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
3.4500 + do
3.4501 + IFS=$as_save_IFS
3.4502 + test -z "$as_dir" && as_dir=.
3.4503 + for ac_prog in egrep; do
3.4504 +- for ac_exec_ext in '' $ac_executable_extensions; do
3.4505 +- ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
3.4506 +- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
3.4507 +- # Check for GNU ac_path_EGREP and select it if it is found.
3.4508 ++ for ac_exec_ext in '' $ac_executable_extensions; do
3.4509 ++ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
3.4510 ++ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
3.4511 ++# Check for GNU ac_path_EGREP and select it if it is found.
3.4512 + # Check for GNU $ac_path_EGREP
3.4513 + case `"$ac_path_EGREP" --version 2>&1` in
3.4514 + *GNU*)
3.4515 + ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
3.4516 + *)
3.4517 + ac_count=0
3.4518 +- echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
3.4519 ++ $as_echo_n 0123456789 >"conftest.in"
3.4520 + while :
3.4521 + do
3.4522 + cat "conftest.in" "conftest.in" >"conftest.tmp"
3.4523 + mv "conftest.tmp" "conftest.in"
3.4524 + cp "conftest.in" "conftest.nl"
3.4525 +- echo 'EGREP' >> "conftest.nl"
3.4526 ++ $as_echo 'EGREP' >> "conftest.nl"
3.4527 + "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
3.4528 + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
3.4529 + ac_count=`expr $ac_count + 1`
3.4530 +@@ -4070,33 +4216,24 @@
3.4531 + rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
3.4532 + esac
3.4533 +
3.4534 +-
3.4535 +- $ac_path_EGREP_found && break 3
3.4536 +- done
3.4537 +-done
3.4538 +-
3.4539 +-done
3.4540 +-IFS=$as_save_IFS
3.4541 +-
3.4542 +-
3.4543 +-fi
3.4544 +-
3.4545 +-EGREP="$ac_cv_path_EGREP"
3.4546 +-if test -z "$EGREP"; then
3.4547 +- { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
3.4548 +-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
3.4549 +- { (exit 1); exit 1; }; }
3.4550 +-fi
3.4551 +-
3.4552 ++ $ac_path_EGREP_found && break 3
3.4553 ++ done
3.4554 ++ done
3.4555 ++done
3.4556 ++IFS=$as_save_IFS
3.4557 ++ if test -z "$ac_cv_path_EGREP"; then
3.4558 ++ { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
3.4559 ++$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
3.4560 ++ { (exit 1); exit 1; }; }
3.4561 ++ fi
3.4562 + else
3.4563 + ac_cv_path_EGREP=$EGREP
3.4564 + fi
3.4565 +
3.4566 +-
3.4567 + fi
3.4568 + fi
3.4569 +-{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
3.4570 +-echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
3.4571 ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
3.4572 ++$as_echo "$ac_cv_path_EGREP" >&6; }
3.4573 + EGREP="$ac_cv_path_EGREP"
3.4574 +
3.4575 +
3.4576 +@@ -4113,11 +4250,11 @@
3.4577 + for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
3.4578 + inttypes.h stdint.h unistd.h
3.4579 + do
3.4580 +-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
3.4581 +-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
3.4582 +-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
3.4583 ++as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
3.4584 ++{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
3.4585 ++$as_echo_n "checking for $ac_header... " >&6; }
3.4586 + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
3.4587 +- echo $ECHO_N "(cached) $ECHO_C" >&6
3.4588 ++ $as_echo_n "(cached) " >&6
3.4589 + else
3.4590 + cat >conftest.$ac_ext <<_ACEOF
3.4591 + /* confdefs.h. */
3.4592 +@@ -4135,20 +4272,21 @@
3.4593 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.4594 + *) ac_try_echo=$ac_try;;
3.4595 + esac
3.4596 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.4597 +- (eval "$ac_compile") 2>conftest.er1
3.4598 +- ac_status=$?
3.4599 +- grep -v '^ *+' conftest.er1 >conftest.err
3.4600 +- rm -f conftest.er1
3.4601 +- cat conftest.err >&5
3.4602 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.4603 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.4604 ++$as_echo "$ac_try_echo") >&5
3.4605 ++ (eval "$ac_compile") 2>conftest.er1
3.4606 ++ ac_status=$?
3.4607 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.4608 ++ rm -f conftest.er1
3.4609 ++ cat conftest.err >&5
3.4610 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.4611 + (exit $ac_status); } && {
3.4612 + test -z "$ac_c_werror_flag" ||
3.4613 + test ! -s conftest.err
3.4614 + } && test -s conftest.$ac_objext; then
3.4615 + eval "$as_ac_Header=yes"
3.4616 + else
3.4617 +- echo "$as_me: failed program was:" >&5
3.4618 ++ $as_echo "$as_me: failed program was:" >&5
3.4619 + sed 's/^/| /' conftest.$ac_ext >&5
3.4620 +
3.4621 + eval "$as_ac_Header=no"
3.4622 +@@ -4156,12 +4294,15 @@
3.4623 +
3.4624 + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3.4625 + fi
3.4626 +-ac_res=`eval echo '${'$as_ac_Header'}'`
3.4627 +- { echo "$as_me:$LINENO: result: $ac_res" >&5
3.4628 +-echo "${ECHO_T}$ac_res" >&6; }
3.4629 +-if test `eval echo '${'$as_ac_Header'}'` = yes; then
3.4630 ++ac_res=`eval 'as_val=${'$as_ac_Header'}
3.4631 ++ $as_echo "$as_val"'`
3.4632 ++ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
3.4633 ++$as_echo "$ac_res" >&6; }
3.4634 ++as_val=`eval 'as_val=${'$as_ac_Header'}
3.4635 ++ $as_echo "$as_val"'`
3.4636 ++ if test "x$as_val" = x""yes; then
3.4637 + cat >>confdefs.h <<_ACEOF
3.4638 +-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
3.4639 ++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
3.4640 + _ACEOF
3.4641 +
3.4642 + fi
3.4643 +@@ -4175,10 +4316,10 @@
3.4644 + do
3.4645 + # Extract the first word of "$ac_prog", so it can be a program name with args.
3.4646 + set dummy $ac_prog; ac_word=$2
3.4647 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
3.4648 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
3.4649 ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
3.4650 ++$as_echo_n "checking for $ac_word... " >&6; }
3.4651 + if test "${ac_cv_prog_AWK+set}" = set; then
3.4652 +- echo $ECHO_N "(cached) $ECHO_C" >&6
3.4653 ++ $as_echo_n "(cached) " >&6
3.4654 + else
3.4655 + if test -n "$AWK"; then
3.4656 + ac_cv_prog_AWK="$AWK" # Let the user override the test.
3.4657 +@@ -4191,7 +4332,7 @@
3.4658 + for ac_exec_ext in '' $ac_executable_extensions; do
3.4659 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3.4660 + ac_cv_prog_AWK="$ac_prog"
3.4661 +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3.4662 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3.4663 + break 2
3.4664 + fi
3.4665 + done
3.4666 +@@ -4202,11 +4343,11 @@
3.4667 + fi
3.4668 + AWK=$ac_cv_prog_AWK
3.4669 + if test -n "$AWK"; then
3.4670 +- { echo "$as_me:$LINENO: result: $AWK" >&5
3.4671 +-echo "${ECHO_T}$AWK" >&6; }
3.4672 +-else
3.4673 +- { echo "$as_me:$LINENO: result: no" >&5
3.4674 +-echo "${ECHO_T}no" >&6; }
3.4675 ++ { $as_echo "$as_me:$LINENO: result: $AWK" >&5
3.4676 ++$as_echo "$AWK" >&6; }
3.4677 ++else
3.4678 ++ { $as_echo "$as_me:$LINENO: result: no" >&5
3.4679 ++$as_echo "no" >&6; }
3.4680 + fi
3.4681 +
3.4682 +
3.4683 +@@ -4226,11 +4367,12 @@
3.4684 + # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
3.4685 + # OS/2's system install, which has a completely different semantic
3.4686 + # ./install, which can be erroneously created by make from ./install.sh.
3.4687 +-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
3.4688 +-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
3.4689 ++# Reject install programs that cannot install multiple files.
3.4690 ++{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
3.4691 ++$as_echo_n "checking for a BSD-compatible install... " >&6; }
3.4692 + if test -z "$INSTALL"; then
3.4693 + if test "${ac_cv_path_install+set}" = set; then
3.4694 +- echo $ECHO_N "(cached) $ECHO_C" >&6
3.4695 ++ $as_echo_n "(cached) " >&6
3.4696 + else
3.4697 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3.4698 + for as_dir in $PATH
3.4699 +@@ -4259,17 +4401,29 @@
3.4700 + # program-specific install script used by HP pwplus--don't use.
3.4701 + :
3.4702 + else
3.4703 +- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
3.4704 +- break 3
3.4705 ++ rm -rf conftest.one conftest.two conftest.dir
3.4706 ++ echo one > conftest.one
3.4707 ++ echo two > conftest.two
3.4708 ++ mkdir conftest.dir
3.4709 ++ if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
3.4710 ++ test -s conftest.one && test -s conftest.two &&
3.4711 ++ test -s conftest.dir/conftest.one &&
3.4712 ++ test -s conftest.dir/conftest.two
3.4713 ++ then
3.4714 ++ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
3.4715 ++ break 3
3.4716 ++ fi
3.4717 + fi
3.4718 + fi
3.4719 + done
3.4720 + done
3.4721 + ;;
3.4722 + esac
3.4723 +-done
3.4724 +-IFS=$as_save_IFS
3.4725 +-
3.4726 ++
3.4727 ++done
3.4728 ++IFS=$as_save_IFS
3.4729 ++
3.4730 ++rm -rf conftest.one conftest.two conftest.dir
3.4731 +
3.4732 + fi
3.4733 + if test "${ac_cv_path_install+set}" = set; then
3.4734 +@@ -4282,8 +4436,8 @@
3.4735 + INSTALL=$ac_install_sh
3.4736 + fi
3.4737 + fi
3.4738 +-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
3.4739 +-echo "${ECHO_T}$INSTALL" >&6; }
3.4740 ++{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
3.4741 ++$as_echo "$INSTALL" >&6; }
3.4742 +
3.4743 + # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
3.4744 + # It thinks the first close brace ends the variable substitution.
3.4745 +@@ -4293,11 +4447,12 @@
3.4746 +
3.4747 + test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
3.4748 +
3.4749 +- { echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
3.4750 +-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
3.4751 +-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
3.4752 ++ { $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
3.4753 ++$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
3.4754 ++set x ${MAKE-make}
3.4755 ++ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
3.4756 + if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
3.4757 +- echo $ECHO_N "(cached) $ECHO_C" >&6
3.4758 ++ $as_echo_n "(cached) " >&6
3.4759 + else
3.4760 + cat >conftest.make <<\_ACEOF
3.4761 + SHELL = /bin/sh
3.4762 +@@ -4314,22 +4469,22 @@
3.4763 + rm -f conftest.make
3.4764 + fi
3.4765 + if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
3.4766 +- { echo "$as_me:$LINENO: result: yes" >&5
3.4767 +-echo "${ECHO_T}yes" >&6; }
3.4768 ++ { $as_echo "$as_me:$LINENO: result: yes" >&5
3.4769 ++$as_echo "yes" >&6; }
3.4770 + SET_MAKE=
3.4771 + else
3.4772 +- { echo "$as_me:$LINENO: result: no" >&5
3.4773 +-echo "${ECHO_T}no" >&6; }
3.4774 ++ { $as_echo "$as_me:$LINENO: result: no" >&5
3.4775 ++$as_echo "no" >&6; }
3.4776 + SET_MAKE="MAKE=${MAKE-make}"
3.4777 + fi
3.4778 +
3.4779 + if test -n "$ac_tool_prefix"; then
3.4780 + # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
3.4781 + set dummy ${ac_tool_prefix}ranlib; ac_word=$2
3.4782 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
3.4783 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
3.4784 ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
3.4785 ++$as_echo_n "checking for $ac_word... " >&6; }
3.4786 + if test "${ac_cv_prog_RANLIB+set}" = set; then
3.4787 +- echo $ECHO_N "(cached) $ECHO_C" >&6
3.4788 ++ $as_echo_n "(cached) " >&6
3.4789 + else
3.4790 + if test -n "$RANLIB"; then
3.4791 + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
3.4792 +@@ -4342,7 +4497,7 @@
3.4793 + for ac_exec_ext in '' $ac_executable_extensions; do
3.4794 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3.4795 + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
3.4796 +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3.4797 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3.4798 + break 2
3.4799 + fi
3.4800 + done
3.4801 +@@ -4353,11 +4508,11 @@
3.4802 + fi
3.4803 + RANLIB=$ac_cv_prog_RANLIB
3.4804 + if test -n "$RANLIB"; then
3.4805 +- { echo "$as_me:$LINENO: result: $RANLIB" >&5
3.4806 +-echo "${ECHO_T}$RANLIB" >&6; }
3.4807 +-else
3.4808 +- { echo "$as_me:$LINENO: result: no" >&5
3.4809 +-echo "${ECHO_T}no" >&6; }
3.4810 ++ { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
3.4811 ++$as_echo "$RANLIB" >&6; }
3.4812 ++else
3.4813 ++ { $as_echo "$as_me:$LINENO: result: no" >&5
3.4814 ++$as_echo "no" >&6; }
3.4815 + fi
3.4816 +
3.4817 +
3.4818 +@@ -4366,10 +4521,10 @@
3.4819 + ac_ct_RANLIB=$RANLIB
3.4820 + # Extract the first word of "ranlib", so it can be a program name with args.
3.4821 + set dummy ranlib; ac_word=$2
3.4822 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
3.4823 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
3.4824 ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
3.4825 ++$as_echo_n "checking for $ac_word... " >&6; }
3.4826 + if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
3.4827 +- echo $ECHO_N "(cached) $ECHO_C" >&6
3.4828 ++ $as_echo_n "(cached) " >&6
3.4829 + else
3.4830 + if test -n "$ac_ct_RANLIB"; then
3.4831 + ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
3.4832 +@@ -4382,7 +4537,7 @@
3.4833 + for ac_exec_ext in '' $ac_executable_extensions; do
3.4834 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3.4835 + ac_cv_prog_ac_ct_RANLIB="ranlib"
3.4836 +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3.4837 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3.4838 + break 2
3.4839 + fi
3.4840 + done
3.4841 +@@ -4393,11 +4548,11 @@
3.4842 + fi
3.4843 + ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
3.4844 + if test -n "$ac_ct_RANLIB"; then
3.4845 +- { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
3.4846 +-echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
3.4847 +-else
3.4848 +- { echo "$as_me:$LINENO: result: no" >&5
3.4849 +-echo "${ECHO_T}no" >&6; }
3.4850 ++ { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
3.4851 ++$as_echo "$ac_ct_RANLIB" >&6; }
3.4852 ++else
3.4853 ++ { $as_echo "$as_me:$LINENO: result: no" >&5
3.4854 ++$as_echo "no" >&6; }
3.4855 + fi
3.4856 +
3.4857 + if test "x$ac_ct_RANLIB" = x; then
3.4858 +@@ -4405,12 +4560,8 @@
3.4859 + else
3.4860 + case $cross_compiling:$ac_tool_warned in
3.4861 + yes:)
3.4862 +-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
3.4863 +-whose name does not start with the host triplet. If you think this
3.4864 +-configuration is useful to you, please write to autoconf@gnu.org." >&5
3.4865 +-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
3.4866 +-whose name does not start with the host triplet. If you think this
3.4867 +-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
3.4868 ++{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
3.4869 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
3.4870 + ac_tool_warned=yes ;;
3.4871 + esac
3.4872 + RANLIB=$ac_ct_RANLIB
3.4873 +@@ -4431,10 +4582,10 @@
3.4874 + LIBS=
3.4875 +
3.4876 +
3.4877 +- { echo "$as_me:$LINENO: checking for library containing pthread_create" >&5
3.4878 +-echo $ECHO_N "checking for library containing pthread_create... $ECHO_C" >&6; }
3.4879 ++ { $as_echo "$as_me:$LINENO: checking for library containing pthread_create" >&5
3.4880 ++$as_echo_n "checking for library containing pthread_create... " >&6; }
3.4881 + if test "${ac_cv_search_pthread_create+set}" = set; then
3.4882 +- echo $ECHO_N "(cached) $ECHO_C" >&6
3.4883 ++ $as_echo_n "(cached) " >&6
3.4884 + else
3.4885 + ac_func_search_save_LIBS=$LIBS
3.4886 + cat >conftest.$ac_ext <<_ACEOF
3.4887 +@@ -4472,26 +4623,30 @@
3.4888 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.4889 + *) ac_try_echo=$ac_try;;
3.4890 + esac
3.4891 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.4892 +- (eval "$ac_link") 2>conftest.er1
3.4893 +- ac_status=$?
3.4894 +- grep -v '^ *+' conftest.er1 >conftest.err
3.4895 +- rm -f conftest.er1
3.4896 +- cat conftest.err >&5
3.4897 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.4898 +- (exit $ac_status); } && {
3.4899 +- test -z "$ac_c_werror_flag" ||
3.4900 +- test ! -s conftest.err
3.4901 +- } && test -s conftest$ac_exeext &&
3.4902 +- $as_test_x conftest$ac_exeext; then
3.4903 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.4904 ++$as_echo "$ac_try_echo") >&5
3.4905 ++ (eval "$ac_link") 2>conftest.er1
3.4906 ++ ac_status=$?
3.4907 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.4908 ++ rm -f conftest.er1
3.4909 ++ cat conftest.err >&5
3.4910 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.4911 ++ (exit $ac_status); } && {
3.4912 ++ test -z "$ac_c_werror_flag" ||
3.4913 ++ test ! -s conftest.err
3.4914 ++ } && test -s conftest$ac_exeext && {
3.4915 ++ test "$cross_compiling" = yes ||
3.4916 ++ $as_test_x conftest$ac_exeext
3.4917 ++ }; then
3.4918 + ac_cv_search_pthread_create=$ac_res
3.4919 + else
3.4920 +- echo "$as_me: failed program was:" >&5
3.4921 +-sed 's/^/| /' conftest.$ac_ext >&5
3.4922 +-
3.4923 +-
3.4924 +-fi
3.4925 +-
3.4926 ++ $as_echo "$as_me: failed program was:" >&5
3.4927 ++sed 's/^/| /' conftest.$ac_ext >&5
3.4928 ++
3.4929 ++
3.4930 ++fi
3.4931 ++
3.4932 ++rm -rf conftest.dSYM
3.4933 + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
3.4934 + conftest$ac_exeext
3.4935 + if test "${ac_cv_search_pthread_create+set}" = set; then
3.4936 +@@ -4506,46 +4661,31 @@
3.4937 + rm conftest.$ac_ext
3.4938 + LIBS=$ac_func_search_save_LIBS
3.4939 + fi
3.4940 +-{ echo "$as_me:$LINENO: result: $ac_cv_search_pthread_create" >&5
3.4941 +-echo "${ECHO_T}$ac_cv_search_pthread_create" >&6; }
3.4942 ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_pthread_create" >&5
3.4943 ++$as_echo "$ac_cv_search_pthread_create" >&6; }
3.4944 + ac_res=$ac_cv_search_pthread_create
3.4945 + if test "$ac_res" != no; then
3.4946 + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
3.4947 +
3.4948 + else
3.4949 +- { { echo "$as_me:$LINENO: error: can't find required library function (pthread_create)" >&5
3.4950 +-echo "$as_me: error: can't find required library function (pthread_create)" >&2;}
3.4951 +- { (exit 1); exit 1; }; }
3.4952 +-fi
3.4953 +-
3.4954 +-
3.4955 +- { echo "$as_me:$LINENO: checking for pthread_yield" >&5
3.4956 +-echo $ECHO_N "checking for pthread_yield... $ECHO_C" >&6; }
3.4957 +-if test "${ac_cv_func_pthread_yield+set}" = set; then
3.4958 +- echo $ECHO_N "(cached) $ECHO_C" >&6
3.4959 +-else
3.4960 +- cat >conftest.$ac_ext <<_ACEOF
3.4961 +-/* confdefs.h. */
3.4962 +-_ACEOF
3.4963 +-cat confdefs.h >>conftest.$ac_ext
3.4964 +-cat >>conftest.$ac_ext <<_ACEOF
3.4965 +-/* end confdefs.h. */
3.4966 +-/* Define pthread_yield to an innocuous variant, in case <limits.h> declares pthread_yield.
3.4967 +- For example, HP-UX 11i <limits.h> declares gettimeofday. */
3.4968 +-#define pthread_yield innocuous_pthread_yield
3.4969 +-
3.4970 +-/* System header to define __stub macros and hopefully few prototypes,
3.4971 +- which can conflict with char pthread_yield (); below.
3.4972 +- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
3.4973 +- <limits.h> exists even on freestanding compilers. */
3.4974 +-
3.4975 +-#ifdef __STDC__
3.4976 +-# include <limits.h>
3.4977 +-#else
3.4978 +-# include <assert.h>
3.4979 +-#endif
3.4980 +-
3.4981 +-#undef pthread_yield
3.4982 ++ { { $as_echo "$as_me:$LINENO: error: can't find required library function (pthread_create)" >&5
3.4983 ++$as_echo "$as_me: error: can't find required library function (pthread_create)" >&2;}
3.4984 ++ { (exit 1); exit 1; }; }
3.4985 ++fi
3.4986 ++
3.4987 ++
3.4988 ++ { $as_echo "$as_me:$LINENO: checking for library containing pthread_yield" >&5
3.4989 ++$as_echo_n "checking for library containing pthread_yield... " >&6; }
3.4990 ++if test "${ac_cv_search_pthread_yield+set}" = set; then
3.4991 ++ $as_echo_n "(cached) " >&6
3.4992 ++else
3.4993 ++ ac_func_search_save_LIBS=$LIBS
3.4994 ++cat >conftest.$ac_ext <<_ACEOF
3.4995 ++/* confdefs.h. */
3.4996 ++_ACEOF
3.4997 ++cat confdefs.h >>conftest.$ac_ext
3.4998 ++cat >>conftest.$ac_ext <<_ACEOF
3.4999 ++/* end confdefs.h. */
3.5000 +
3.5001 + /* Override any GCC internal prototype to avoid an error.
3.5002 + Use char because int might match the return type of a GCC
3.5003 +@@ -4554,13 +4694,6 @@
3.5004 + extern "C"
3.5005 + #endif
3.5006 + char pthread_yield ();
3.5007 +-/* The GNU C library defines this for functions which it implements
3.5008 +- to always fail with ENOSYS. Some functions are actually named
3.5009 +- something starting with __ and the normal name is an alias. */
3.5010 +-#if defined __stub_pthread_yield || defined __stub___pthread_yield
3.5011 +-choke me
3.5012 +-#endif
3.5013 +-
3.5014 + int
3.5015 + main ()
3.5016 + {
3.5017 +@@ -4569,44 +4702,74 @@
3.5018 + return 0;
3.5019 + }
3.5020 + _ACEOF
3.5021 +-rm -f conftest.$ac_objext conftest$ac_exeext
3.5022 +-if { (ac_try="$ac_link"
3.5023 +-case "(($ac_try" in
3.5024 +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.5025 +- *) ac_try_echo=$ac_try;;
3.5026 +-esac
3.5027 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.5028 +- (eval "$ac_link") 2>conftest.er1
3.5029 +- ac_status=$?
3.5030 +- grep -v '^ *+' conftest.er1 >conftest.err
3.5031 +- rm -f conftest.er1
3.5032 +- cat conftest.err >&5
3.5033 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.5034 +- (exit $ac_status); } && {
3.5035 +- test -z "$ac_c_werror_flag" ||
3.5036 +- test ! -s conftest.err
3.5037 +- } && test -s conftest$ac_exeext &&
3.5038 +- $as_test_x conftest$ac_exeext; then
3.5039 +- ac_cv_func_pthread_yield=yes
3.5040 +-else
3.5041 +- echo "$as_me: failed program was:" >&5
3.5042 +-sed 's/^/| /' conftest.$ac_ext >&5
3.5043 +-
3.5044 +- ac_cv_func_pthread_yield=no
3.5045 +-fi
3.5046 +-
3.5047 +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
3.5048 +- conftest$ac_exeext conftest.$ac_ext
3.5049 +-fi
3.5050 +-{ echo "$as_me:$LINENO: result: $ac_cv_func_pthread_yield" >&5
3.5051 +-echo "${ECHO_T}$ac_cv_func_pthread_yield" >&6; }
3.5052 +-if test $ac_cv_func_pthread_yield = yes; then
3.5053 +- :
3.5054 +-else
3.5055 +- { echo "$as_me:$LINENO: checking for library containing sched_yield" >&5
3.5056 +-echo $ECHO_N "checking for library containing sched_yield... $ECHO_C" >&6; }
3.5057 ++for ac_lib in '' rt pthread; do
3.5058 ++ if test -z "$ac_lib"; then
3.5059 ++ ac_res="none required"
3.5060 ++ else
3.5061 ++ ac_res=-l$ac_lib
3.5062 ++ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
3.5063 ++ fi
3.5064 ++ rm -f conftest.$ac_objext conftest$ac_exeext
3.5065 ++if { (ac_try="$ac_link"
3.5066 ++case "(($ac_try" in
3.5067 ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.5068 ++ *) ac_try_echo=$ac_try;;
3.5069 ++esac
3.5070 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.5071 ++$as_echo "$ac_try_echo") >&5
3.5072 ++ (eval "$ac_link") 2>conftest.er1
3.5073 ++ ac_status=$?
3.5074 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.5075 ++ rm -f conftest.er1
3.5076 ++ cat conftest.err >&5
3.5077 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.5078 ++ (exit $ac_status); } && {
3.5079 ++ test -z "$ac_c_werror_flag" ||
3.5080 ++ test ! -s conftest.err
3.5081 ++ } && test -s conftest$ac_exeext && {
3.5082 ++ test "$cross_compiling" = yes ||
3.5083 ++ $as_test_x conftest$ac_exeext
3.5084 ++ }; then
3.5085 ++ ac_cv_search_pthread_yield=$ac_res
3.5086 ++else
3.5087 ++ $as_echo "$as_me: failed program was:" >&5
3.5088 ++sed 's/^/| /' conftest.$ac_ext >&5
3.5089 ++
3.5090 ++
3.5091 ++fi
3.5092 ++
3.5093 ++rm -rf conftest.dSYM
3.5094 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
3.5095 ++ conftest$ac_exeext
3.5096 ++ if test "${ac_cv_search_pthread_yield+set}" = set; then
3.5097 ++ break
3.5098 ++fi
3.5099 ++done
3.5100 ++if test "${ac_cv_search_pthread_yield+set}" = set; then
3.5101 ++ :
3.5102 ++else
3.5103 ++ ac_cv_search_pthread_yield=no
3.5104 ++fi
3.5105 ++rm conftest.$ac_ext
3.5106 ++LIBS=$ac_func_search_save_LIBS
3.5107 ++fi
3.5108 ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_pthread_yield" >&5
3.5109 ++$as_echo "$ac_cv_search_pthread_yield" >&6; }
3.5110 ++ac_res=$ac_cv_search_pthread_yield
3.5111 ++if test "$ac_res" != no; then
3.5112 ++ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
3.5113 ++
3.5114 ++cat >>confdefs.h <<_ACEOF
3.5115 ++#define HAVE_PTHREAD_YIELD 1
3.5116 ++_ACEOF
3.5117 ++
3.5118 ++fi
3.5119 ++
3.5120 ++
3.5121 ++ { $as_echo "$as_me:$LINENO: checking for library containing sched_yield" >&5
3.5122 ++$as_echo_n "checking for library containing sched_yield... " >&6; }
3.5123 + if test "${ac_cv_search_sched_yield+set}" = set; then
3.5124 +- echo $ECHO_N "(cached) $ECHO_C" >&6
3.5125 ++ $as_echo_n "(cached) " >&6
3.5126 + else
3.5127 + ac_func_search_save_LIBS=$LIBS
3.5128 + cat >conftest.$ac_ext <<_ACEOF
3.5129 +@@ -4644,26 +4807,30 @@
3.5130 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.5131 + *) ac_try_echo=$ac_try;;
3.5132 + esac
3.5133 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.5134 +- (eval "$ac_link") 2>conftest.er1
3.5135 +- ac_status=$?
3.5136 +- grep -v '^ *+' conftest.er1 >conftest.err
3.5137 +- rm -f conftest.er1
3.5138 +- cat conftest.err >&5
3.5139 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.5140 +- (exit $ac_status); } && {
3.5141 +- test -z "$ac_c_werror_flag" ||
3.5142 +- test ! -s conftest.err
3.5143 +- } && test -s conftest$ac_exeext &&
3.5144 +- $as_test_x conftest$ac_exeext; then
3.5145 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.5146 ++$as_echo "$ac_try_echo") >&5
3.5147 ++ (eval "$ac_link") 2>conftest.er1
3.5148 ++ ac_status=$?
3.5149 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.5150 ++ rm -f conftest.er1
3.5151 ++ cat conftest.err >&5
3.5152 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.5153 ++ (exit $ac_status); } && {
3.5154 ++ test -z "$ac_c_werror_flag" ||
3.5155 ++ test ! -s conftest.err
3.5156 ++ } && test -s conftest$ac_exeext && {
3.5157 ++ test "$cross_compiling" = yes ||
3.5158 ++ $as_test_x conftest$ac_exeext
3.5159 ++ }; then
3.5160 + ac_cv_search_sched_yield=$ac_res
3.5161 + else
3.5162 +- echo "$as_me: failed program was:" >&5
3.5163 +-sed 's/^/| /' conftest.$ac_ext >&5
3.5164 +-
3.5165 +-
3.5166 +-fi
3.5167 +-
3.5168 ++ $as_echo "$as_me: failed program was:" >&5
3.5169 ++sed 's/^/| /' conftest.$ac_ext >&5
3.5170 ++
3.5171 ++
3.5172 ++fi
3.5173 ++
3.5174 ++rm -rf conftest.dSYM
3.5175 + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
3.5176 + conftest$ac_exeext
3.5177 + if test "${ac_cv_search_sched_yield+set}" = set; then
3.5178 +@@ -4678,25 +4845,23 @@
3.5179 + rm conftest.$ac_ext
3.5180 + LIBS=$ac_func_search_save_LIBS
3.5181 + fi
3.5182 +-{ echo "$as_me:$LINENO: result: $ac_cv_search_sched_yield" >&5
3.5183 +-echo "${ECHO_T}$ac_cv_search_sched_yield" >&6; }
3.5184 ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_sched_yield" >&5
3.5185 ++$as_echo "$ac_cv_search_sched_yield" >&6; }
3.5186 + ac_res=$ac_cv_search_sched_yield
3.5187 + if test "$ac_res" != no; then
3.5188 + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
3.5189 +
3.5190 +-else
3.5191 +- { { echo "$as_me:$LINENO: error: can't find required library function (pthread_yield or sched_yield)" >&5
3.5192 +-echo "$as_me: error: can't find required library function (pthread_yield or sched_yield)" >&2;}
3.5193 +- { (exit 1); exit 1; }; }
3.5194 +-fi
3.5195 +-
3.5196 +-fi
3.5197 +-
3.5198 +-
3.5199 +- { echo "$as_me:$LINENO: checking for library containing pthread_setspecific" >&5
3.5200 +-echo $ECHO_N "checking for library containing pthread_setspecific... $ECHO_C" >&6; }
3.5201 ++cat >>confdefs.h <<_ACEOF
3.5202 ++#define HAVE_SCHED_YIELD 1
3.5203 ++_ACEOF
3.5204 ++
3.5205 ++fi
3.5206 ++
3.5207 ++
3.5208 ++ { $as_echo "$as_me:$LINENO: checking for library containing pthread_setspecific" >&5
3.5209 ++$as_echo_n "checking for library containing pthread_setspecific... " >&6; }
3.5210 + if test "${ac_cv_search_pthread_setspecific+set}" = set; then
3.5211 +- echo $ECHO_N "(cached) $ECHO_C" >&6
3.5212 ++ $as_echo_n "(cached) " >&6
3.5213 + else
3.5214 + ac_func_search_save_LIBS=$LIBS
3.5215 + cat >conftest.$ac_ext <<_ACEOF
3.5216 +@@ -4734,26 +4899,30 @@
3.5217 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.5218 + *) ac_try_echo=$ac_try;;
3.5219 + esac
3.5220 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.5221 +- (eval "$ac_link") 2>conftest.er1
3.5222 +- ac_status=$?
3.5223 +- grep -v '^ *+' conftest.er1 >conftest.err
3.5224 +- rm -f conftest.er1
3.5225 +- cat conftest.err >&5
3.5226 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.5227 +- (exit $ac_status); } && {
3.5228 +- test -z "$ac_c_werror_flag" ||
3.5229 +- test ! -s conftest.err
3.5230 +- } && test -s conftest$ac_exeext &&
3.5231 +- $as_test_x conftest$ac_exeext; then
3.5232 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.5233 ++$as_echo "$ac_try_echo") >&5
3.5234 ++ (eval "$ac_link") 2>conftest.er1
3.5235 ++ ac_status=$?
3.5236 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.5237 ++ rm -f conftest.er1
3.5238 ++ cat conftest.err >&5
3.5239 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.5240 ++ (exit $ac_status); } && {
3.5241 ++ test -z "$ac_c_werror_flag" ||
3.5242 ++ test ! -s conftest.err
3.5243 ++ } && test -s conftest$ac_exeext && {
3.5244 ++ test "$cross_compiling" = yes ||
3.5245 ++ $as_test_x conftest$ac_exeext
3.5246 ++ }; then
3.5247 + ac_cv_search_pthread_setspecific=$ac_res
3.5248 + else
3.5249 +- echo "$as_me: failed program was:" >&5
3.5250 +-sed 's/^/| /' conftest.$ac_ext >&5
3.5251 +-
3.5252 +-
3.5253 +-fi
3.5254 +-
3.5255 ++ $as_echo "$as_me: failed program was:" >&5
3.5256 ++sed 's/^/| /' conftest.$ac_ext >&5
3.5257 ++
3.5258 ++
3.5259 ++fi
3.5260 ++
3.5261 ++rm -rf conftest.dSYM
3.5262 + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
3.5263 + conftest$ac_exeext
3.5264 + if test "${ac_cv_search_pthread_setspecific+set}" = set; then
3.5265 +@@ -4768,8 +4937,8 @@
3.5266 + rm conftest.$ac_ext
3.5267 + LIBS=$ac_func_search_save_LIBS
3.5268 + fi
3.5269 +-{ echo "$as_me:$LINENO: result: $ac_cv_search_pthread_setspecific" >&5
3.5270 +-echo "${ECHO_T}$ac_cv_search_pthread_setspecific" >&6; }
3.5271 ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_pthread_setspecific" >&5
3.5272 ++$as_echo "$ac_cv_search_pthread_setspecific" >&6; }
3.5273 + ac_res=$ac_cv_search_pthread_setspecific
3.5274 + if test "$ac_res" != no; then
3.5275 + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
3.5276 +@@ -4781,10 +4950,10 @@
3.5277 + fi
3.5278 +
3.5279 +
3.5280 +- { echo "$as_me:$LINENO: checking for library containing socket" >&5
3.5281 +-echo $ECHO_N "checking for library containing socket... $ECHO_C" >&6; }
3.5282 ++ { $as_echo "$as_me:$LINENO: checking for library containing socket" >&5
3.5283 ++$as_echo_n "checking for library containing socket... " >&6; }
3.5284 + if test "${ac_cv_search_socket+set}" = set; then
3.5285 +- echo $ECHO_N "(cached) $ECHO_C" >&6
3.5286 ++ $as_echo_n "(cached) " >&6
3.5287 + else
3.5288 + ac_func_search_save_LIBS=$LIBS
3.5289 + cat >conftest.$ac_ext <<_ACEOF
3.5290 +@@ -4822,26 +4991,30 @@
3.5291 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.5292 + *) ac_try_echo=$ac_try;;
3.5293 + esac
3.5294 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.5295 +- (eval "$ac_link") 2>conftest.er1
3.5296 +- ac_status=$?
3.5297 +- grep -v '^ *+' conftest.er1 >conftest.err
3.5298 +- rm -f conftest.er1
3.5299 +- cat conftest.err >&5
3.5300 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.5301 +- (exit $ac_status); } && {
3.5302 +- test -z "$ac_c_werror_flag" ||
3.5303 +- test ! -s conftest.err
3.5304 +- } && test -s conftest$ac_exeext &&
3.5305 +- $as_test_x conftest$ac_exeext; then
3.5306 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.5307 ++$as_echo "$ac_try_echo") >&5
3.5308 ++ (eval "$ac_link") 2>conftest.er1
3.5309 ++ ac_status=$?
3.5310 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.5311 ++ rm -f conftest.er1
3.5312 ++ cat conftest.err >&5
3.5313 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.5314 ++ (exit $ac_status); } && {
3.5315 ++ test -z "$ac_c_werror_flag" ||
3.5316 ++ test ! -s conftest.err
3.5317 ++ } && test -s conftest$ac_exeext && {
3.5318 ++ test "$cross_compiling" = yes ||
3.5319 ++ $as_test_x conftest$ac_exeext
3.5320 ++ }; then
3.5321 + ac_cv_search_socket=$ac_res
3.5322 + else
3.5323 +- echo "$as_me: failed program was:" >&5
3.5324 +-sed 's/^/| /' conftest.$ac_ext >&5
3.5325 +-
3.5326 +-
3.5327 +-fi
3.5328 +-
3.5329 ++ $as_echo "$as_me: failed program was:" >&5
3.5330 ++sed 's/^/| /' conftest.$ac_ext >&5
3.5331 ++
3.5332 ++
3.5333 ++fi
3.5334 ++
3.5335 ++rm -rf conftest.dSYM
3.5336 + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
3.5337 + conftest$ac_exeext
3.5338 + if test "${ac_cv_search_socket+set}" = set; then
3.5339 +@@ -4856,23 +5029,23 @@
3.5340 + rm conftest.$ac_ext
3.5341 + LIBS=$ac_func_search_save_LIBS
3.5342 + fi
3.5343 +-{ echo "$as_me:$LINENO: result: $ac_cv_search_socket" >&5
3.5344 +-echo "${ECHO_T}$ac_cv_search_socket" >&6; }
3.5345 ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_socket" >&5
3.5346 ++$as_echo "$ac_cv_search_socket" >&6; }
3.5347 + ac_res=$ac_cv_search_socket
3.5348 + if test "$ac_res" != no; then
3.5349 + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
3.5350 +
3.5351 + else
3.5352 +- { { echo "$as_me:$LINENO: error: can't find required library function (socket)" >&5
3.5353 +-echo "$as_me: error: can't find required library function (socket)" >&2;}
3.5354 +- { (exit 1); exit 1; }; }
3.5355 +-fi
3.5356 +-
3.5357 +-
3.5358 +- { echo "$as_me:$LINENO: checking for library containing gethostbyname" >&5
3.5359 +-echo $ECHO_N "checking for library containing gethostbyname... $ECHO_C" >&6; }
3.5360 ++ { { $as_echo "$as_me:$LINENO: error: can't find required library function (socket)" >&5
3.5361 ++$as_echo "$as_me: error: can't find required library function (socket)" >&2;}
3.5362 ++ { (exit 1); exit 1; }; }
3.5363 ++fi
3.5364 ++
3.5365 ++
3.5366 ++ { $as_echo "$as_me:$LINENO: checking for library containing gethostbyname" >&5
3.5367 ++$as_echo_n "checking for library containing gethostbyname... " >&6; }
3.5368 + if test "${ac_cv_search_gethostbyname+set}" = set; then
3.5369 +- echo $ECHO_N "(cached) $ECHO_C" >&6
3.5370 ++ $as_echo_n "(cached) " >&6
3.5371 + else
3.5372 + ac_func_search_save_LIBS=$LIBS
3.5373 + cat >conftest.$ac_ext <<_ACEOF
3.5374 +@@ -4897,39 +5070,43 @@
3.5375 + return 0;
3.5376 + }
3.5377 + _ACEOF
3.5378 +-for ac_lib in '' nsl; do
3.5379 +- if test -z "$ac_lib"; then
3.5380 +- ac_res="none required"
3.5381 +- else
3.5382 +- ac_res=-l$ac_lib
3.5383 +- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
3.5384 +- fi
3.5385 +- rm -f conftest.$ac_objext conftest$ac_exeext
3.5386 +-if { (ac_try="$ac_link"
3.5387 +-case "(($ac_try" in
3.5388 +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.5389 +- *) ac_try_echo=$ac_try;;
3.5390 +-esac
3.5391 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.5392 +- (eval "$ac_link") 2>conftest.er1
3.5393 +- ac_status=$?
3.5394 +- grep -v '^ *+' conftest.er1 >conftest.err
3.5395 +- rm -f conftest.er1
3.5396 +- cat conftest.err >&5
3.5397 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.5398 +- (exit $ac_status); } && {
3.5399 +- test -z "$ac_c_werror_flag" ||
3.5400 +- test ! -s conftest.err
3.5401 +- } && test -s conftest$ac_exeext &&
3.5402 +- $as_test_x conftest$ac_exeext; then
3.5403 ++for ac_lib in '' socket nsl xnet; do
3.5404 ++ if test -z "$ac_lib"; then
3.5405 ++ ac_res="none required"
3.5406 ++ else
3.5407 ++ ac_res=-l$ac_lib
3.5408 ++ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
3.5409 ++ fi
3.5410 ++ rm -f conftest.$ac_objext conftest$ac_exeext
3.5411 ++if { (ac_try="$ac_link"
3.5412 ++case "(($ac_try" in
3.5413 ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.5414 ++ *) ac_try_echo=$ac_try;;
3.5415 ++esac
3.5416 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.5417 ++$as_echo "$ac_try_echo") >&5
3.5418 ++ (eval "$ac_link") 2>conftest.er1
3.5419 ++ ac_status=$?
3.5420 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.5421 ++ rm -f conftest.er1
3.5422 ++ cat conftest.err >&5
3.5423 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.5424 ++ (exit $ac_status); } && {
3.5425 ++ test -z "$ac_c_werror_flag" ||
3.5426 ++ test ! -s conftest.err
3.5427 ++ } && test -s conftest$ac_exeext && {
3.5428 ++ test "$cross_compiling" = yes ||
3.5429 ++ $as_test_x conftest$ac_exeext
3.5430 ++ }; then
3.5431 + ac_cv_search_gethostbyname=$ac_res
3.5432 + else
3.5433 +- echo "$as_me: failed program was:" >&5
3.5434 +-sed 's/^/| /' conftest.$ac_ext >&5
3.5435 +-
3.5436 +-
3.5437 +-fi
3.5438 +-
3.5439 ++ $as_echo "$as_me: failed program was:" >&5
3.5440 ++sed 's/^/| /' conftest.$ac_ext >&5
3.5441 ++
3.5442 ++
3.5443 ++fi
3.5444 ++
3.5445 ++rm -rf conftest.dSYM
3.5446 + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
3.5447 + conftest$ac_exeext
3.5448 + if test "${ac_cv_search_gethostbyname+set}" = set; then
3.5449 +@@ -4944,23 +5121,115 @@
3.5450 + rm conftest.$ac_ext
3.5451 + LIBS=$ac_func_search_save_LIBS
3.5452 + fi
3.5453 +-{ echo "$as_me:$LINENO: result: $ac_cv_search_gethostbyname" >&5
3.5454 +-echo "${ECHO_T}$ac_cv_search_gethostbyname" >&6; }
3.5455 ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_gethostbyname" >&5
3.5456 ++$as_echo "$ac_cv_search_gethostbyname" >&6; }
3.5457 + ac_res=$ac_cv_search_gethostbyname
3.5458 + if test "$ac_res" != no; then
3.5459 + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
3.5460 +
3.5461 +-else
3.5462 +- { { echo "$as_me:$LINENO: error: can't find required library function (gethostbyname)" >&5
3.5463 +-echo "$as_me: error: can't find required library function (gethostbyname)" >&2;}
3.5464 +- { (exit 1); exit 1; }; }
3.5465 +-fi
3.5466 +-
3.5467 +-
3.5468 +- { echo "$as_me:$LINENO: checking for library containing xdr_int" >&5
3.5469 +-echo $ECHO_N "checking for library containing xdr_int... $ECHO_C" >&6; }
3.5470 ++cat >>confdefs.h <<_ACEOF
3.5471 ++#define HAVE_GETHOSTBYNAME 1
3.5472 ++_ACEOF
3.5473 ++
3.5474 ++fi
3.5475 ++
3.5476 ++
3.5477 ++ { $as_echo "$as_me:$LINENO: checking for library containing gethostbyname_r" >&5
3.5478 ++$as_echo_n "checking for library containing gethostbyname_r... " >&6; }
3.5479 ++if test "${ac_cv_search_gethostbyname_r+set}" = set; then
3.5480 ++ $as_echo_n "(cached) " >&6
3.5481 ++else
3.5482 ++ ac_func_search_save_LIBS=$LIBS
3.5483 ++cat >conftest.$ac_ext <<_ACEOF
3.5484 ++/* confdefs.h. */
3.5485 ++_ACEOF
3.5486 ++cat confdefs.h >>conftest.$ac_ext
3.5487 ++cat >>conftest.$ac_ext <<_ACEOF
3.5488 ++/* end confdefs.h. */
3.5489 ++
3.5490 ++/* Override any GCC internal prototype to avoid an error.
3.5491 ++ Use char because int might match the return type of a GCC
3.5492 ++ builtin and then its argument prototype would still apply. */
3.5493 ++#ifdef __cplusplus
3.5494 ++extern "C"
3.5495 ++#endif
3.5496 ++char gethostbyname_r ();
3.5497 ++int
3.5498 ++main ()
3.5499 ++{
3.5500 ++return gethostbyname_r ();
3.5501 ++ ;
3.5502 ++ return 0;
3.5503 ++}
3.5504 ++_ACEOF
3.5505 ++for ac_lib in '' socket nsl; do
3.5506 ++ if test -z "$ac_lib"; then
3.5507 ++ ac_res="none required"
3.5508 ++ else
3.5509 ++ ac_res=-l$ac_lib
3.5510 ++ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
3.5511 ++ fi
3.5512 ++ rm -f conftest.$ac_objext conftest$ac_exeext
3.5513 ++if { (ac_try="$ac_link"
3.5514 ++case "(($ac_try" in
3.5515 ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.5516 ++ *) ac_try_echo=$ac_try;;
3.5517 ++esac
3.5518 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.5519 ++$as_echo "$ac_try_echo") >&5
3.5520 ++ (eval "$ac_link") 2>conftest.er1
3.5521 ++ ac_status=$?
3.5522 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.5523 ++ rm -f conftest.er1
3.5524 ++ cat conftest.err >&5
3.5525 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.5526 ++ (exit $ac_status); } && {
3.5527 ++ test -z "$ac_c_werror_flag" ||
3.5528 ++ test ! -s conftest.err
3.5529 ++ } && test -s conftest$ac_exeext && {
3.5530 ++ test "$cross_compiling" = yes ||
3.5531 ++ $as_test_x conftest$ac_exeext
3.5532 ++ }; then
3.5533 ++ ac_cv_search_gethostbyname_r=$ac_res
3.5534 ++else
3.5535 ++ $as_echo "$as_me: failed program was:" >&5
3.5536 ++sed 's/^/| /' conftest.$ac_ext >&5
3.5537 ++
3.5538 ++
3.5539 ++fi
3.5540 ++
3.5541 ++rm -rf conftest.dSYM
3.5542 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
3.5543 ++ conftest$ac_exeext
3.5544 ++ if test "${ac_cv_search_gethostbyname_r+set}" = set; then
3.5545 ++ break
3.5546 ++fi
3.5547 ++done
3.5548 ++if test "${ac_cv_search_gethostbyname_r+set}" = set; then
3.5549 ++ :
3.5550 ++else
3.5551 ++ ac_cv_search_gethostbyname_r=no
3.5552 ++fi
3.5553 ++rm conftest.$ac_ext
3.5554 ++LIBS=$ac_func_search_save_LIBS
3.5555 ++fi
3.5556 ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_gethostbyname_r" >&5
3.5557 ++$as_echo "$ac_cv_search_gethostbyname_r" >&6; }
3.5558 ++ac_res=$ac_cv_search_gethostbyname_r
3.5559 ++if test "$ac_res" != no; then
3.5560 ++ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
3.5561 ++
3.5562 ++cat >>confdefs.h <<_ACEOF
3.5563 ++#define HAVE_GETHOSTBYNAME_R 1
3.5564 ++_ACEOF
3.5565 ++
3.5566 ++fi
3.5567 ++
3.5568 ++
3.5569 ++ { $as_echo "$as_me:$LINENO: checking for library containing xdr_int" >&5
3.5570 ++$as_echo_n "checking for library containing xdr_int... " >&6; }
3.5571 + if test "${ac_cv_search_xdr_int+set}" = set; then
3.5572 +- echo $ECHO_N "(cached) $ECHO_C" >&6
3.5573 ++ $as_echo_n "(cached) " >&6
3.5574 + else
3.5575 + ac_func_search_save_LIBS=$LIBS
3.5576 + cat >conftest.$ac_ext <<_ACEOF
3.5577 +@@ -4998,26 +5267,30 @@
3.5578 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.5579 + *) ac_try_echo=$ac_try;;
3.5580 + esac
3.5581 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.5582 +- (eval "$ac_link") 2>conftest.er1
3.5583 +- ac_status=$?
3.5584 +- grep -v '^ *+' conftest.er1 >conftest.err
3.5585 +- rm -f conftest.er1
3.5586 +- cat conftest.err >&5
3.5587 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.5588 +- (exit $ac_status); } && {
3.5589 +- test -z "$ac_c_werror_flag" ||
3.5590 +- test ! -s conftest.err
3.5591 +- } && test -s conftest$ac_exeext &&
3.5592 +- $as_test_x conftest$ac_exeext; then
3.5593 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.5594 ++$as_echo "$ac_try_echo") >&5
3.5595 ++ (eval "$ac_link") 2>conftest.er1
3.5596 ++ ac_status=$?
3.5597 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.5598 ++ rm -f conftest.er1
3.5599 ++ cat conftest.err >&5
3.5600 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.5601 ++ (exit $ac_status); } && {
3.5602 ++ test -z "$ac_c_werror_flag" ||
3.5603 ++ test ! -s conftest.err
3.5604 ++ } && test -s conftest$ac_exeext && {
3.5605 ++ test "$cross_compiling" = yes ||
3.5606 ++ $as_test_x conftest$ac_exeext
3.5607 ++ }; then
3.5608 + ac_cv_search_xdr_int=$ac_res
3.5609 + else
3.5610 +- echo "$as_me: failed program was:" >&5
3.5611 +-sed 's/^/| /' conftest.$ac_ext >&5
3.5612 +-
3.5613 +-
3.5614 +-fi
3.5615 +-
3.5616 ++ $as_echo "$as_me: failed program was:" >&5
3.5617 ++sed 's/^/| /' conftest.$ac_ext >&5
3.5618 ++
3.5619 ++
3.5620 ++fi
3.5621 ++
3.5622 ++rm -rf conftest.dSYM
3.5623 + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
3.5624 + conftest$ac_exeext
3.5625 + if test "${ac_cv_search_xdr_int+set}" = set; then
3.5626 +@@ -5032,16 +5305,200 @@
3.5627 + rm conftest.$ac_ext
3.5628 + LIBS=$ac_func_search_save_LIBS
3.5629 + fi
3.5630 +-{ echo "$as_me:$LINENO: result: $ac_cv_search_xdr_int" >&5
3.5631 +-echo "${ECHO_T}$ac_cv_search_xdr_int" >&6; }
3.5632 ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_xdr_int" >&5
3.5633 ++$as_echo "$ac_cv_search_xdr_int" >&6; }
3.5634 + ac_res=$ac_cv_search_xdr_int
3.5635 + if test "$ac_res" != no; then
3.5636 + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
3.5637 +
3.5638 + else
3.5639 +- { { echo "$as_me:$LINENO: error: can't find required library function (xdr_int)" >&5
3.5640 +-echo "$as_me: error: can't find required library function (xdr_int)" >&2;}
3.5641 +- { (exit 1); exit 1; }; }
3.5642 ++ { { $as_echo "$as_me:$LINENO: error: can't find required library function (xdr_int)" >&5
3.5643 ++$as_echo "$as_me: error: can't find required library function (xdr_int)" >&2;}
3.5644 ++ { (exit 1); exit 1; }; }
3.5645 ++fi
3.5646 ++
3.5647 ++
3.5648 ++ { $as_echo "$as_me:$LINENO: checking for library containing inet_aton" >&5
3.5649 ++$as_echo_n "checking for library containing inet_aton... " >&6; }
3.5650 ++if test "${ac_cv_search_inet_aton+set}" = set; then
3.5651 ++ $as_echo_n "(cached) " >&6
3.5652 ++else
3.5653 ++ ac_func_search_save_LIBS=$LIBS
3.5654 ++cat >conftest.$ac_ext <<_ACEOF
3.5655 ++/* confdefs.h. */
3.5656 ++_ACEOF
3.5657 ++cat confdefs.h >>conftest.$ac_ext
3.5658 ++cat >>conftest.$ac_ext <<_ACEOF
3.5659 ++/* end confdefs.h. */
3.5660 ++
3.5661 ++/* Override any GCC internal prototype to avoid an error.
3.5662 ++ Use char because int might match the return type of a GCC
3.5663 ++ builtin and then its argument prototype would still apply. */
3.5664 ++#ifdef __cplusplus
3.5665 ++extern "C"
3.5666 ++#endif
3.5667 ++char inet_aton ();
3.5668 ++int
3.5669 ++main ()
3.5670 ++{
3.5671 ++return inet_aton ();
3.5672 ++ ;
3.5673 ++ return 0;
3.5674 ++}
3.5675 ++_ACEOF
3.5676 ++for ac_lib in '' nsl resolv socket; do
3.5677 ++ if test -z "$ac_lib"; then
3.5678 ++ ac_res="none required"
3.5679 ++ else
3.5680 ++ ac_res=-l$ac_lib
3.5681 ++ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
3.5682 ++ fi
3.5683 ++ rm -f conftest.$ac_objext conftest$ac_exeext
3.5684 ++if { (ac_try="$ac_link"
3.5685 ++case "(($ac_try" in
3.5686 ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.5687 ++ *) ac_try_echo=$ac_try;;
3.5688 ++esac
3.5689 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.5690 ++$as_echo "$ac_try_echo") >&5
3.5691 ++ (eval "$ac_link") 2>conftest.er1
3.5692 ++ ac_status=$?
3.5693 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.5694 ++ rm -f conftest.er1
3.5695 ++ cat conftest.err >&5
3.5696 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.5697 ++ (exit $ac_status); } && {
3.5698 ++ test -z "$ac_c_werror_flag" ||
3.5699 ++ test ! -s conftest.err
3.5700 ++ } && test -s conftest$ac_exeext && {
3.5701 ++ test "$cross_compiling" = yes ||
3.5702 ++ $as_test_x conftest$ac_exeext
3.5703 ++ }; then
3.5704 ++ ac_cv_search_inet_aton=$ac_res
3.5705 ++else
3.5706 ++ $as_echo "$as_me: failed program was:" >&5
3.5707 ++sed 's/^/| /' conftest.$ac_ext >&5
3.5708 ++
3.5709 ++
3.5710 ++fi
3.5711 ++
3.5712 ++rm -rf conftest.dSYM
3.5713 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
3.5714 ++ conftest$ac_exeext
3.5715 ++ if test "${ac_cv_search_inet_aton+set}" = set; then
3.5716 ++ break
3.5717 ++fi
3.5718 ++done
3.5719 ++if test "${ac_cv_search_inet_aton+set}" = set; then
3.5720 ++ :
3.5721 ++else
3.5722 ++ ac_cv_search_inet_aton=no
3.5723 ++fi
3.5724 ++rm conftest.$ac_ext
3.5725 ++LIBS=$ac_func_search_save_LIBS
3.5726 ++fi
3.5727 ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_inet_aton" >&5
3.5728 ++$as_echo "$ac_cv_search_inet_aton" >&6; }
3.5729 ++ac_res=$ac_cv_search_inet_aton
3.5730 ++if test "$ac_res" != no; then
3.5731 ++ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
3.5732 ++
3.5733 ++cat >>confdefs.h <<_ACEOF
3.5734 ++#define HAVE_INET_ATON 1
3.5735 ++_ACEOF
3.5736 ++
3.5737 ++fi
3.5738 ++
3.5739 ++
3.5740 ++ { $as_echo "$as_me:$LINENO: checking for library containing inet_pton" >&5
3.5741 ++$as_echo_n "checking for library containing inet_pton... " >&6; }
3.5742 ++if test "${ac_cv_search_inet_pton+set}" = set; then
3.5743 ++ $as_echo_n "(cached) " >&6
3.5744 ++else
3.5745 ++ ac_func_search_save_LIBS=$LIBS
3.5746 ++cat >conftest.$ac_ext <<_ACEOF
3.5747 ++/* confdefs.h. */
3.5748 ++_ACEOF
3.5749 ++cat confdefs.h >>conftest.$ac_ext
3.5750 ++cat >>conftest.$ac_ext <<_ACEOF
3.5751 ++/* end confdefs.h. */
3.5752 ++
3.5753 ++/* Override any GCC internal prototype to avoid an error.
3.5754 ++ Use char because int might match the return type of a GCC
3.5755 ++ builtin and then its argument prototype would still apply. */
3.5756 ++#ifdef __cplusplus
3.5757 ++extern "C"
3.5758 ++#endif
3.5759 ++char inet_pton ();
3.5760 ++int
3.5761 ++main ()
3.5762 ++{
3.5763 ++return inet_pton ();
3.5764 ++ ;
3.5765 ++ return 0;
3.5766 ++}
3.5767 ++_ACEOF
3.5768 ++for ac_lib in '' nsl resolv socket; do
3.5769 ++ if test -z "$ac_lib"; then
3.5770 ++ ac_res="none required"
3.5771 ++ else
3.5772 ++ ac_res=-l$ac_lib
3.5773 ++ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
3.5774 ++ fi
3.5775 ++ rm -f conftest.$ac_objext conftest$ac_exeext
3.5776 ++if { (ac_try="$ac_link"
3.5777 ++case "(($ac_try" in
3.5778 ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.5779 ++ *) ac_try_echo=$ac_try;;
3.5780 ++esac
3.5781 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.5782 ++$as_echo "$ac_try_echo") >&5
3.5783 ++ (eval "$ac_link") 2>conftest.er1
3.5784 ++ ac_status=$?
3.5785 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.5786 ++ rm -f conftest.er1
3.5787 ++ cat conftest.err >&5
3.5788 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.5789 ++ (exit $ac_status); } && {
3.5790 ++ test -z "$ac_c_werror_flag" ||
3.5791 ++ test ! -s conftest.err
3.5792 ++ } && test -s conftest$ac_exeext && {
3.5793 ++ test "$cross_compiling" = yes ||
3.5794 ++ $as_test_x conftest$ac_exeext
3.5795 ++ }; then
3.5796 ++ ac_cv_search_inet_pton=$ac_res
3.5797 ++else
3.5798 ++ $as_echo "$as_me: failed program was:" >&5
3.5799 ++sed 's/^/| /' conftest.$ac_ext >&5
3.5800 ++
3.5801 ++
3.5802 ++fi
3.5803 ++
3.5804 ++rm -rf conftest.dSYM
3.5805 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
3.5806 ++ conftest$ac_exeext
3.5807 ++ if test "${ac_cv_search_inet_pton+set}" = set; then
3.5808 ++ break
3.5809 ++fi
3.5810 ++done
3.5811 ++if test "${ac_cv_search_inet_pton+set}" = set; then
3.5812 ++ :
3.5813 ++else
3.5814 ++ ac_cv_search_inet_pton=no
3.5815 ++fi
3.5816 ++rm conftest.$ac_ext
3.5817 ++LIBS=$ac_func_search_save_LIBS
3.5818 ++fi
3.5819 ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_inet_pton" >&5
3.5820 ++$as_echo "$ac_cv_search_inet_pton" >&6; }
3.5821 ++ac_res=$ac_cv_search_inet_pton
3.5822 ++if test "$ac_res" != no; then
3.5823 ++ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
3.5824 ++
3.5825 ++cat >>confdefs.h <<_ACEOF
3.5826 ++#define HAVE_INET_PTON 1
3.5827 ++_ACEOF
3.5828 ++
3.5829 + fi
3.5830 +
3.5831 +
3.5832 +@@ -5064,10 +5521,10 @@
3.5833 +
3.5834 +
3.5835 +
3.5836 +- { echo "$as_me:$LINENO: checking for ANSI C header files" >&5
3.5837 +-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
3.5838 ++ { $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
3.5839 ++$as_echo_n "checking for ANSI C header files... " >&6; }
3.5840 + if test "${ac_cv_header_stdc+set}" = set; then
3.5841 +- echo $ECHO_N "(cached) $ECHO_C" >&6
3.5842 ++ $as_echo_n "(cached) " >&6
3.5843 + else
3.5844 + cat >conftest.$ac_ext <<_ACEOF
3.5845 + /* confdefs.h. */
3.5846 +@@ -5094,20 +5551,21 @@
3.5847 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.5848 + *) ac_try_echo=$ac_try;;
3.5849 + esac
3.5850 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.5851 +- (eval "$ac_compile") 2>conftest.er1
3.5852 +- ac_status=$?
3.5853 +- grep -v '^ *+' conftest.er1 >conftest.err
3.5854 +- rm -f conftest.er1
3.5855 +- cat conftest.err >&5
3.5856 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.5857 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.5858 ++$as_echo "$ac_try_echo") >&5
3.5859 ++ (eval "$ac_compile") 2>conftest.er1
3.5860 ++ ac_status=$?
3.5861 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.5862 ++ rm -f conftest.er1
3.5863 ++ cat conftest.err >&5
3.5864 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.5865 + (exit $ac_status); } && {
3.5866 + test -z "$ac_c_werror_flag" ||
3.5867 + test ! -s conftest.err
3.5868 + } && test -s conftest.$ac_objext; then
3.5869 + ac_cv_header_stdc=yes
3.5870 + else
3.5871 +- echo "$as_me: failed program was:" >&5
3.5872 ++ $as_echo "$as_me: failed program was:" >&5
3.5873 + sed 's/^/| /' conftest.$ac_ext >&5
3.5874 +
3.5875 + ac_cv_header_stdc=no
3.5876 +@@ -5199,37 +5657,40 @@
3.5877 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.5878 + *) ac_try_echo=$ac_try;;
3.5879 + esac
3.5880 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.5881 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.5882 ++$as_echo "$ac_try_echo") >&5
3.5883 + (eval "$ac_link") 2>&5
3.5884 + ac_status=$?
3.5885 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.5886 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.5887 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
3.5888 + { (case "(($ac_try" in
3.5889 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.5890 + *) ac_try_echo=$ac_try;;
3.5891 + esac
3.5892 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.5893 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.5894 ++$as_echo "$ac_try_echo") >&5
3.5895 + (eval "$ac_try") 2>&5
3.5896 + ac_status=$?
3.5897 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.5898 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.5899 + (exit $ac_status); }; }; then
3.5900 + :
3.5901 + else
3.5902 +- echo "$as_me: program exited with status $ac_status" >&5
3.5903 +-echo "$as_me: failed program was:" >&5
3.5904 ++ $as_echo "$as_me: program exited with status $ac_status" >&5
3.5905 ++$as_echo "$as_me: failed program was:" >&5
3.5906 + sed 's/^/| /' conftest.$ac_ext >&5
3.5907 +
3.5908 + ( exit $ac_status )
3.5909 + ac_cv_header_stdc=no
3.5910 + fi
3.5911 ++rm -rf conftest.dSYM
3.5912 + rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
3.5913 + fi
3.5914 +
3.5915 +
3.5916 + fi
3.5917 + fi
3.5918 +-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
3.5919 +-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
3.5920 ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
3.5921 ++$as_echo "$ac_cv_header_stdc" >&6; }
3.5922 + if test $ac_cv_header_stdc = yes; then
3.5923 +
3.5924 + cat >>confdefs.h <<\_ACEOF
3.5925 +@@ -5247,20 +5708,21 @@
3.5926 +
3.5927 + for ac_header in err.h execinfo.h stdint.h string.h synch.h sys/cdefs.h sys/types.h
3.5928 + do
3.5929 +-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
3.5930 ++as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
3.5931 + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
3.5932 +- { echo "$as_me:$LINENO: checking for $ac_header" >&5
3.5933 +-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
3.5934 ++ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
3.5935 ++$as_echo_n "checking for $ac_header... " >&6; }
3.5936 + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
3.5937 +- echo $ECHO_N "(cached) $ECHO_C" >&6
3.5938 +-fi
3.5939 +-ac_res=`eval echo '${'$as_ac_Header'}'`
3.5940 +- { echo "$as_me:$LINENO: result: $ac_res" >&5
3.5941 +-echo "${ECHO_T}$ac_res" >&6; }
3.5942 ++ $as_echo_n "(cached) " >&6
3.5943 ++fi
3.5944 ++ac_res=`eval 'as_val=${'$as_ac_Header'}
3.5945 ++ $as_echo "$as_val"'`
3.5946 ++ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
3.5947 ++$as_echo "$ac_res" >&6; }
3.5948 + else
3.5949 + # Is the header compilable?
3.5950 +-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
3.5951 +-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
3.5952 ++{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
3.5953 ++$as_echo_n "checking $ac_header usability... " >&6; }
3.5954 + cat >conftest.$ac_ext <<_ACEOF
3.5955 + /* confdefs.h. */
3.5956 + _ACEOF
3.5957 +@@ -5276,32 +5738,33 @@
3.5958 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.5959 + *) ac_try_echo=$ac_try;;
3.5960 + esac
3.5961 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.5962 +- (eval "$ac_compile") 2>conftest.er1
3.5963 +- ac_status=$?
3.5964 +- grep -v '^ *+' conftest.er1 >conftest.err
3.5965 +- rm -f conftest.er1
3.5966 +- cat conftest.err >&5
3.5967 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.5968 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.5969 ++$as_echo "$ac_try_echo") >&5
3.5970 ++ (eval "$ac_compile") 2>conftest.er1
3.5971 ++ ac_status=$?
3.5972 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.5973 ++ rm -f conftest.er1
3.5974 ++ cat conftest.err >&5
3.5975 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.5976 + (exit $ac_status); } && {
3.5977 + test -z "$ac_c_werror_flag" ||
3.5978 + test ! -s conftest.err
3.5979 + } && test -s conftest.$ac_objext; then
3.5980 + ac_header_compiler=yes
3.5981 + else
3.5982 +- echo "$as_me: failed program was:" >&5
3.5983 ++ $as_echo "$as_me: failed program was:" >&5
3.5984 + sed 's/^/| /' conftest.$ac_ext >&5
3.5985 +
3.5986 + ac_header_compiler=no
3.5987 + fi
3.5988 +
3.5989 + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3.5990 +-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
3.5991 +-echo "${ECHO_T}$ac_header_compiler" >&6; }
3.5992 ++{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
3.5993 ++$as_echo "$ac_header_compiler" >&6; }
3.5994 +
3.5995 + # Is the header present?
3.5996 +-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
3.5997 +-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
3.5998 ++{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
3.5999 ++$as_echo_n "checking $ac_header presence... " >&6; }
3.6000 + cat >conftest.$ac_ext <<_ACEOF
3.6001 + /* confdefs.h. */
3.6002 + _ACEOF
3.6003 +@@ -5315,81 +5778,85 @@
3.6004 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.6005 + *) ac_try_echo=$ac_try;;
3.6006 + esac
3.6007 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.6008 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.6009 ++$as_echo "$ac_try_echo") >&5
3.6010 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
3.6011 + ac_status=$?
3.6012 + grep -v '^ *+' conftest.er1 >conftest.err
3.6013 + rm -f conftest.er1
3.6014 + cat conftest.err >&5
3.6015 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.6016 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.6017 + (exit $ac_status); } >/dev/null && {
3.6018 + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
3.6019 + test ! -s conftest.err
3.6020 + }; then
3.6021 + ac_header_preproc=yes
3.6022 + else
3.6023 +- echo "$as_me: failed program was:" >&5
3.6024 ++ $as_echo "$as_me: failed program was:" >&5
3.6025 + sed 's/^/| /' conftest.$ac_ext >&5
3.6026 +
3.6027 + ac_header_preproc=no
3.6028 + fi
3.6029 +
3.6030 + rm -f conftest.err conftest.$ac_ext
3.6031 +-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
3.6032 +-echo "${ECHO_T}$ac_header_preproc" >&6; }
3.6033 ++{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
3.6034 ++$as_echo "$ac_header_preproc" >&6; }
3.6035 +
3.6036 + # So? What about this header?
3.6037 + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
3.6038 + yes:no: )
3.6039 +- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
3.6040 +-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
3.6041 +- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
3.6042 +-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
3.6043 ++ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
3.6044 ++$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
3.6045 ++ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
3.6046 ++$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
3.6047 + ac_header_preproc=yes
3.6048 + ;;
3.6049 + no:yes:* )
3.6050 +- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
3.6051 +-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
3.6052 +- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
3.6053 +-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
3.6054 +- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
3.6055 +-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
3.6056 +- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
3.6057 +-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
3.6058 +- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
3.6059 +-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
3.6060 +- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
3.6061 +-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
3.6062 +-
3.6063 +- ;;
3.6064 +-esac
3.6065 +-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
3.6066 +-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
3.6067 ++ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
3.6068 ++$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
3.6069 ++ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
3.6070 ++$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
3.6071 ++ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
3.6072 ++$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
3.6073 ++ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
3.6074 ++$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
3.6075 ++ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
3.6076 ++$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
3.6077 ++ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
3.6078 ++$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
3.6079 ++
3.6080 ++ ;;
3.6081 ++esac
3.6082 ++{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
3.6083 ++$as_echo_n "checking for $ac_header... " >&6; }
3.6084 + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
3.6085 +- echo $ECHO_N "(cached) $ECHO_C" >&6
3.6086 ++ $as_echo_n "(cached) " >&6
3.6087 + else
3.6088 + eval "$as_ac_Header=\$ac_header_preproc"
3.6089 + fi
3.6090 +-ac_res=`eval echo '${'$as_ac_Header'}'`
3.6091 +- { echo "$as_me:$LINENO: result: $ac_res" >&5
3.6092 +-echo "${ECHO_T}$ac_res" >&6; }
3.6093 +-
3.6094 +-fi
3.6095 +-if test `eval echo '${'$as_ac_Header'}'` = yes; then
3.6096 ++ac_res=`eval 'as_val=${'$as_ac_Header'}
3.6097 ++ $as_echo "$as_val"'`
3.6098 ++ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
3.6099 ++$as_echo "$ac_res" >&6; }
3.6100 ++
3.6101 ++fi
3.6102 ++as_val=`eval 'as_val=${'$as_ac_Header'}
3.6103 ++ $as_echo "$as_val"'`
3.6104 ++ if test "x$as_val" = x""yes; then
3.6105 + cat >>confdefs.h <<_ACEOF
3.6106 +-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
3.6107 +-_ACEOF
3.6108 +-
3.6109 +-fi
3.6110 +-
3.6111 +-done
3.6112 +-
3.6113 +-
3.6114 +-
3.6115 +- { echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
3.6116 +-echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; }
3.6117 ++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
3.6118 ++_ACEOF
3.6119 ++
3.6120 ++fi
3.6121 ++
3.6122 ++done
3.6123 ++
3.6124 ++
3.6125 ++
3.6126 ++ { $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
3.6127 ++$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
3.6128 + if test "${ac_cv_c_const+set}" = set; then
3.6129 +- echo $ECHO_N "(cached) $ECHO_C" >&6
3.6130 ++ $as_echo_n "(cached) " >&6
3.6131 + else
3.6132 + cat >conftest.$ac_ext <<_ACEOF
3.6133 + /* confdefs.h. */
3.6134 +@@ -5461,20 +5928,21 @@
3.6135 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.6136 + *) ac_try_echo=$ac_try;;
3.6137 + esac
3.6138 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.6139 +- (eval "$ac_compile") 2>conftest.er1
3.6140 +- ac_status=$?
3.6141 +- grep -v '^ *+' conftest.er1 >conftest.err
3.6142 +- rm -f conftest.er1
3.6143 +- cat conftest.err >&5
3.6144 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.6145 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.6146 ++$as_echo "$ac_try_echo") >&5
3.6147 ++ (eval "$ac_compile") 2>conftest.er1
3.6148 ++ ac_status=$?
3.6149 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.6150 ++ rm -f conftest.er1
3.6151 ++ cat conftest.err >&5
3.6152 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.6153 + (exit $ac_status); } && {
3.6154 + test -z "$ac_c_werror_flag" ||
3.6155 + test ! -s conftest.err
3.6156 + } && test -s conftest.$ac_objext; then
3.6157 + ac_cv_c_const=yes
3.6158 + else
3.6159 +- echo "$as_me: failed program was:" >&5
3.6160 ++ $as_echo "$as_me: failed program was:" >&5
3.6161 + sed 's/^/| /' conftest.$ac_ext >&5
3.6162 +
3.6163 + ac_cv_c_const=no
3.6164 +@@ -5482,20 +5950,20 @@
3.6165 +
3.6166 + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3.6167 + fi
3.6168 +-{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
3.6169 +-echo "${ECHO_T}$ac_cv_c_const" >&6; }
3.6170 ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
3.6171 ++$as_echo "$ac_cv_c_const" >&6; }
3.6172 + if test $ac_cv_c_const = no; then
3.6173 +
3.6174 + cat >>confdefs.h <<\_ACEOF
3.6175 +-#define const
3.6176 +-_ACEOF
3.6177 +-
3.6178 +-fi
3.6179 +-
3.6180 +- { echo "$as_me:$LINENO: checking for inline" >&5
3.6181 +-echo $ECHO_N "checking for inline... $ECHO_C" >&6; }
3.6182 ++#define const /**/
3.6183 ++_ACEOF
3.6184 ++
3.6185 ++fi
3.6186 ++
3.6187 ++ { $as_echo "$as_me:$LINENO: checking for inline" >&5
3.6188 ++$as_echo_n "checking for inline... " >&6; }
3.6189 + if test "${ac_cv_c_inline+set}" = set; then
3.6190 +- echo $ECHO_N "(cached) $ECHO_C" >&6
3.6191 ++ $as_echo_n "(cached) " >&6
3.6192 + else
3.6193 + ac_cv_c_inline=no
3.6194 + for ac_kw in inline __inline__ __inline; do
3.6195 +@@ -5518,20 +5986,21 @@
3.6196 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.6197 + *) ac_try_echo=$ac_try;;
3.6198 + esac
3.6199 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.6200 +- (eval "$ac_compile") 2>conftest.er1
3.6201 +- ac_status=$?
3.6202 +- grep -v '^ *+' conftest.er1 >conftest.err
3.6203 +- rm -f conftest.er1
3.6204 +- cat conftest.err >&5
3.6205 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.6206 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.6207 ++$as_echo "$ac_try_echo") >&5
3.6208 ++ (eval "$ac_compile") 2>conftest.er1
3.6209 ++ ac_status=$?
3.6210 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.6211 ++ rm -f conftest.er1
3.6212 ++ cat conftest.err >&5
3.6213 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.6214 + (exit $ac_status); } && {
3.6215 + test -z "$ac_c_werror_flag" ||
3.6216 + test ! -s conftest.err
3.6217 + } && test -s conftest.$ac_objext; then
3.6218 + ac_cv_c_inline=$ac_kw
3.6219 + else
3.6220 +- echo "$as_me: failed program was:" >&5
3.6221 ++ $as_echo "$as_me: failed program was:" >&5
3.6222 + sed 's/^/| /' conftest.$ac_ext >&5
3.6223 +
3.6224 +
3.6225 +@@ -5542,8 +6011,8 @@
3.6226 + done
3.6227 +
3.6228 + fi
3.6229 +-{ echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
3.6230 +-echo "${ECHO_T}$ac_cv_c_inline" >&6; }
3.6231 ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
3.6232 ++$as_echo "$ac_cv_c_inline" >&6; }
3.6233 +
3.6234 +
3.6235 + case $ac_cv_c_inline in
3.6236 +@@ -5561,10 +6030,10 @@
3.6237 + ;;
3.6238 + esac
3.6239 +
3.6240 +- { echo "$as_me:$LINENO: checking for working volatile" >&5
3.6241 +-echo $ECHO_N "checking for working volatile... $ECHO_C" >&6; }
3.6242 ++ { $as_echo "$as_me:$LINENO: checking for working volatile" >&5
3.6243 ++$as_echo_n "checking for working volatile... " >&6; }
3.6244 + if test "${ac_cv_c_volatile+set}" = set; then
3.6245 +- echo $ECHO_N "(cached) $ECHO_C" >&6
3.6246 ++ $as_echo_n "(cached) " >&6
3.6247 + else
3.6248 + cat >conftest.$ac_ext <<_ACEOF
3.6249 + /* confdefs.h. */
3.6250 +@@ -5590,20 +6059,21 @@
3.6251 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.6252 + *) ac_try_echo=$ac_try;;
3.6253 + esac
3.6254 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.6255 +- (eval "$ac_compile") 2>conftest.er1
3.6256 +- ac_status=$?
3.6257 +- grep -v '^ *+' conftest.er1 >conftest.err
3.6258 +- rm -f conftest.er1
3.6259 +- cat conftest.err >&5
3.6260 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.6261 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.6262 ++$as_echo "$ac_try_echo") >&5
3.6263 ++ (eval "$ac_compile") 2>conftest.er1
3.6264 ++ ac_status=$?
3.6265 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.6266 ++ rm -f conftest.er1
3.6267 ++ cat conftest.err >&5
3.6268 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.6269 + (exit $ac_status); } && {
3.6270 + test -z "$ac_c_werror_flag" ||
3.6271 + test ! -s conftest.err
3.6272 + } && test -s conftest.$ac_objext; then
3.6273 + ac_cv_c_volatile=yes
3.6274 + else
3.6275 +- echo "$as_me: failed program was:" >&5
3.6276 ++ $as_echo "$as_me: failed program was:" >&5
3.6277 + sed 's/^/| /' conftest.$ac_ext >&5
3.6278 +
3.6279 + ac_cv_c_volatile=no
3.6280 +@@ -5611,70 +6081,111 @@
3.6281 +
3.6282 + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3.6283 + fi
3.6284 +-{ echo "$as_me:$LINENO: result: $ac_cv_c_volatile" >&5
3.6285 +-echo "${ECHO_T}$ac_cv_c_volatile" >&6; }
3.6286 ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_volatile" >&5
3.6287 ++$as_echo "$ac_cv_c_volatile" >&6; }
3.6288 + if test $ac_cv_c_volatile = no; then
3.6289 +
3.6290 + cat >>confdefs.h <<\_ACEOF
3.6291 +-#define volatile
3.6292 +-_ACEOF
3.6293 +-
3.6294 +-fi
3.6295 +-
3.6296 +- { echo "$as_me:$LINENO: checking for mode_t" >&5
3.6297 +-echo $ECHO_N "checking for mode_t... $ECHO_C" >&6; }
3.6298 ++#define volatile /**/
3.6299 ++_ACEOF
3.6300 ++
3.6301 ++fi
3.6302 ++
3.6303 ++ { $as_echo "$as_me:$LINENO: checking for mode_t" >&5
3.6304 ++$as_echo_n "checking for mode_t... " >&6; }
3.6305 + if test "${ac_cv_type_mode_t+set}" = set; then
3.6306 +- echo $ECHO_N "(cached) $ECHO_C" >&6
3.6307 +-else
3.6308 +- cat >conftest.$ac_ext <<_ACEOF
3.6309 +-/* confdefs.h. */
3.6310 +-_ACEOF
3.6311 +-cat confdefs.h >>conftest.$ac_ext
3.6312 +-cat >>conftest.$ac_ext <<_ACEOF
3.6313 +-/* end confdefs.h. */
3.6314 +-$ac_includes_default
3.6315 +-typedef mode_t ac__type_new_;
3.6316 +-int
3.6317 +-main ()
3.6318 +-{
3.6319 +-if ((ac__type_new_ *) 0)
3.6320 +- return 0;
3.6321 +-if (sizeof (ac__type_new_))
3.6322 +- return 0;
3.6323 +- ;
3.6324 +- return 0;
3.6325 +-}
3.6326 +-_ACEOF
3.6327 +-rm -f conftest.$ac_objext
3.6328 +-if { (ac_try="$ac_compile"
3.6329 +-case "(($ac_try" in
3.6330 +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.6331 +- *) ac_try_echo=$ac_try;;
3.6332 +-esac
3.6333 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.6334 +- (eval "$ac_compile") 2>conftest.er1
3.6335 +- ac_status=$?
3.6336 +- grep -v '^ *+' conftest.er1 >conftest.err
3.6337 +- rm -f conftest.er1
3.6338 +- cat conftest.err >&5
3.6339 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.6340 +- (exit $ac_status); } && {
3.6341 +- test -z "$ac_c_werror_flag" ||
3.6342 +- test ! -s conftest.err
3.6343 +- } && test -s conftest.$ac_objext; then
3.6344 +- ac_cv_type_mode_t=yes
3.6345 +-else
3.6346 +- echo "$as_me: failed program was:" >&5
3.6347 +-sed 's/^/| /' conftest.$ac_ext >&5
3.6348 +-
3.6349 +- ac_cv_type_mode_t=no
3.6350 +-fi
3.6351 +-
3.6352 +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3.6353 +-fi
3.6354 +-{ echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5
3.6355 +-echo "${ECHO_T}$ac_cv_type_mode_t" >&6; }
3.6356 +-if test $ac_cv_type_mode_t = yes; then
3.6357 ++ $as_echo_n "(cached) " >&6
3.6358 ++else
3.6359 ++ ac_cv_type_mode_t=no
3.6360 ++cat >conftest.$ac_ext <<_ACEOF
3.6361 ++/* confdefs.h. */
3.6362 ++_ACEOF
3.6363 ++cat confdefs.h >>conftest.$ac_ext
3.6364 ++cat >>conftest.$ac_ext <<_ACEOF
3.6365 ++/* end confdefs.h. */
3.6366 ++$ac_includes_default
3.6367 ++int
3.6368 ++main ()
3.6369 ++{
3.6370 ++if (sizeof (mode_t))
3.6371 ++ return 0;
3.6372 ++ ;
3.6373 ++ return 0;
3.6374 ++}
3.6375 ++_ACEOF
3.6376 ++rm -f conftest.$ac_objext
3.6377 ++if { (ac_try="$ac_compile"
3.6378 ++case "(($ac_try" in
3.6379 ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.6380 ++ *) ac_try_echo=$ac_try;;
3.6381 ++esac
3.6382 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.6383 ++$as_echo "$ac_try_echo") >&5
3.6384 ++ (eval "$ac_compile") 2>conftest.er1
3.6385 ++ ac_status=$?
3.6386 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.6387 ++ rm -f conftest.er1
3.6388 ++ cat conftest.err >&5
3.6389 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.6390 ++ (exit $ac_status); } && {
3.6391 ++ test -z "$ac_c_werror_flag" ||
3.6392 ++ test ! -s conftest.err
3.6393 ++ } && test -s conftest.$ac_objext; then
3.6394 ++ cat >conftest.$ac_ext <<_ACEOF
3.6395 ++/* confdefs.h. */
3.6396 ++_ACEOF
3.6397 ++cat confdefs.h >>conftest.$ac_ext
3.6398 ++cat >>conftest.$ac_ext <<_ACEOF
3.6399 ++/* end confdefs.h. */
3.6400 ++$ac_includes_default
3.6401 ++int
3.6402 ++main ()
3.6403 ++{
3.6404 ++if (sizeof ((mode_t)))
3.6405 ++ return 0;
3.6406 ++ ;
3.6407 ++ return 0;
3.6408 ++}
3.6409 ++_ACEOF
3.6410 ++rm -f conftest.$ac_objext
3.6411 ++if { (ac_try="$ac_compile"
3.6412 ++case "(($ac_try" in
3.6413 ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.6414 ++ *) ac_try_echo=$ac_try;;
3.6415 ++esac
3.6416 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.6417 ++$as_echo "$ac_try_echo") >&5
3.6418 ++ (eval "$ac_compile") 2>conftest.er1
3.6419 ++ ac_status=$?
3.6420 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.6421 ++ rm -f conftest.er1
3.6422 ++ cat conftest.err >&5
3.6423 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.6424 ++ (exit $ac_status); } && {
3.6425 ++ test -z "$ac_c_werror_flag" ||
3.6426 ++ test ! -s conftest.err
3.6427 ++ } && test -s conftest.$ac_objext; then
3.6428 ++ :
3.6429 ++else
3.6430 ++ $as_echo "$as_me: failed program was:" >&5
3.6431 ++sed 's/^/| /' conftest.$ac_ext >&5
3.6432 ++
3.6433 ++ ac_cv_type_mode_t=yes
3.6434 ++fi
3.6435 ++
3.6436 ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3.6437 ++else
3.6438 ++ $as_echo "$as_me: failed program was:" >&5
3.6439 ++sed 's/^/| /' conftest.$ac_ext >&5
3.6440 ++
3.6441 ++
3.6442 ++fi
3.6443 ++
3.6444 ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3.6445 ++fi
3.6446 ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5
3.6447 ++$as_echo "$ac_cv_type_mode_t" >&6; }
3.6448 ++if test "x$ac_cv_type_mode_t" = x""yes; then
3.6449 + :
3.6450 + else
3.6451 +
3.6452 +@@ -5684,8 +6195,8 @@
3.6453 +
3.6454 + fi
3.6455 +
3.6456 +- { echo "$as_me:$LINENO: checking value for _FILE_OFFSET_BITS preprocessor symbol" >&5
3.6457 +-echo $ECHO_N "checking value for _FILE_OFFSET_BITS preprocessor symbol... $ECHO_C" >&6; }
3.6458 ++ { $as_echo "$as_me:$LINENO: checking value for _FILE_OFFSET_BITS preprocessor symbol" >&5
3.6459 ++$as_echo_n "checking value for _FILE_OFFSET_BITS preprocessor symbol... " >&6; }
3.6460 + ac_file_offset_bits=64
3.6461 +
3.6462 + # Check whether --with-file-offset-bits was given.
3.6463 +@@ -5693,8 +6204,8 @@
3.6464 + withval=$with_file_offset_bits; ac_file_offset_bits=$withval
3.6465 + fi
3.6466 +
3.6467 +- { echo "$as_me:$LINENO: result: $ac_file_offset_bits" >&5
3.6468 +-echo "${ECHO_T}$ac_file_offset_bits" >&6; }
3.6469 ++ { $as_echo "$as_me:$LINENO: result: $ac_file_offset_bits" >&5
3.6470 ++$as_echo "$ac_file_offset_bits" >&6; }
3.6471 + if test $ac_file_offset_bits = 64 ; then
3.6472 + SYS_CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
3.6473 + else
3.6474 +@@ -5703,68 +6214,14 @@
3.6475 +
3.6476 + oasys_ac_cppflags_save="$CPPFLAGS"
3.6477 + CPPFLAGS="$SYS_CFLAGS $CPPFLAGS"
3.6478 +- { echo "$as_me:$LINENO: checking for off_t" >&5
3.6479 +-echo $ECHO_N "checking for off_t... $ECHO_C" >&6; }
3.6480 +-if test "${ac_cv_type_off_t+set}" = set; then
3.6481 +- echo $ECHO_N "(cached) $ECHO_C" >&6
3.6482 +-else
3.6483 +- cat >conftest.$ac_ext <<_ACEOF
3.6484 +-/* confdefs.h. */
3.6485 +-_ACEOF
3.6486 +-cat confdefs.h >>conftest.$ac_ext
3.6487 +-cat >>conftest.$ac_ext <<_ACEOF
3.6488 +-/* end confdefs.h. */
3.6489 +-$ac_includes_default
3.6490 +-typedef off_t ac__type_new_;
3.6491 +-int
3.6492 +-main ()
3.6493 +-{
3.6494 +-if ((ac__type_new_ *) 0)
3.6495 +- return 0;
3.6496 +-if (sizeof (ac__type_new_))
3.6497 +- return 0;
3.6498 +- ;
3.6499 +- return 0;
3.6500 +-}
3.6501 +-_ACEOF
3.6502 +-rm -f conftest.$ac_objext
3.6503 +-if { (ac_try="$ac_compile"
3.6504 +-case "(($ac_try" in
3.6505 +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.6506 +- *) ac_try_echo=$ac_try;;
3.6507 +-esac
3.6508 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.6509 +- (eval "$ac_compile") 2>conftest.er1
3.6510 +- ac_status=$?
3.6511 +- grep -v '^ *+' conftest.er1 >conftest.err
3.6512 +- rm -f conftest.er1
3.6513 +- cat conftest.err >&5
3.6514 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.6515 +- (exit $ac_status); } && {
3.6516 +- test -z "$ac_c_werror_flag" ||
3.6517 +- test ! -s conftest.err
3.6518 +- } && test -s conftest.$ac_objext; then
3.6519 +- ac_cv_type_off_t=yes
3.6520 +-else
3.6521 +- echo "$as_me: failed program was:" >&5
3.6522 +-sed 's/^/| /' conftest.$ac_ext >&5
3.6523 +-
3.6524 +- ac_cv_type_off_t=no
3.6525 +-fi
3.6526 +-
3.6527 +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3.6528 +-fi
3.6529 +-{ echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
3.6530 +-echo "${ECHO_T}$ac_cv_type_off_t" >&6; }
3.6531 +-
3.6532 +-# The cast to long int works around a bug in the HP C Compiler
3.6533 ++ # The cast to long int works around a bug in the HP C Compiler
3.6534 + # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
3.6535 + # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
3.6536 + # This bug is HP SR number 8606223364.
3.6537 +-{ echo "$as_me:$LINENO: checking size of off_t" >&5
3.6538 +-echo $ECHO_N "checking size of off_t... $ECHO_C" >&6; }
3.6539 ++{ $as_echo "$as_me:$LINENO: checking size of off_t" >&5
3.6540 ++$as_echo_n "checking size of off_t... " >&6; }
3.6541 + if test "${ac_cv_sizeof_off_t+set}" = set; then
3.6542 +- echo $ECHO_N "(cached) $ECHO_C" >&6
3.6543 ++ $as_echo_n "(cached) " >&6
3.6544 + else
3.6545 + if test "$cross_compiling" = yes; then
3.6546 + # Depending upon the size, compute the lo and hi bounds.
3.6547 +@@ -5775,11 +6232,10 @@
3.6548 + cat >>conftest.$ac_ext <<_ACEOF
3.6549 + /* end confdefs.h. */
3.6550 + $ac_includes_default
3.6551 +- typedef off_t ac__type_sizeof_;
3.6552 +-int
3.6553 +-main ()
3.6554 +-{
3.6555 +-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
3.6556 ++int
3.6557 ++main ()
3.6558 ++{
3.6559 ++static int test_array [1 - 2 * !(((long int) (sizeof (off_t))) >= 0)];
3.6560 + test_array [0] = 0
3.6561 +
3.6562 + ;
3.6563 +@@ -5792,13 +6248,14 @@
3.6564 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.6565 + *) ac_try_echo=$ac_try;;
3.6566 + esac
3.6567 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.6568 +- (eval "$ac_compile") 2>conftest.er1
3.6569 +- ac_status=$?
3.6570 +- grep -v '^ *+' conftest.er1 >conftest.err
3.6571 +- rm -f conftest.er1
3.6572 +- cat conftest.err >&5
3.6573 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.6574 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.6575 ++$as_echo "$ac_try_echo") >&5
3.6576 ++ (eval "$ac_compile") 2>conftest.er1
3.6577 ++ ac_status=$?
3.6578 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.6579 ++ rm -f conftest.er1
3.6580 ++ cat conftest.err >&5
3.6581 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.6582 + (exit $ac_status); } && {
3.6583 + test -z "$ac_c_werror_flag" ||
3.6584 + test ! -s conftest.err
3.6585 +@@ -5812,11 +6269,10 @@
3.6586 + cat >>conftest.$ac_ext <<_ACEOF
3.6587 + /* end confdefs.h. */
3.6588 + $ac_includes_default
3.6589 +- typedef off_t ac__type_sizeof_;
3.6590 +-int
3.6591 +-main ()
3.6592 +-{
3.6593 +-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
3.6594 ++int
3.6595 ++main ()
3.6596 ++{
3.6597 ++static int test_array [1 - 2 * !(((long int) (sizeof (off_t))) <= $ac_mid)];
3.6598 + test_array [0] = 0
3.6599 +
3.6600 + ;
3.6601 +@@ -5829,20 +6285,21 @@
3.6602 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.6603 + *) ac_try_echo=$ac_try;;
3.6604 + esac
3.6605 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.6606 +- (eval "$ac_compile") 2>conftest.er1
3.6607 +- ac_status=$?
3.6608 +- grep -v '^ *+' conftest.er1 >conftest.err
3.6609 +- rm -f conftest.er1
3.6610 +- cat conftest.err >&5
3.6611 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.6612 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.6613 ++$as_echo "$ac_try_echo") >&5
3.6614 ++ (eval "$ac_compile") 2>conftest.er1
3.6615 ++ ac_status=$?
3.6616 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.6617 ++ rm -f conftest.er1
3.6618 ++ cat conftest.err >&5
3.6619 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.6620 + (exit $ac_status); } && {
3.6621 + test -z "$ac_c_werror_flag" ||
3.6622 + test ! -s conftest.err
3.6623 + } && test -s conftest.$ac_objext; then
3.6624 + ac_hi=$ac_mid; break
3.6625 + else
3.6626 +- echo "$as_me: failed program was:" >&5
3.6627 ++ $as_echo "$as_me: failed program was:" >&5
3.6628 + sed 's/^/| /' conftest.$ac_ext >&5
3.6629 +
3.6630 + ac_lo=`expr $ac_mid + 1`
3.6631 +@@ -5856,7 +6313,7 @@
3.6632 + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3.6633 + done
3.6634 + else
3.6635 +- echo "$as_me: failed program was:" >&5
3.6636 ++ $as_echo "$as_me: failed program was:" >&5
3.6637 + sed 's/^/| /' conftest.$ac_ext >&5
3.6638 +
3.6639 + cat >conftest.$ac_ext <<_ACEOF
3.6640 +@@ -5866,11 +6323,10 @@
3.6641 + cat >>conftest.$ac_ext <<_ACEOF
3.6642 + /* end confdefs.h. */
3.6643 + $ac_includes_default
3.6644 +- typedef off_t ac__type_sizeof_;
3.6645 +-int
3.6646 +-main ()
3.6647 +-{
3.6648 +-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
3.6649 ++int
3.6650 ++main ()
3.6651 ++{
3.6652 ++static int test_array [1 - 2 * !(((long int) (sizeof (off_t))) < 0)];
3.6653 + test_array [0] = 0
3.6654 +
3.6655 + ;
3.6656 +@@ -5883,13 +6339,14 @@
3.6657 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.6658 + *) ac_try_echo=$ac_try;;
3.6659 + esac
3.6660 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.6661 +- (eval "$ac_compile") 2>conftest.er1
3.6662 +- ac_status=$?
3.6663 +- grep -v '^ *+' conftest.er1 >conftest.err
3.6664 +- rm -f conftest.er1
3.6665 +- cat conftest.err >&5
3.6666 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.6667 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.6668 ++$as_echo "$ac_try_echo") >&5
3.6669 ++ (eval "$ac_compile") 2>conftest.er1
3.6670 ++ ac_status=$?
3.6671 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.6672 ++ rm -f conftest.er1
3.6673 ++ cat conftest.err >&5
3.6674 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.6675 + (exit $ac_status); } && {
3.6676 + test -z "$ac_c_werror_flag" ||
3.6677 + test ! -s conftest.err
3.6678 +@@ -5903,11 +6360,10 @@
3.6679 + cat >>conftest.$ac_ext <<_ACEOF
3.6680 + /* end confdefs.h. */
3.6681 + $ac_includes_default
3.6682 +- typedef off_t ac__type_sizeof_;
3.6683 +-int
3.6684 +-main ()
3.6685 +-{
3.6686 +-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
3.6687 ++int
3.6688 ++main ()
3.6689 ++{
3.6690 ++static int test_array [1 - 2 * !(((long int) (sizeof (off_t))) >= $ac_mid)];
3.6691 + test_array [0] = 0
3.6692 +
3.6693 + ;
3.6694 +@@ -5920,20 +6376,21 @@
3.6695 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.6696 + *) ac_try_echo=$ac_try;;
3.6697 + esac
3.6698 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.6699 +- (eval "$ac_compile") 2>conftest.er1
3.6700 +- ac_status=$?
3.6701 +- grep -v '^ *+' conftest.er1 >conftest.err
3.6702 +- rm -f conftest.er1
3.6703 +- cat conftest.err >&5
3.6704 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.6705 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.6706 ++$as_echo "$ac_try_echo") >&5
3.6707 ++ (eval "$ac_compile") 2>conftest.er1
3.6708 ++ ac_status=$?
3.6709 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.6710 ++ rm -f conftest.er1
3.6711 ++ cat conftest.err >&5
3.6712 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.6713 + (exit $ac_status); } && {
3.6714 + test -z "$ac_c_werror_flag" ||
3.6715 + test ! -s conftest.err
3.6716 + } && test -s conftest.$ac_objext; then
3.6717 + ac_lo=$ac_mid; break
3.6718 + else
3.6719 +- echo "$as_me: failed program was:" >&5
3.6720 ++ $as_echo "$as_me: failed program was:" >&5
3.6721 + sed 's/^/| /' conftest.$ac_ext >&5
3.6722 +
3.6723 + ac_hi=`expr '(' $ac_mid ')' - 1`
3.6724 +@@ -5947,7 +6404,7 @@
3.6725 + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3.6726 + done
3.6727 + else
3.6728 +- echo "$as_me: failed program was:" >&5
3.6729 ++ $as_echo "$as_me: failed program was:" >&5
3.6730 + sed 's/^/| /' conftest.$ac_ext >&5
3.6731 +
3.6732 + ac_lo= ac_hi=
3.6733 +@@ -5967,11 +6424,10 @@
3.6734 + cat >>conftest.$ac_ext <<_ACEOF
3.6735 + /* end confdefs.h. */
3.6736 + $ac_includes_default
3.6737 +- typedef off_t ac__type_sizeof_;
3.6738 +-int
3.6739 +-main ()
3.6740 +-{
3.6741 +-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
3.6742 ++int
3.6743 ++main ()
3.6744 ++{
3.6745 ++static int test_array [1 - 2 * !(((long int) (sizeof (off_t))) <= $ac_mid)];
3.6746 + test_array [0] = 0
3.6747 +
3.6748 + ;
3.6749 +@@ -5984,20 +6440,21 @@
3.6750 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.6751 + *) ac_try_echo=$ac_try;;
3.6752 + esac
3.6753 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.6754 +- (eval "$ac_compile") 2>conftest.er1
3.6755 +- ac_status=$?
3.6756 +- grep -v '^ *+' conftest.er1 >conftest.err
3.6757 +- rm -f conftest.er1
3.6758 +- cat conftest.err >&5
3.6759 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.6760 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.6761 ++$as_echo "$ac_try_echo") >&5
3.6762 ++ (eval "$ac_compile") 2>conftest.er1
3.6763 ++ ac_status=$?
3.6764 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.6765 ++ rm -f conftest.er1
3.6766 ++ cat conftest.err >&5
3.6767 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.6768 + (exit $ac_status); } && {
3.6769 + test -z "$ac_c_werror_flag" ||
3.6770 + test ! -s conftest.err
3.6771 + } && test -s conftest.$ac_objext; then
3.6772 + ac_hi=$ac_mid
3.6773 + else
3.6774 +- echo "$as_me: failed program was:" >&5
3.6775 ++ $as_echo "$as_me: failed program was:" >&5
3.6776 + sed 's/^/| /' conftest.$ac_ext >&5
3.6777 +
3.6778 + ac_lo=`expr '(' $ac_mid ')' + 1`
3.6779 +@@ -6008,11 +6465,13 @@
3.6780 + case $ac_lo in
3.6781 + ?*) ac_cv_sizeof_off_t=$ac_lo;;
3.6782 + '') if test "$ac_cv_type_off_t" = yes; then
3.6783 +- { { echo "$as_me:$LINENO: error: cannot compute sizeof (off_t)
3.6784 ++ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
3.6785 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3.6786 ++{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (off_t)
3.6787 + See \`config.log' for more details." >&5
3.6788 +-echo "$as_me: error: cannot compute sizeof (off_t)
3.6789 ++$as_echo "$as_me: error: cannot compute sizeof (off_t)
3.6790 + See \`config.log' for more details." >&2;}
3.6791 +- { (exit 77); exit 77; }; }
3.6792 ++ { (exit 77); exit 77; }; }; }
3.6793 + else
3.6794 + ac_cv_sizeof_off_t=0
3.6795 + fi ;;
3.6796 +@@ -6025,9 +6484,8 @@
3.6797 + cat >>conftest.$ac_ext <<_ACEOF
3.6798 + /* end confdefs.h. */
3.6799 + $ac_includes_default
3.6800 +- typedef off_t ac__type_sizeof_;
3.6801 +-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
3.6802 +-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
3.6803 ++static long int longval () { return (long int) (sizeof (off_t)); }
3.6804 ++static unsigned long int ulongval () { return (long int) (sizeof (off_t)); }
3.6805 + #include <stdio.h>
3.6806 + #include <stdlib.h>
3.6807 + int
3.6808 +@@ -6037,20 +6495,22 @@
3.6809 + FILE *f = fopen ("conftest.val", "w");
3.6810 + if (! f)
3.6811 + return 1;
3.6812 +- if (((long int) (sizeof (ac__type_sizeof_))) < 0)
3.6813 ++ if (((long int) (sizeof (off_t))) < 0)
3.6814 + {
3.6815 + long int i = longval ();
3.6816 +- if (i != ((long int) (sizeof (ac__type_sizeof_))))
3.6817 ++ if (i != ((long int) (sizeof (off_t))))
3.6818 + return 1;
3.6819 +- fprintf (f, "%ld\n", i);
3.6820 ++ fprintf (f, "%ld", i);
3.6821 + }
3.6822 + else
3.6823 + {
3.6824 + unsigned long int i = ulongval ();
3.6825 +- if (i != ((long int) (sizeof (ac__type_sizeof_))))
3.6826 ++ if (i != ((long int) (sizeof (off_t))))
3.6827 + return 1;
3.6828 +- fprintf (f, "%lu\n", i);
3.6829 ++ fprintf (f, "%lu", i);
3.6830 + }
3.6831 ++ /* Do not output a trailing newline, as this causes \r\n confusion
3.6832 ++ on some platforms. */
3.6833 + return ferror (f) || fclose (f) != 0;
3.6834 +
3.6835 + ;
3.6836 +@@ -6063,43 +6523,48 @@
3.6837 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.6838 + *) ac_try_echo=$ac_try;;
3.6839 + esac
3.6840 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.6841 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.6842 ++$as_echo "$ac_try_echo") >&5
3.6843 + (eval "$ac_link") 2>&5
3.6844 + ac_status=$?
3.6845 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.6846 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.6847 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
3.6848 + { (case "(($ac_try" in
3.6849 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.6850 + *) ac_try_echo=$ac_try;;
3.6851 + esac
3.6852 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.6853 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.6854 ++$as_echo "$ac_try_echo") >&5
3.6855 + (eval "$ac_try") 2>&5
3.6856 + ac_status=$?
3.6857 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.6858 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.6859 + (exit $ac_status); }; }; then
3.6860 + ac_cv_sizeof_off_t=`cat conftest.val`
3.6861 + else
3.6862 +- echo "$as_me: program exited with status $ac_status" >&5
3.6863 +-echo "$as_me: failed program was:" >&5
3.6864 ++ $as_echo "$as_me: program exited with status $ac_status" >&5
3.6865 ++$as_echo "$as_me: failed program was:" >&5
3.6866 + sed 's/^/| /' conftest.$ac_ext >&5
3.6867 +
3.6868 + ( exit $ac_status )
3.6869 + if test "$ac_cv_type_off_t" = yes; then
3.6870 +- { { echo "$as_me:$LINENO: error: cannot compute sizeof (off_t)
3.6871 ++ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
3.6872 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3.6873 ++{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (off_t)
3.6874 + See \`config.log' for more details." >&5
3.6875 +-echo "$as_me: error: cannot compute sizeof (off_t)
3.6876 ++$as_echo "$as_me: error: cannot compute sizeof (off_t)
3.6877 + See \`config.log' for more details." >&2;}
3.6878 +- { (exit 77); exit 77; }; }
3.6879 ++ { (exit 77); exit 77; }; }; }
3.6880 + else
3.6881 + ac_cv_sizeof_off_t=0
3.6882 + fi
3.6883 + fi
3.6884 ++rm -rf conftest.dSYM
3.6885 + rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
3.6886 + fi
3.6887 + rm -f conftest.val
3.6888 + fi
3.6889 +-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_off_t" >&5
3.6890 +-echo "${ECHO_T}$ac_cv_sizeof_off_t" >&6; }
3.6891 ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_off_t" >&5
3.6892 ++$as_echo "$ac_cv_sizeof_off_t" >&6; }
3.6893 +
3.6894 +
3.6895 +
3.6896 +@@ -6109,10 +6574,10 @@
3.6897 +
3.6898 +
3.6899 + CPPFLAGS="$oasys_ac_cppflags_save"
3.6900 +- { echo "$as_me:$LINENO: checking return type of signal handlers" >&5
3.6901 +-echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6; }
3.6902 ++ { $as_echo "$as_me:$LINENO: checking return type of signal handlers" >&5
3.6903 ++$as_echo_n "checking return type of signal handlers... " >&6; }
3.6904 + if test "${ac_cv_type_signal+set}" = set; then
3.6905 +- echo $ECHO_N "(cached) $ECHO_C" >&6
3.6906 ++ $as_echo_n "(cached) " >&6
3.6907 + else
3.6908 + cat >conftest.$ac_ext <<_ACEOF
3.6909 + /* confdefs.h. */
3.6910 +@@ -6137,20 +6602,21 @@
3.6911 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.6912 + *) ac_try_echo=$ac_try;;
3.6913 + esac
3.6914 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.6915 +- (eval "$ac_compile") 2>conftest.er1
3.6916 +- ac_status=$?
3.6917 +- grep -v '^ *+' conftest.er1 >conftest.err
3.6918 +- rm -f conftest.er1
3.6919 +- cat conftest.err >&5
3.6920 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.6921 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.6922 ++$as_echo "$ac_try_echo") >&5
3.6923 ++ (eval "$ac_compile") 2>conftest.er1
3.6924 ++ ac_status=$?
3.6925 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.6926 ++ rm -f conftest.er1
3.6927 ++ cat conftest.err >&5
3.6928 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.6929 + (exit $ac_status); } && {
3.6930 + test -z "$ac_c_werror_flag" ||
3.6931 + test ! -s conftest.err
3.6932 + } && test -s conftest.$ac_objext; then
3.6933 + ac_cv_type_signal=int
3.6934 + else
3.6935 +- echo "$as_me: failed program was:" >&5
3.6936 ++ $as_echo "$as_me: failed program was:" >&5
3.6937 + sed 's/^/| /' conftest.$ac_ext >&5
3.6938 +
3.6939 + ac_cv_type_signal=void
3.6940 +@@ -6158,68 +6624,109 @@
3.6941 +
3.6942 + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3.6943 + fi
3.6944 +-{ echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
3.6945 +-echo "${ECHO_T}$ac_cv_type_signal" >&6; }
3.6946 ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
3.6947 ++$as_echo "$ac_cv_type_signal" >&6; }
3.6948 +
3.6949 + cat >>confdefs.h <<_ACEOF
3.6950 + #define RETSIGTYPE $ac_cv_type_signal
3.6951 + _ACEOF
3.6952 +
3.6953 +
3.6954 +- { echo "$as_me:$LINENO: checking for size_t" >&5
3.6955 +-echo $ECHO_N "checking for size_t... $ECHO_C" >&6; }
3.6956 ++ { $as_echo "$as_me:$LINENO: checking for size_t" >&5
3.6957 ++$as_echo_n "checking for size_t... " >&6; }
3.6958 + if test "${ac_cv_type_size_t+set}" = set; then
3.6959 +- echo $ECHO_N "(cached) $ECHO_C" >&6
3.6960 +-else
3.6961 +- cat >conftest.$ac_ext <<_ACEOF
3.6962 +-/* confdefs.h. */
3.6963 +-_ACEOF
3.6964 +-cat confdefs.h >>conftest.$ac_ext
3.6965 +-cat >>conftest.$ac_ext <<_ACEOF
3.6966 +-/* end confdefs.h. */
3.6967 +-$ac_includes_default
3.6968 +-typedef size_t ac__type_new_;
3.6969 +-int
3.6970 +-main ()
3.6971 +-{
3.6972 +-if ((ac__type_new_ *) 0)
3.6973 +- return 0;
3.6974 +-if (sizeof (ac__type_new_))
3.6975 +- return 0;
3.6976 +- ;
3.6977 +- return 0;
3.6978 +-}
3.6979 +-_ACEOF
3.6980 +-rm -f conftest.$ac_objext
3.6981 +-if { (ac_try="$ac_compile"
3.6982 +-case "(($ac_try" in
3.6983 +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.6984 +- *) ac_try_echo=$ac_try;;
3.6985 +-esac
3.6986 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.6987 +- (eval "$ac_compile") 2>conftest.er1
3.6988 +- ac_status=$?
3.6989 +- grep -v '^ *+' conftest.er1 >conftest.err
3.6990 +- rm -f conftest.er1
3.6991 +- cat conftest.err >&5
3.6992 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.6993 +- (exit $ac_status); } && {
3.6994 +- test -z "$ac_c_werror_flag" ||
3.6995 +- test ! -s conftest.err
3.6996 +- } && test -s conftest.$ac_objext; then
3.6997 +- ac_cv_type_size_t=yes
3.6998 +-else
3.6999 +- echo "$as_me: failed program was:" >&5
3.7000 +-sed 's/^/| /' conftest.$ac_ext >&5
3.7001 +-
3.7002 +- ac_cv_type_size_t=no
3.7003 +-fi
3.7004 +-
3.7005 +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3.7006 +-fi
3.7007 +-{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
3.7008 +-echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
3.7009 +-if test $ac_cv_type_size_t = yes; then
3.7010 ++ $as_echo_n "(cached) " >&6
3.7011 ++else
3.7012 ++ ac_cv_type_size_t=no
3.7013 ++cat >conftest.$ac_ext <<_ACEOF
3.7014 ++/* confdefs.h. */
3.7015 ++_ACEOF
3.7016 ++cat confdefs.h >>conftest.$ac_ext
3.7017 ++cat >>conftest.$ac_ext <<_ACEOF
3.7018 ++/* end confdefs.h. */
3.7019 ++$ac_includes_default
3.7020 ++int
3.7021 ++main ()
3.7022 ++{
3.7023 ++if (sizeof (size_t))
3.7024 ++ return 0;
3.7025 ++ ;
3.7026 ++ return 0;
3.7027 ++}
3.7028 ++_ACEOF
3.7029 ++rm -f conftest.$ac_objext
3.7030 ++if { (ac_try="$ac_compile"
3.7031 ++case "(($ac_try" in
3.7032 ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.7033 ++ *) ac_try_echo=$ac_try;;
3.7034 ++esac
3.7035 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.7036 ++$as_echo "$ac_try_echo") >&5
3.7037 ++ (eval "$ac_compile") 2>conftest.er1
3.7038 ++ ac_status=$?
3.7039 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.7040 ++ rm -f conftest.er1
3.7041 ++ cat conftest.err >&5
3.7042 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.7043 ++ (exit $ac_status); } && {
3.7044 ++ test -z "$ac_c_werror_flag" ||
3.7045 ++ test ! -s conftest.err
3.7046 ++ } && test -s conftest.$ac_objext; then
3.7047 ++ cat >conftest.$ac_ext <<_ACEOF
3.7048 ++/* confdefs.h. */
3.7049 ++_ACEOF
3.7050 ++cat confdefs.h >>conftest.$ac_ext
3.7051 ++cat >>conftest.$ac_ext <<_ACEOF
3.7052 ++/* end confdefs.h. */
3.7053 ++$ac_includes_default
3.7054 ++int
3.7055 ++main ()
3.7056 ++{
3.7057 ++if (sizeof ((size_t)))
3.7058 ++ return 0;
3.7059 ++ ;
3.7060 ++ return 0;
3.7061 ++}
3.7062 ++_ACEOF
3.7063 ++rm -f conftest.$ac_objext
3.7064 ++if { (ac_try="$ac_compile"
3.7065 ++case "(($ac_try" in
3.7066 ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.7067 ++ *) ac_try_echo=$ac_try;;
3.7068 ++esac
3.7069 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.7070 ++$as_echo "$ac_try_echo") >&5
3.7071 ++ (eval "$ac_compile") 2>conftest.er1
3.7072 ++ ac_status=$?
3.7073 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.7074 ++ rm -f conftest.er1
3.7075 ++ cat conftest.err >&5
3.7076 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.7077 ++ (exit $ac_status); } && {
3.7078 ++ test -z "$ac_c_werror_flag" ||
3.7079 ++ test ! -s conftest.err
3.7080 ++ } && test -s conftest.$ac_objext; then
3.7081 ++ :
3.7082 ++else
3.7083 ++ $as_echo "$as_me: failed program was:" >&5
3.7084 ++sed 's/^/| /' conftest.$ac_ext >&5
3.7085 ++
3.7086 ++ ac_cv_type_size_t=yes
3.7087 ++fi
3.7088 ++
3.7089 ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3.7090 ++else
3.7091 ++ $as_echo "$as_me: failed program was:" >&5
3.7092 ++sed 's/^/| /' conftest.$ac_ext >&5
3.7093 ++
3.7094 ++
3.7095 ++fi
3.7096 ++
3.7097 ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3.7098 ++fi
3.7099 ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
3.7100 ++$as_echo "$ac_cv_type_size_t" >&6; }
3.7101 ++if test "x$ac_cv_type_size_t" = x""yes; then
3.7102 + :
3.7103 + else
3.7104 +
3.7105 +@@ -6229,60 +6736,101 @@
3.7106 +
3.7107 + fi
3.7108 +
3.7109 +- { echo "$as_me:$LINENO: checking for ptrdiff_t" >&5
3.7110 +-echo $ECHO_N "checking for ptrdiff_t... $ECHO_C" >&6; }
3.7111 ++ { $as_echo "$as_me:$LINENO: checking for ptrdiff_t" >&5
3.7112 ++$as_echo_n "checking for ptrdiff_t... " >&6; }
3.7113 + if test "${ac_cv_type_ptrdiff_t+set}" = set; then
3.7114 +- echo $ECHO_N "(cached) $ECHO_C" >&6
3.7115 +-else
3.7116 +- cat >conftest.$ac_ext <<_ACEOF
3.7117 +-/* confdefs.h. */
3.7118 +-_ACEOF
3.7119 +-cat confdefs.h >>conftest.$ac_ext
3.7120 +-cat >>conftest.$ac_ext <<_ACEOF
3.7121 +-/* end confdefs.h. */
3.7122 +-$ac_includes_default
3.7123 +-typedef ptrdiff_t ac__type_new_;
3.7124 +-int
3.7125 +-main ()
3.7126 +-{
3.7127 +-if ((ac__type_new_ *) 0)
3.7128 +- return 0;
3.7129 +-if (sizeof (ac__type_new_))
3.7130 +- return 0;
3.7131 +- ;
3.7132 +- return 0;
3.7133 +-}
3.7134 +-_ACEOF
3.7135 +-rm -f conftest.$ac_objext
3.7136 +-if { (ac_try="$ac_compile"
3.7137 +-case "(($ac_try" in
3.7138 +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.7139 +- *) ac_try_echo=$ac_try;;
3.7140 +-esac
3.7141 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.7142 +- (eval "$ac_compile") 2>conftest.er1
3.7143 +- ac_status=$?
3.7144 +- grep -v '^ *+' conftest.er1 >conftest.err
3.7145 +- rm -f conftest.er1
3.7146 +- cat conftest.err >&5
3.7147 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.7148 +- (exit $ac_status); } && {
3.7149 +- test -z "$ac_c_werror_flag" ||
3.7150 +- test ! -s conftest.err
3.7151 +- } && test -s conftest.$ac_objext; then
3.7152 +- ac_cv_type_ptrdiff_t=yes
3.7153 +-else
3.7154 +- echo "$as_me: failed program was:" >&5
3.7155 +-sed 's/^/| /' conftest.$ac_ext >&5
3.7156 +-
3.7157 +- ac_cv_type_ptrdiff_t=no
3.7158 +-fi
3.7159 +-
3.7160 +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3.7161 +-fi
3.7162 +-{ echo "$as_me:$LINENO: result: $ac_cv_type_ptrdiff_t" >&5
3.7163 +-echo "${ECHO_T}$ac_cv_type_ptrdiff_t" >&6; }
3.7164 +-if test $ac_cv_type_ptrdiff_t = yes; then
3.7165 ++ $as_echo_n "(cached) " >&6
3.7166 ++else
3.7167 ++ ac_cv_type_ptrdiff_t=no
3.7168 ++cat >conftest.$ac_ext <<_ACEOF
3.7169 ++/* confdefs.h. */
3.7170 ++_ACEOF
3.7171 ++cat confdefs.h >>conftest.$ac_ext
3.7172 ++cat >>conftest.$ac_ext <<_ACEOF
3.7173 ++/* end confdefs.h. */
3.7174 ++$ac_includes_default
3.7175 ++int
3.7176 ++main ()
3.7177 ++{
3.7178 ++if (sizeof (ptrdiff_t))
3.7179 ++ return 0;
3.7180 ++ ;
3.7181 ++ return 0;
3.7182 ++}
3.7183 ++_ACEOF
3.7184 ++rm -f conftest.$ac_objext
3.7185 ++if { (ac_try="$ac_compile"
3.7186 ++case "(($ac_try" in
3.7187 ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.7188 ++ *) ac_try_echo=$ac_try;;
3.7189 ++esac
3.7190 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.7191 ++$as_echo "$ac_try_echo") >&5
3.7192 ++ (eval "$ac_compile") 2>conftest.er1
3.7193 ++ ac_status=$?
3.7194 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.7195 ++ rm -f conftest.er1
3.7196 ++ cat conftest.err >&5
3.7197 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.7198 ++ (exit $ac_status); } && {
3.7199 ++ test -z "$ac_c_werror_flag" ||
3.7200 ++ test ! -s conftest.err
3.7201 ++ } && test -s conftest.$ac_objext; then
3.7202 ++ cat >conftest.$ac_ext <<_ACEOF
3.7203 ++/* confdefs.h. */
3.7204 ++_ACEOF
3.7205 ++cat confdefs.h >>conftest.$ac_ext
3.7206 ++cat >>conftest.$ac_ext <<_ACEOF
3.7207 ++/* end confdefs.h. */
3.7208 ++$ac_includes_default
3.7209 ++int
3.7210 ++main ()
3.7211 ++{
3.7212 ++if (sizeof ((ptrdiff_t)))
3.7213 ++ return 0;
3.7214 ++ ;
3.7215 ++ return 0;
3.7216 ++}
3.7217 ++_ACEOF
3.7218 ++rm -f conftest.$ac_objext
3.7219 ++if { (ac_try="$ac_compile"
3.7220 ++case "(($ac_try" in
3.7221 ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.7222 ++ *) ac_try_echo=$ac_try;;
3.7223 ++esac
3.7224 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.7225 ++$as_echo "$ac_try_echo") >&5
3.7226 ++ (eval "$ac_compile") 2>conftest.er1
3.7227 ++ ac_status=$?
3.7228 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.7229 ++ rm -f conftest.er1
3.7230 ++ cat conftest.err >&5
3.7231 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.7232 ++ (exit $ac_status); } && {
3.7233 ++ test -z "$ac_c_werror_flag" ||
3.7234 ++ test ! -s conftest.err
3.7235 ++ } && test -s conftest.$ac_objext; then
3.7236 ++ :
3.7237 ++else
3.7238 ++ $as_echo "$as_me: failed program was:" >&5
3.7239 ++sed 's/^/| /' conftest.$ac_ext >&5
3.7240 ++
3.7241 ++ ac_cv_type_ptrdiff_t=yes
3.7242 ++fi
3.7243 ++
3.7244 ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3.7245 ++else
3.7246 ++ $as_echo "$as_me: failed program was:" >&5
3.7247 ++sed 's/^/| /' conftest.$ac_ext >&5
3.7248 ++
3.7249 ++
3.7250 ++fi
3.7251 ++
3.7252 ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3.7253 ++fi
3.7254 ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_ptrdiff_t" >&5
3.7255 ++$as_echo "$ac_cv_type_ptrdiff_t" >&6; }
3.7256 ++if test "x$ac_cv_type_ptrdiff_t" = x""yes; then
3.7257 +
3.7258 + cat >>confdefs.h <<_ACEOF
3.7259 + #define HAVE_PTRDIFF_T 1
3.7260 +@@ -6291,60 +6839,101 @@
3.7261 +
3.7262 + fi
3.7263 +
3.7264 +- { echo "$as_me:$LINENO: checking for uint32_t" >&5
3.7265 +-echo $ECHO_N "checking for uint32_t... $ECHO_C" >&6; }
3.7266 ++ { $as_echo "$as_me:$LINENO: checking for uint32_t" >&5
3.7267 ++$as_echo_n "checking for uint32_t... " >&6; }
3.7268 + if test "${ac_cv_type_uint32_t+set}" = set; then
3.7269 +- echo $ECHO_N "(cached) $ECHO_C" >&6
3.7270 +-else
3.7271 +- cat >conftest.$ac_ext <<_ACEOF
3.7272 +-/* confdefs.h. */
3.7273 +-_ACEOF
3.7274 +-cat confdefs.h >>conftest.$ac_ext
3.7275 +-cat >>conftest.$ac_ext <<_ACEOF
3.7276 +-/* end confdefs.h. */
3.7277 +-$ac_includes_default
3.7278 +-typedef uint32_t ac__type_new_;
3.7279 +-int
3.7280 +-main ()
3.7281 +-{
3.7282 +-if ((ac__type_new_ *) 0)
3.7283 +- return 0;
3.7284 +-if (sizeof (ac__type_new_))
3.7285 +- return 0;
3.7286 +- ;
3.7287 +- return 0;
3.7288 +-}
3.7289 +-_ACEOF
3.7290 +-rm -f conftest.$ac_objext
3.7291 +-if { (ac_try="$ac_compile"
3.7292 +-case "(($ac_try" in
3.7293 +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.7294 +- *) ac_try_echo=$ac_try;;
3.7295 +-esac
3.7296 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.7297 +- (eval "$ac_compile") 2>conftest.er1
3.7298 +- ac_status=$?
3.7299 +- grep -v '^ *+' conftest.er1 >conftest.err
3.7300 +- rm -f conftest.er1
3.7301 +- cat conftest.err >&5
3.7302 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.7303 +- (exit $ac_status); } && {
3.7304 +- test -z "$ac_c_werror_flag" ||
3.7305 +- test ! -s conftest.err
3.7306 +- } && test -s conftest.$ac_objext; then
3.7307 +- ac_cv_type_uint32_t=yes
3.7308 +-else
3.7309 +- echo "$as_me: failed program was:" >&5
3.7310 +-sed 's/^/| /' conftest.$ac_ext >&5
3.7311 +-
3.7312 +- ac_cv_type_uint32_t=no
3.7313 +-fi
3.7314 +-
3.7315 +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3.7316 +-fi
3.7317 +-{ echo "$as_me:$LINENO: result: $ac_cv_type_uint32_t" >&5
3.7318 +-echo "${ECHO_T}$ac_cv_type_uint32_t" >&6; }
3.7319 +-if test $ac_cv_type_uint32_t = yes; then
3.7320 ++ $as_echo_n "(cached) " >&6
3.7321 ++else
3.7322 ++ ac_cv_type_uint32_t=no
3.7323 ++cat >conftest.$ac_ext <<_ACEOF
3.7324 ++/* confdefs.h. */
3.7325 ++_ACEOF
3.7326 ++cat confdefs.h >>conftest.$ac_ext
3.7327 ++cat >>conftest.$ac_ext <<_ACEOF
3.7328 ++/* end confdefs.h. */
3.7329 ++$ac_includes_default
3.7330 ++int
3.7331 ++main ()
3.7332 ++{
3.7333 ++if (sizeof (uint32_t))
3.7334 ++ return 0;
3.7335 ++ ;
3.7336 ++ return 0;
3.7337 ++}
3.7338 ++_ACEOF
3.7339 ++rm -f conftest.$ac_objext
3.7340 ++if { (ac_try="$ac_compile"
3.7341 ++case "(($ac_try" in
3.7342 ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.7343 ++ *) ac_try_echo=$ac_try;;
3.7344 ++esac
3.7345 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.7346 ++$as_echo "$ac_try_echo") >&5
3.7347 ++ (eval "$ac_compile") 2>conftest.er1
3.7348 ++ ac_status=$?
3.7349 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.7350 ++ rm -f conftest.er1
3.7351 ++ cat conftest.err >&5
3.7352 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.7353 ++ (exit $ac_status); } && {
3.7354 ++ test -z "$ac_c_werror_flag" ||
3.7355 ++ test ! -s conftest.err
3.7356 ++ } && test -s conftest.$ac_objext; then
3.7357 ++ cat >conftest.$ac_ext <<_ACEOF
3.7358 ++/* confdefs.h. */
3.7359 ++_ACEOF
3.7360 ++cat confdefs.h >>conftest.$ac_ext
3.7361 ++cat >>conftest.$ac_ext <<_ACEOF
3.7362 ++/* end confdefs.h. */
3.7363 ++$ac_includes_default
3.7364 ++int
3.7365 ++main ()
3.7366 ++{
3.7367 ++if (sizeof ((uint32_t)))
3.7368 ++ return 0;
3.7369 ++ ;
3.7370 ++ return 0;
3.7371 ++}
3.7372 ++_ACEOF
3.7373 ++rm -f conftest.$ac_objext
3.7374 ++if { (ac_try="$ac_compile"
3.7375 ++case "(($ac_try" in
3.7376 ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.7377 ++ *) ac_try_echo=$ac_try;;
3.7378 ++esac
3.7379 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.7380 ++$as_echo "$ac_try_echo") >&5
3.7381 ++ (eval "$ac_compile") 2>conftest.er1
3.7382 ++ ac_status=$?
3.7383 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.7384 ++ rm -f conftest.er1
3.7385 ++ cat conftest.err >&5
3.7386 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.7387 ++ (exit $ac_status); } && {
3.7388 ++ test -z "$ac_c_werror_flag" ||
3.7389 ++ test ! -s conftest.err
3.7390 ++ } && test -s conftest.$ac_objext; then
3.7391 ++ :
3.7392 ++else
3.7393 ++ $as_echo "$as_me: failed program was:" >&5
3.7394 ++sed 's/^/| /' conftest.$ac_ext >&5
3.7395 ++
3.7396 ++ ac_cv_type_uint32_t=yes
3.7397 ++fi
3.7398 ++
3.7399 ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3.7400 ++else
3.7401 ++ $as_echo "$as_me: failed program was:" >&5
3.7402 ++sed 's/^/| /' conftest.$ac_ext >&5
3.7403 ++
3.7404 ++
3.7405 ++fi
3.7406 ++
3.7407 ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3.7408 ++fi
3.7409 ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uint32_t" >&5
3.7410 ++$as_echo "$ac_cv_type_uint32_t" >&6; }
3.7411 ++if test "x$ac_cv_type_uint32_t" = x""yes; then
3.7412 +
3.7413 + cat >>confdefs.h <<_ACEOF
3.7414 + #define HAVE_UINT32_T 1
3.7415 +@@ -6353,60 +6942,101 @@
3.7416 +
3.7417 + fi
3.7418 +
3.7419 +- { echo "$as_me:$LINENO: checking for u_int32_t" >&5
3.7420 +-echo $ECHO_N "checking for u_int32_t... $ECHO_C" >&6; }
3.7421 ++ { $as_echo "$as_me:$LINENO: checking for u_int32_t" >&5
3.7422 ++$as_echo_n "checking for u_int32_t... " >&6; }
3.7423 + if test "${ac_cv_type_u_int32_t+set}" = set; then
3.7424 +- echo $ECHO_N "(cached) $ECHO_C" >&6
3.7425 +-else
3.7426 +- cat >conftest.$ac_ext <<_ACEOF
3.7427 +-/* confdefs.h. */
3.7428 +-_ACEOF
3.7429 +-cat confdefs.h >>conftest.$ac_ext
3.7430 +-cat >>conftest.$ac_ext <<_ACEOF
3.7431 +-/* end confdefs.h. */
3.7432 +-$ac_includes_default
3.7433 +-typedef u_int32_t ac__type_new_;
3.7434 +-int
3.7435 +-main ()
3.7436 +-{
3.7437 +-if ((ac__type_new_ *) 0)
3.7438 +- return 0;
3.7439 +-if (sizeof (ac__type_new_))
3.7440 +- return 0;
3.7441 +- ;
3.7442 +- return 0;
3.7443 +-}
3.7444 +-_ACEOF
3.7445 +-rm -f conftest.$ac_objext
3.7446 +-if { (ac_try="$ac_compile"
3.7447 +-case "(($ac_try" in
3.7448 +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.7449 +- *) ac_try_echo=$ac_try;;
3.7450 +-esac
3.7451 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.7452 +- (eval "$ac_compile") 2>conftest.er1
3.7453 +- ac_status=$?
3.7454 +- grep -v '^ *+' conftest.er1 >conftest.err
3.7455 +- rm -f conftest.er1
3.7456 +- cat conftest.err >&5
3.7457 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.7458 +- (exit $ac_status); } && {
3.7459 +- test -z "$ac_c_werror_flag" ||
3.7460 +- test ! -s conftest.err
3.7461 +- } && test -s conftest.$ac_objext; then
3.7462 +- ac_cv_type_u_int32_t=yes
3.7463 +-else
3.7464 +- echo "$as_me: failed program was:" >&5
3.7465 +-sed 's/^/| /' conftest.$ac_ext >&5
3.7466 +-
3.7467 +- ac_cv_type_u_int32_t=no
3.7468 +-fi
3.7469 +-
3.7470 +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3.7471 +-fi
3.7472 +-{ echo "$as_me:$LINENO: result: $ac_cv_type_u_int32_t" >&5
3.7473 +-echo "${ECHO_T}$ac_cv_type_u_int32_t" >&6; }
3.7474 +-if test $ac_cv_type_u_int32_t = yes; then
3.7475 ++ $as_echo_n "(cached) " >&6
3.7476 ++else
3.7477 ++ ac_cv_type_u_int32_t=no
3.7478 ++cat >conftest.$ac_ext <<_ACEOF
3.7479 ++/* confdefs.h. */
3.7480 ++_ACEOF
3.7481 ++cat confdefs.h >>conftest.$ac_ext
3.7482 ++cat >>conftest.$ac_ext <<_ACEOF
3.7483 ++/* end confdefs.h. */
3.7484 ++$ac_includes_default
3.7485 ++int
3.7486 ++main ()
3.7487 ++{
3.7488 ++if (sizeof (u_int32_t))
3.7489 ++ return 0;
3.7490 ++ ;
3.7491 ++ return 0;
3.7492 ++}
3.7493 ++_ACEOF
3.7494 ++rm -f conftest.$ac_objext
3.7495 ++if { (ac_try="$ac_compile"
3.7496 ++case "(($ac_try" in
3.7497 ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.7498 ++ *) ac_try_echo=$ac_try;;
3.7499 ++esac
3.7500 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.7501 ++$as_echo "$ac_try_echo") >&5
3.7502 ++ (eval "$ac_compile") 2>conftest.er1
3.7503 ++ ac_status=$?
3.7504 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.7505 ++ rm -f conftest.er1
3.7506 ++ cat conftest.err >&5
3.7507 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.7508 ++ (exit $ac_status); } && {
3.7509 ++ test -z "$ac_c_werror_flag" ||
3.7510 ++ test ! -s conftest.err
3.7511 ++ } && test -s conftest.$ac_objext; then
3.7512 ++ cat >conftest.$ac_ext <<_ACEOF
3.7513 ++/* confdefs.h. */
3.7514 ++_ACEOF
3.7515 ++cat confdefs.h >>conftest.$ac_ext
3.7516 ++cat >>conftest.$ac_ext <<_ACEOF
3.7517 ++/* end confdefs.h. */
3.7518 ++$ac_includes_default
3.7519 ++int
3.7520 ++main ()
3.7521 ++{
3.7522 ++if (sizeof ((u_int32_t)))
3.7523 ++ return 0;
3.7524 ++ ;
3.7525 ++ return 0;
3.7526 ++}
3.7527 ++_ACEOF
3.7528 ++rm -f conftest.$ac_objext
3.7529 ++if { (ac_try="$ac_compile"
3.7530 ++case "(($ac_try" in
3.7531 ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.7532 ++ *) ac_try_echo=$ac_try;;
3.7533 ++esac
3.7534 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.7535 ++$as_echo "$ac_try_echo") >&5
3.7536 ++ (eval "$ac_compile") 2>conftest.er1
3.7537 ++ ac_status=$?
3.7538 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.7539 ++ rm -f conftest.er1
3.7540 ++ cat conftest.err >&5
3.7541 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.7542 ++ (exit $ac_status); } && {
3.7543 ++ test -z "$ac_c_werror_flag" ||
3.7544 ++ test ! -s conftest.err
3.7545 ++ } && test -s conftest.$ac_objext; then
3.7546 ++ :
3.7547 ++else
3.7548 ++ $as_echo "$as_me: failed program was:" >&5
3.7549 ++sed 's/^/| /' conftest.$ac_ext >&5
3.7550 ++
3.7551 ++ ac_cv_type_u_int32_t=yes
3.7552 ++fi
3.7553 ++
3.7554 ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3.7555 ++else
3.7556 ++ $as_echo "$as_me: failed program was:" >&5
3.7557 ++sed 's/^/| /' conftest.$ac_ext >&5
3.7558 ++
3.7559 ++
3.7560 ++fi
3.7561 ++
3.7562 ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3.7563 ++fi
3.7564 ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_u_int32_t" >&5
3.7565 ++$as_echo "$ac_cv_type_u_int32_t" >&6; }
3.7566 ++if test "x$ac_cv_type_u_int32_t" = x""yes; then
3.7567 +
3.7568 + cat >>confdefs.h <<_ACEOF
3.7569 + #define HAVE_U_INT32_T 1
3.7570 +@@ -6423,17 +7053,13 @@
3.7571 +
3.7572 +
3.7573 +
3.7574 +-
3.7575 +-
3.7576 +-
3.7577 +-
3.7578 +-for ac_func in fdatasync getaddrinfo gethostbyname gethostbyname_r getopt_long inet_aton inet_pton pthread_yield sched_yield
3.7579 +-do
3.7580 +-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
3.7581 +-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
3.7582 +-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
3.7583 ++for ac_func in fdatasync getaddrinfo getopt_long cfmakeraw cfsetspeed
3.7584 ++do
3.7585 ++as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
3.7586 ++{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
3.7587 ++$as_echo_n "checking for $ac_func... " >&6; }
3.7588 + if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
3.7589 +- echo $ECHO_N "(cached) $ECHO_C" >&6
3.7590 ++ $as_echo_n "(cached) " >&6
3.7591 + else
3.7592 + cat >conftest.$ac_ext <<_ACEOF
3.7593 + /* confdefs.h. */
3.7594 +@@ -6486,35 +7112,42 @@
3.7595 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.7596 + *) ac_try_echo=$ac_try;;
3.7597 + esac
3.7598 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.7599 +- (eval "$ac_link") 2>conftest.er1
3.7600 +- ac_status=$?
3.7601 +- grep -v '^ *+' conftest.er1 >conftest.err
3.7602 +- rm -f conftest.er1
3.7603 +- cat conftest.err >&5
3.7604 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.7605 +- (exit $ac_status); } && {
3.7606 +- test -z "$ac_c_werror_flag" ||
3.7607 +- test ! -s conftest.err
3.7608 +- } && test -s conftest$ac_exeext &&
3.7609 +- $as_test_x conftest$ac_exeext; then
3.7610 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.7611 ++$as_echo "$ac_try_echo") >&5
3.7612 ++ (eval "$ac_link") 2>conftest.er1
3.7613 ++ ac_status=$?
3.7614 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.7615 ++ rm -f conftest.er1
3.7616 ++ cat conftest.err >&5
3.7617 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.7618 ++ (exit $ac_status); } && {
3.7619 ++ test -z "$ac_c_werror_flag" ||
3.7620 ++ test ! -s conftest.err
3.7621 ++ } && test -s conftest$ac_exeext && {
3.7622 ++ test "$cross_compiling" = yes ||
3.7623 ++ $as_test_x conftest$ac_exeext
3.7624 ++ }; then
3.7625 + eval "$as_ac_var=yes"
3.7626 + else
3.7627 +- echo "$as_me: failed program was:" >&5
3.7628 ++ $as_echo "$as_me: failed program was:" >&5
3.7629 + sed 's/^/| /' conftest.$ac_ext >&5
3.7630 +
3.7631 + eval "$as_ac_var=no"
3.7632 + fi
3.7633 +
3.7634 +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
3.7635 +- conftest$ac_exeext conftest.$ac_ext
3.7636 +-fi
3.7637 +-ac_res=`eval echo '${'$as_ac_var'}'`
3.7638 +- { echo "$as_me:$LINENO: result: $ac_res" >&5
3.7639 +-echo "${ECHO_T}$ac_res" >&6; }
3.7640 +-if test `eval echo '${'$as_ac_var'}'` = yes; then
3.7641 ++rm -rf conftest.dSYM
3.7642 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
3.7643 ++ conftest$ac_exeext conftest.$ac_ext
3.7644 ++fi
3.7645 ++ac_res=`eval 'as_val=${'$as_ac_var'}
3.7646 ++ $as_echo "$as_val"'`
3.7647 ++ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
3.7648 ++$as_echo "$ac_res" >&6; }
3.7649 ++as_val=`eval 'as_val=${'$as_ac_var'}
3.7650 ++ $as_echo "$as_val"'`
3.7651 ++ if test "x$as_val" = x""yes; then
3.7652 + cat >>confdefs.h <<_ACEOF
3.7653 +-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
3.7654 ++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
3.7655 + _ACEOF
3.7656 +
3.7657 + fi
3.7658 +@@ -6531,18 +7164,18 @@
3.7659 + fi
3.7660 +
3.7661 +
3.7662 +- { echo "$as_me:$LINENO: checking whether to compile with non-atomic \"atomic\" routines" >&5
3.7663 +-echo $ECHO_N "checking whether to compile with non-atomic \"atomic\" routines... $ECHO_C" >&6; }
3.7664 +- { echo "$as_me:$LINENO: result: $atomic_nonatomic" >&5
3.7665 +-echo "${ECHO_T}$atomic_nonatomic" >&6; }
3.7666 ++ { $as_echo "$as_me:$LINENO: checking whether to compile with non-atomic \"atomic\" routines" >&5
3.7667 ++$as_echo_n "checking whether to compile with non-atomic \"atomic\" routines... " >&6; }
3.7668 ++ { $as_echo "$as_me:$LINENO: result: $atomic_nonatomic" >&5
3.7669 ++$as_echo "$atomic_nonatomic" >&6; }
3.7670 +
3.7671 + if test $atomic_nonatomic = yes ; then
3.7672 +- { echo "$as_me:$LINENO: ***" >&5
3.7673 +-echo "$as_me: ***" >&6;}
3.7674 +- { echo "$as_me:$LINENO: *** WARNING: non-atomic \"atomic\" routines are for testing only ***" >&5
3.7675 +-echo "$as_me: *** WARNING: non-atomic \"atomic\" routines are for testing only ***" >&6;}
3.7676 +- { echo "$as_me:$LINENO: ***" >&5
3.7677 +-echo "$as_me: ***" >&6;}
3.7678 ++ { $as_echo "$as_me:$LINENO: ***" >&5
3.7679 ++$as_echo "$as_me: ***" >&6;}
3.7680 ++ { $as_echo "$as_me:$LINENO: *** WARNING: non-atomic \"atomic\" routines are for testing only ***" >&5
3.7681 ++$as_echo "$as_me: *** WARNING: non-atomic \"atomic\" routines are for testing only ***" >&6;}
3.7682 ++ { $as_echo "$as_me:$LINENO: ***" >&5
3.7683 ++$as_echo "$as_me: ***" >&6;}
3.7684 +
3.7685 +
3.7686 + cat >>confdefs.h <<_ACEOF
3.7687 +@@ -6559,10 +7192,10 @@
3.7688 + fi
3.7689 +
3.7690 +
3.7691 +- { echo "$as_me:$LINENO: checking whether to compile with assembly-based atomic functions" >&5
3.7692 +-echo $ECHO_N "checking whether to compile with assembly-based atomic functions... $ECHO_C" >&6; }
3.7693 +- { echo "$as_me:$LINENO: result: $atomic_asm" >&5
3.7694 +-echo "${ECHO_T}$atomic_asm" >&6; }
3.7695 ++ { $as_echo "$as_me:$LINENO: checking whether to compile with assembly-based atomic functions" >&5
3.7696 ++$as_echo_n "checking whether to compile with assembly-based atomic functions... " >&6; }
3.7697 ++ { $as_echo "$as_me:$LINENO: result: $atomic_asm" >&5
3.7698 ++$as_echo "$atomic_asm" >&6; }
3.7699 +
3.7700 + if test $atomic_asm = no ; then
3.7701 +
3.7702 +@@ -6605,11 +7238,12 @@
3.7703 + case $ac_val in #(
3.7704 + *${as_nl}*)
3.7705 + case $ac_var in #(
3.7706 +- *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
3.7707 +-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
3.7708 ++ *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
3.7709 ++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
3.7710 + esac
3.7711 + case $ac_var in #(
3.7712 + _ | IFS | as_nl) ;; #(
3.7713 ++ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
3.7714 + *) $as_unset $ac_var ;;
3.7715 + esac ;;
3.7716 + esac
3.7717 +@@ -6642,12 +7276,12 @@
3.7718 + if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
3.7719 + if test -w "$cache_file"; then
3.7720 + test "x$cache_file" != "x/dev/null" &&
3.7721 +- { echo "$as_me:$LINENO: updating cache $cache_file" >&5
3.7722 +-echo "$as_me: updating cache $cache_file" >&6;}
3.7723 ++ { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
3.7724 ++$as_echo "$as_me: updating cache $cache_file" >&6;}
3.7725 + cat confcache >$cache_file
3.7726 + else
3.7727 +- { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
3.7728 +-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
3.7729 ++ { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
3.7730 ++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
3.7731 + fi
3.7732 + fi
3.7733 + rm -f confcache
3.7734 +@@ -6660,24 +7294,24 @@
3.7735 +
3.7736 + if test -z "$PYTHON"
3.7737 + then
3.7738 +- { echo "$as_me:$LINENO: checking for --with-python" >&5
3.7739 +-echo $ECHO_N "checking for --with-python... $ECHO_C" >&6; }
3.7740 ++ { $as_echo "$as_me:$LINENO: checking for --with-python" >&5
3.7741 ++$as_echo_n "checking for --with-python... " >&6; }
3.7742 +
3.7743 + # Check whether --with-python was given.
3.7744 + if test "${with_python+set}" = set; then
3.7745 + withval=$with_python; if test "$withval" != "yes"
3.7746 + then
3.7747 + PYTHON="$withval"
3.7748 +- { echo "$as_me:$LINENO: result: $withval" >&5
3.7749 +-echo "${ECHO_T}$withval" >&6; }
3.7750 ++ { $as_echo "$as_me:$LINENO: result: $withval" >&5
3.7751 ++$as_echo "$withval" >&6; }
3.7752 + else
3.7753 +- { echo "$as_me:$LINENO: result: no" >&5
3.7754 +-echo "${ECHO_T}no" >&6; }
3.7755 ++ { $as_echo "$as_me:$LINENO: result: no" >&5
3.7756 ++$as_echo "no" >&6; }
3.7757 + fi
3.7758 +
3.7759 + else
3.7760 +- { echo "$as_me:$LINENO: result: no" >&5
3.7761 +-echo "${ECHO_T}no" >&6; }
3.7762 ++ { $as_echo "$as_me:$LINENO: result: no" >&5
3.7763 ++$as_echo "no" >&6; }
3.7764 +
3.7765 + fi
3.7766 +
3.7767 +@@ -6687,10 +7321,10 @@
3.7768 + then
3.7769 + # Extract the first word of "python", so it can be a program name with args.
3.7770 + set dummy python; ac_word=$2
3.7771 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
3.7772 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
3.7773 ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
3.7774 ++$as_echo_n "checking for $ac_word... " >&6; }
3.7775 + if test "${ac_cv_path_PYTHON+set}" = set; then
3.7776 +- echo $ECHO_N "(cached) $ECHO_C" >&6
3.7777 ++ $as_echo_n "(cached) " >&6
3.7778 + else
3.7779 + case $PYTHON in
3.7780 + [\\/]* | ?:[\\/]*)
3.7781 +@@ -6705,7 +7339,7 @@
3.7782 + for ac_exec_ext in '' $ac_executable_extensions; do
3.7783 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3.7784 + ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
3.7785 +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3.7786 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3.7787 + break 2
3.7788 + fi
3.7789 + done
3.7790 +@@ -6718,11 +7352,11 @@
3.7791 + fi
3.7792 + PYTHON=$ac_cv_path_PYTHON
3.7793 + if test -n "$PYTHON"; then
3.7794 +- { echo "$as_me:$LINENO: result: $PYTHON" >&5
3.7795 +-echo "${ECHO_T}$PYTHON" >&6; }
3.7796 +-else
3.7797 +- { echo "$as_me:$LINENO: result: no" >&5
3.7798 +-echo "${ECHO_T}no" >&6; }
3.7799 ++ { $as_echo "$as_me:$LINENO: result: $PYTHON" >&5
3.7800 ++$as_echo "$PYTHON" >&6; }
3.7801 ++else
3.7802 ++ { $as_echo "$as_me:$LINENO: result: no" >&5
3.7803 ++$as_echo "no" >&6; }
3.7804 + fi
3.7805 +
3.7806 +
3.7807 +@@ -6734,8 +7368,8 @@
3.7808 +
3.7809 + if test ! -z "$PYTHON" ; then
3.7810 +
3.7811 +- { echo "$as_me:$LINENO: checking whether python distutils can build an extension module" >&5
3.7812 +-echo $ECHO_N "checking whether python distutils can build an extension module... $ECHO_C" >&6; }
3.7813 ++ { $as_echo "$as_me:$LINENO: checking whether python distutils can build an extension module" >&5
3.7814 ++$as_echo_n "checking whether python distutils can build an extension module... " >&6; }
3.7815 +
3.7816 + cat > conftest.c <<_ACEOF
3.7817 +
3.7818 +@@ -6767,13 +7401,13 @@
3.7819 + ac_python_build=$?
3.7820 +
3.7821 + if test $ac_python_build = 0 ; then
3.7822 +- { echo "$as_me:$LINENO: result: yes" >&5
3.7823 +-echo "${ECHO_T}yes" >&6; }
3.7824 ++ { $as_echo "$as_me:$LINENO: result: yes" >&5
3.7825 ++$as_echo "yes" >&6; }
3.7826 + PYTHON_BUILD_EXT=yes
3.7827 +
3.7828 + else
3.7829 +- { echo "$as_me:$LINENO: result: no" >&5
3.7830 +-echo "${ECHO_T}no" >&6; }
3.7831 ++ { $as_echo "$as_me:$LINENO: result: no" >&5
3.7832 ++$as_echo "no" >&6; }
3.7833 + fi
3.7834 +
3.7835 + rm -rf conftest_build conftest.py conftest.c
3.7836 +@@ -6781,7 +7415,7 @@
3.7837 + fi # PYTHON != ""
3.7838 +
3.7839 +
3.7840 +- ac_tclvers='8.4 8.3'
3.7841 ++ ac_tclvers='8.5 8.4 8.3'
3.7842 + ac_tcldir='system'
3.7843 +
3.7844 +
3.7845 +@@ -6806,8 +7440,8 @@
3.7846 +
3.7847 +
3.7848 + if test $ac_tcldir = no ; then
3.7849 +- { { echo "$as_me:$LINENO: error: cannot configure without tcl" >&5
3.7850 +-echo "$as_me: error: cannot configure without tcl" >&2;}
3.7851 ++ { { $as_echo "$as_me:$LINENO: error: tcl MUST be installed to configure" >&5
3.7852 ++$as_echo "$as_me: error: tcl MUST be installed to configure" >&2;}
3.7853 + { (exit 1); exit 1; }; }
3.7854 + fi
3.7855 +
3.7856 +@@ -6820,10 +7454,10 @@
3.7857 + LDFLAGS=
3.7858 + LIBS=
3.7859 +
3.7860 +- { echo "$as_me:$LINENO: checking for library containing pow" >&5
3.7861 +-echo $ECHO_N "checking for library containing pow... $ECHO_C" >&6; }
3.7862 ++ { $as_echo "$as_me:$LINENO: checking for library containing pow" >&5
3.7863 ++$as_echo_n "checking for library containing pow... " >&6; }
3.7864 + if test "${ac_cv_search_pow+set}" = set; then
3.7865 +- echo $ECHO_N "(cached) $ECHO_C" >&6
3.7866 ++ $as_echo_n "(cached) " >&6
3.7867 + else
3.7868 + ac_func_search_save_LIBS=$LIBS
3.7869 + cat >conftest.$ac_ext <<_ACEOF
3.7870 +@@ -6861,26 +7495,30 @@
3.7871 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.7872 + *) ac_try_echo=$ac_try;;
3.7873 + esac
3.7874 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.7875 +- (eval "$ac_link") 2>conftest.er1
3.7876 +- ac_status=$?
3.7877 +- grep -v '^ *+' conftest.er1 >conftest.err
3.7878 +- rm -f conftest.er1
3.7879 +- cat conftest.err >&5
3.7880 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.7881 +- (exit $ac_status); } && {
3.7882 +- test -z "$ac_c_werror_flag" ||
3.7883 +- test ! -s conftest.err
3.7884 +- } && test -s conftest$ac_exeext &&
3.7885 +- $as_test_x conftest$ac_exeext; then
3.7886 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.7887 ++$as_echo "$ac_try_echo") >&5
3.7888 ++ (eval "$ac_link") 2>conftest.er1
3.7889 ++ ac_status=$?
3.7890 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.7891 ++ rm -f conftest.er1
3.7892 ++ cat conftest.err >&5
3.7893 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.7894 ++ (exit $ac_status); } && {
3.7895 ++ test -z "$ac_c_werror_flag" ||
3.7896 ++ test ! -s conftest.err
3.7897 ++ } && test -s conftest$ac_exeext && {
3.7898 ++ test "$cross_compiling" = yes ||
3.7899 ++ $as_test_x conftest$ac_exeext
3.7900 ++ }; then
3.7901 + ac_cv_search_pow=$ac_res
3.7902 + else
3.7903 +- echo "$as_me: failed program was:" >&5
3.7904 +-sed 's/^/| /' conftest.$ac_ext >&5
3.7905 +-
3.7906 +-
3.7907 +-fi
3.7908 +-
3.7909 ++ $as_echo "$as_me: failed program was:" >&5
3.7910 ++sed 's/^/| /' conftest.$ac_ext >&5
3.7911 ++
3.7912 ++
3.7913 ++fi
3.7914 ++
3.7915 ++rm -rf conftest.dSYM
3.7916 + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
3.7917 + conftest$ac_exeext
3.7918 + if test "${ac_cv_search_pow+set}" = set; then
3.7919 +@@ -6895,22 +7533,22 @@
3.7920 + rm conftest.$ac_ext
3.7921 + LIBS=$ac_func_search_save_LIBS
3.7922 + fi
3.7923 +-{ echo "$as_me:$LINENO: result: $ac_cv_search_pow" >&5
3.7924 +-echo "${ECHO_T}$ac_cv_search_pow" >&6; }
3.7925 ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_pow" >&5
3.7926 ++$as_echo "$ac_cv_search_pow" >&6; }
3.7927 + ac_res=$ac_cv_search_pow
3.7928 + if test "$ac_res" != no; then
3.7929 + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
3.7930 +
3.7931 + else
3.7932 +- { { echo "$as_me:$LINENO: error: can't find required library function (pow)" >&5
3.7933 +-echo "$as_me: error: can't find required library function (pow)" >&2;}
3.7934 +- { (exit 1); exit 1; }; }
3.7935 +-fi
3.7936 +-
3.7937 +- { echo "$as_me:$LINENO: checking for library containing dlopen" >&5
3.7938 +-echo $ECHO_N "checking for library containing dlopen... $ECHO_C" >&6; }
3.7939 ++ { { $as_echo "$as_me:$LINENO: error: can't find standard C library function (pow) required by tcl" >&5
3.7940 ++$as_echo "$as_me: error: can't find standard C library function (pow) required by tcl" >&2;}
3.7941 ++ { (exit 1); exit 1; }; }
3.7942 ++fi
3.7943 ++
3.7944 ++ { $as_echo "$as_me:$LINENO: checking for library containing dlopen" >&5
3.7945 ++$as_echo_n "checking for library containing dlopen... " >&6; }
3.7946 + if test "${ac_cv_search_dlopen+set}" = set; then
3.7947 +- echo $ECHO_N "(cached) $ECHO_C" >&6
3.7948 ++ $as_echo_n "(cached) " >&6
3.7949 + else
3.7950 + ac_func_search_save_LIBS=$LIBS
3.7951 + cat >conftest.$ac_ext <<_ACEOF
3.7952 +@@ -6948,26 +7586,30 @@
3.7953 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.7954 + *) ac_try_echo=$ac_try;;
3.7955 + esac
3.7956 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.7957 +- (eval "$ac_link") 2>conftest.er1
3.7958 +- ac_status=$?
3.7959 +- grep -v '^ *+' conftest.er1 >conftest.err
3.7960 +- rm -f conftest.er1
3.7961 +- cat conftest.err >&5
3.7962 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.7963 +- (exit $ac_status); } && {
3.7964 +- test -z "$ac_c_werror_flag" ||
3.7965 +- test ! -s conftest.err
3.7966 +- } && test -s conftest$ac_exeext &&
3.7967 +- $as_test_x conftest$ac_exeext; then
3.7968 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.7969 ++$as_echo "$ac_try_echo") >&5
3.7970 ++ (eval "$ac_link") 2>conftest.er1
3.7971 ++ ac_status=$?
3.7972 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.7973 ++ rm -f conftest.er1
3.7974 ++ cat conftest.err >&5
3.7975 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.7976 ++ (exit $ac_status); } && {
3.7977 ++ test -z "$ac_c_werror_flag" ||
3.7978 ++ test ! -s conftest.err
3.7979 ++ } && test -s conftest$ac_exeext && {
3.7980 ++ test "$cross_compiling" = yes ||
3.7981 ++ $as_test_x conftest$ac_exeext
3.7982 ++ }; then
3.7983 + ac_cv_search_dlopen=$ac_res
3.7984 + else
3.7985 +- echo "$as_me: failed program was:" >&5
3.7986 +-sed 's/^/| /' conftest.$ac_ext >&5
3.7987 +-
3.7988 +-
3.7989 +-fi
3.7990 +-
3.7991 ++ $as_echo "$as_me: failed program was:" >&5
3.7992 ++sed 's/^/| /' conftest.$ac_ext >&5
3.7993 ++
3.7994 ++
3.7995 ++fi
3.7996 ++
3.7997 ++rm -rf conftest.dSYM
3.7998 + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
3.7999 + conftest$ac_exeext
3.8000 + if test "${ac_cv_search_dlopen+set}" = set; then
3.8001 +@@ -6982,15 +7624,15 @@
3.8002 + rm conftest.$ac_ext
3.8003 + LIBS=$ac_func_search_save_LIBS
3.8004 + fi
3.8005 +-{ echo "$as_me:$LINENO: result: $ac_cv_search_dlopen" >&5
3.8006 +-echo "${ECHO_T}$ac_cv_search_dlopen" >&6; }
3.8007 ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_dlopen" >&5
3.8008 ++$as_echo "$ac_cv_search_dlopen" >&6; }
3.8009 + ac_res=$ac_cv_search_dlopen
3.8010 + if test "$ac_res" != no; then
3.8011 + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
3.8012 +
3.8013 + else
3.8014 +- { { echo "$as_me:$LINENO: error: can't find required library function (dlopen)" >&5
3.8015 +-echo "$as_me: error: can't find required library function (dlopen)" >&2;}
3.8016 ++ { { $as_echo "$as_me:$LINENO: error: can't find standard library function (dlopen) required by tcl" >&5
3.8017 ++$as_echo "$as_me: error: can't find standard library function (dlopen) required by tcl" >&2;}
3.8018 + { (exit 1); exit 1; }; }
3.8019 + fi
3.8020 +
3.8021 +@@ -7012,8 +7654,8 @@
3.8022 + LIBS=$ac_extlib_save_LIBS
3.8023 +
3.8024 +
3.8025 +- if test $ac_tcldir = system -a ! x$oasys_cv_path_tcl_h = x ; then
3.8026 +- echo "checking for tcl installation... (cached) $oasys_cv_path_tcl_h/tcl.h, $oasys_cv_path_tcl_lib -l$oasys_cv_lib_tcl"
3.8027 ++ if test $ac_tcldir = system -a ! x$oasys_cv_path_tcl_h = x ; then \
3.8028 ++ echo "checking for tcl installation... (cached) $oasys_cv_path_tcl_h/tcl.h, $oasys_cv_path_tcl_lib -l$oasys_cv_lib_tcl"
3.8029 + else
3.8030 +
3.8031 + oasys_cv_path_tcl_h=
3.8032 +@@ -7026,9 +7668,9 @@
3.8033 + ac_tcldir=system
3.8034 + ac_tclincdirs="/usr/include /usr/local/include"
3.8035 + for ac_tclver in $ac_tclvers ; do
3.8036 +- ac_tclincdirs="$ac_tclincdirs /usr/include/tcl$ac_tclver"
3.8037 +- ac_tclincdirs="$ac_tclincdirs /usr/local/include/tcl$ac_tclver"
3.8038 +- done
3.8039 ++ ac_tclincdirs="$ac_tclincdirs /usr/include/tcl$ac_tclver /usr/local/include/tcl$ac_tclver"
3.8040 ++ ac_tclincdirs="$ac_tclincdirs"
3.8041 ++ done
3.8042 + ac_tcllibdirs="/usr/lib /usr/local/lib"
3.8043 + else
3.8044 + ac_tclincdirs=$ac_tcldir/include
3.8045 +@@ -7037,8 +7679,8 @@
3.8046 +
3.8047 + for ac_tclver in $ac_tclvers ; do
3.8048 + echo ""
3.8049 +- { echo "$as_me:$LINENO: checking for tcl installation (version $ac_tclver)" >&5
3.8050 +-echo "$as_me: checking for tcl installation (version $ac_tclver)" >&6;}
3.8051 ++ { $as_echo "$as_me:$LINENO: checking for tcl installation (version $ac_tclver)" >&5
3.8052 ++$as_echo "$as_me: checking for tcl installation (version $ac_tclver)" >&6;}
3.8053 +
3.8054 + for ac_tclincdir in $ac_tclincdirs; do
3.8055 +
3.8056 +@@ -7048,8 +7690,8 @@
3.8057 + LDFLAGS="$ac_save_LDFLAGS"
3.8058 + LIBS="$ac_save_LIBS"
3.8059 +
3.8060 +- { echo "$as_me:$LINENO: checking for tcl.h (version $ac_tclver) in $ac_tclincdir" >&5
3.8061 +-echo $ECHO_N "checking for tcl.h (version $ac_tclver) in $ac_tclincdir... $ECHO_C" >&6; }
3.8062 ++ { $as_echo "$as_me:$LINENO: checking for tcl.h (version $ac_tclver) in $ac_tclincdir" >&5
3.8063 ++$as_echo_n "checking for tcl.h (version $ac_tclver) in $ac_tclincdir... " >&6; }
3.8064 +
3.8065 + cat >conftest.$ac_ext <<_ACEOF
3.8066 + /* confdefs.h. */
3.8067 +@@ -7080,33 +7722,37 @@
3.8068 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.8069 + *) ac_try_echo=$ac_try;;
3.8070 + esac
3.8071 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.8072 +- (eval "$ac_link") 2>conftest.er1
3.8073 +- ac_status=$?
3.8074 +- grep -v '^ *+' conftest.er1 >conftest.err
3.8075 +- rm -f conftest.er1
3.8076 +- cat conftest.err >&5
3.8077 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.8078 +- (exit $ac_status); } && {
3.8079 +- test -z "$ac_c_werror_flag" ||
3.8080 +- test ! -s conftest.err
3.8081 +- } && test -s conftest$ac_exeext &&
3.8082 +- $as_test_x conftest$ac_exeext; then
3.8083 +-
3.8084 +- { echo "$as_me:$LINENO: result: yes" >&5
3.8085 +-echo "${ECHO_T}yes" >&6; }
3.8086 +-
3.8087 +-else
3.8088 +- echo "$as_me: failed program was:" >&5
3.8089 +-sed 's/^/| /' conftest.$ac_ext >&5
3.8090 +-
3.8091 +-
3.8092 +- { echo "$as_me:$LINENO: result: no" >&5
3.8093 +-echo "${ECHO_T}no" >&6; }
3.8094 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.8095 ++$as_echo "$ac_try_echo") >&5
3.8096 ++ (eval "$ac_link") 2>conftest.er1
3.8097 ++ ac_status=$?
3.8098 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.8099 ++ rm -f conftest.er1
3.8100 ++ cat conftest.err >&5
3.8101 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.8102 ++ (exit $ac_status); } && {
3.8103 ++ test -z "$ac_c_werror_flag" ||
3.8104 ++ test ! -s conftest.err
3.8105 ++ } && test -s conftest$ac_exeext && {
3.8106 ++ test "$cross_compiling" = yes ||
3.8107 ++ $as_test_x conftest$ac_exeext
3.8108 ++ }; then
3.8109 ++
3.8110 ++ { $as_echo "$as_me:$LINENO: result: yes" >&5
3.8111 ++$as_echo "yes" >&6; }
3.8112 ++
3.8113 ++else
3.8114 ++ $as_echo "$as_me: failed program was:" >&5
3.8115 ++sed 's/^/| /' conftest.$ac_ext >&5
3.8116 ++
3.8117 ++
3.8118 ++ { $as_echo "$as_me:$LINENO: result: no" >&5
3.8119 ++$as_echo "no" >&6; }
3.8120 + continue
3.8121 +
3.8122 + fi
3.8123 +
3.8124 ++rm -rf conftest.dSYM
3.8125 + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
3.8126 + conftest$ac_exeext conftest.$ac_ext
3.8127 +
3.8128 +@@ -7120,8 +7766,8 @@
3.8129 + LIBS="-l$ac_tcllib $ac_save_LIBS"
3.8130 + fi
3.8131 +
3.8132 +- { echo "$as_me:$LINENO: checking for tcl library in $ac_tcllibdir: $LIBS" >&5
3.8133 +-echo $ECHO_N "checking for tcl library in $ac_tcllibdir: $LIBS... $ECHO_C" >&6; }
3.8134 ++ { $as_echo "$as_me:$LINENO: checking for tcl library in $ac_tcllibdir: $LIBS" >&5
3.8135 ++$as_echo_n "checking for tcl library in $ac_tcllibdir: $LIBS... " >&6; }
3.8136 +
3.8137 + cat >conftest.$ac_ext <<_ACEOF
3.8138 + /* confdefs.h. */
3.8139 +@@ -7153,21 +7799,24 @@
3.8140 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.8141 + *) ac_try_echo=$ac_try;;
3.8142 + esac
3.8143 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.8144 +- (eval "$ac_link") 2>conftest.er1
3.8145 +- ac_status=$?
3.8146 +- grep -v '^ *+' conftest.er1 >conftest.err
3.8147 +- rm -f conftest.er1
3.8148 +- cat conftest.err >&5
3.8149 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.8150 +- (exit $ac_status); } && {
3.8151 +- test -z "$ac_c_werror_flag" ||
3.8152 +- test ! -s conftest.err
3.8153 +- } && test -s conftest$ac_exeext &&
3.8154 +- $as_test_x conftest$ac_exeext; then
3.8155 +-
3.8156 +- { echo "$as_me:$LINENO: result: yes" >&5
3.8157 +-echo "${ECHO_T}yes" >&6; }
3.8158 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.8159 ++$as_echo "$ac_try_echo") >&5
3.8160 ++ (eval "$ac_link") 2>conftest.er1
3.8161 ++ ac_status=$?
3.8162 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.8163 ++ rm -f conftest.er1
3.8164 ++ cat conftest.err >&5
3.8165 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.8166 ++ (exit $ac_status); } && {
3.8167 ++ test -z "$ac_c_werror_flag" ||
3.8168 ++ test ! -s conftest.err
3.8169 ++ } && test -s conftest$ac_exeext && {
3.8170 ++ test "$cross_compiling" = yes ||
3.8171 ++ $as_test_x conftest$ac_exeext
3.8172 ++ }; then
3.8173 ++
3.8174 ++ { $as_echo "$as_me:$LINENO: result: yes" >&5
3.8175 ++$as_echo "yes" >&6; }
3.8176 + oasys_cv_path_tcl_h=$ac_tclincdir
3.8177 + oasys_cv_path_tcl_lib=$ac_tcllibdir
3.8178 + oasys_cv_lib_tcl=$ac_tcllib
3.8179 +@@ -7181,15 +7830,16 @@
3.8180 + break 4
3.8181 +
3.8182 + else
3.8183 +- echo "$as_me: failed program was:" >&5
3.8184 +-sed 's/^/| /' conftest.$ac_ext >&5
3.8185 +-
3.8186 +-
3.8187 +- { echo "$as_me:$LINENO: result: no" >&5
3.8188 +-echo "${ECHO_T}no" >&6; }
3.8189 +-
3.8190 +-fi
3.8191 +-
3.8192 ++ $as_echo "$as_me: failed program was:" >&5
3.8193 ++sed 's/^/| /' conftest.$ac_ext >&5
3.8194 ++
3.8195 ++
3.8196 ++ { $as_echo "$as_me:$LINENO: result: no" >&5
3.8197 ++$as_echo "no" >&6; }
3.8198 ++
3.8199 ++fi
3.8200 ++
3.8201 ++rm -rf conftest.dSYM
3.8202 + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
3.8203 + conftest$ac_exeext conftest.$ac_ext
3.8204 + done
3.8205 +@@ -7202,8 +7852,8 @@
3.8206 + LIBS="$ac_save_LIBS"
3.8207 +
3.8208 + if test x$oasys_cv_path_tcl_h = x ; then
3.8209 +- { { echo "$as_me:$LINENO: error: can't find usable tcl.h" >&5
3.8210 +-echo "$as_me: error: can't find usable tcl.h" >&2;}
3.8211 ++ { { $as_echo "$as_me:$LINENO: error: Please install the tcl development files headers and libraries. Can't find usable tcl.h " >&5
3.8212 ++$as_echo "$as_me: error: Please install the tcl development files headers and libraries. Can't find usable tcl.h " >&2;}
3.8213 + { (exit 1); exit 1; }; }
3.8214 + fi
3.8215 +
3.8216 +@@ -7243,16 +7893,16 @@
3.8217 + fi
3.8218 +
3.8219 +
3.8220 +- { echo "$as_me:$LINENO: checking whether to compile with google profiling" >&5
3.8221 +-echo $ECHO_N "checking whether to compile with google profiling... $ECHO_C" >&6; }
3.8222 +- { echo "$as_me:$LINENO: result: $google_profile" >&5
3.8223 +-echo "${ECHO_T}$google_profile" >&6; }
3.8224 ++ { $as_echo "$as_me:$LINENO: checking whether to compile with google profiling" >&5
3.8225 ++$as_echo_n "checking whether to compile with google profiling... " >&6; }
3.8226 ++ { $as_echo "$as_me:$LINENO: result: $google_profile" >&5
3.8227 ++$as_echo "$google_profile" >&6; }
3.8228 +
3.8229 + GOOGLE_PROFILE_ENABLED=0
3.8230 + if test $google_profile = yes ; then
3.8231 + if test $ac_google_perfdir = no ; then
3.8232 +- { { echo "$as_me:$LINENO: error: must specify --with-google-perftools to use google profiling" >&5
3.8233 +-echo "$as_me: error: must specify --with-google-perftools to use google profiling" >&2;}
3.8234 ++ { { $as_echo "$as_me:$LINENO: error: must specify --with-google-perftools to use google profiling" >&5
3.8235 ++$as_echo "$as_me: error: must specify --with-google-perftools to use google profiling" >&2;}
3.8236 + { (exit 1); exit 1; }; }
3.8237 + fi
3.8238 + GOOGLE_PROFILE_ENABLED=1
3.8239 +@@ -7313,8 +7963,8 @@
3.8240 + LDFLAGS="$ac_save_LDFLAGS"
3.8241 + LIBS="$ac_save_LIBS"
3.8242 +
3.8243 +- { echo "$as_me:$LINENO: checking for google perftools header profiler.h in $ac_google_perfincdir" >&5
3.8244 +-echo $ECHO_N "checking for google perftools header profiler.h in $ac_google_perfincdir... $ECHO_C" >&6; }
3.8245 ++ { $as_echo "$as_me:$LINENO: checking for google perftools header profiler.h in $ac_google_perfincdir" >&5
3.8246 ++$as_echo_n "checking for google perftools header profiler.h in $ac_google_perfincdir... " >&6; }
3.8247 + cat >conftest.$ac_ext <<_ACEOF
3.8248 + /* confdefs.h. */
3.8249 + _ACEOF
3.8250 +@@ -7339,35 +7989,39 @@
3.8251 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.8252 + *) ac_try_echo=$ac_try;;
3.8253 + esac
3.8254 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.8255 +- (eval "$ac_link") 2>conftest.er1
3.8256 +- ac_status=$?
3.8257 +- grep -v '^ *+' conftest.er1 >conftest.err
3.8258 +- rm -f conftest.er1
3.8259 +- cat conftest.err >&5
3.8260 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.8261 +- (exit $ac_status); } && {
3.8262 +- test -z "$ac_cxx_werror_flag" ||
3.8263 +- test ! -s conftest.err
3.8264 +- } && test -s conftest$ac_exeext &&
3.8265 +- $as_test_x conftest$ac_exeext; then
3.8266 +-
3.8267 +- { echo "$as_me:$LINENO: result: yes" >&5
3.8268 +-echo "${ECHO_T}yes" >&6; }
3.8269 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.8270 ++$as_echo "$ac_try_echo") >&5
3.8271 ++ (eval "$ac_link") 2>conftest.er1
3.8272 ++ ac_status=$?
3.8273 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.8274 ++ rm -f conftest.er1
3.8275 ++ cat conftest.err >&5
3.8276 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.8277 ++ (exit $ac_status); } && {
3.8278 ++ test -z "$ac_cxx_werror_flag" ||
3.8279 ++ test ! -s conftest.err
3.8280 ++ } && test -s conftest$ac_exeext && {
3.8281 ++ test "$cross_compiling" = yes ||
3.8282 ++ $as_test_x conftest$ac_exeext
3.8283 ++ }; then
3.8284 ++
3.8285 ++ { $as_echo "$as_me:$LINENO: result: yes" >&5
3.8286 ++$as_echo "yes" >&6; }
3.8287 + oasys_cv_path_google_perf_h=$ac_google_perfincdir
3.8288 + break
3.8289 +
3.8290 + else
3.8291 +- echo "$as_me: failed program was:" >&5
3.8292 +-sed 's/^/| /' conftest.$ac_ext >&5
3.8293 +-
3.8294 +-
3.8295 +- { echo "$as_me:$LINENO: result: no" >&5
3.8296 +-echo "${ECHO_T}no" >&6; }
3.8297 ++ $as_echo "$as_me: failed program was:" >&5
3.8298 ++sed 's/^/| /' conftest.$ac_ext >&5
3.8299 ++
3.8300 ++
3.8301 ++ { $as_echo "$as_me:$LINENO: result: no" >&5
3.8302 ++$as_echo "no" >&6; }
3.8303 + continue
3.8304 +
3.8305 + fi
3.8306 +
3.8307 ++rm -rf conftest.dSYM
3.8308 + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
3.8309 + conftest$ac_exeext conftest.$ac_ext
3.8310 + done
3.8311 +@@ -7380,8 +8034,8 @@
3.8312 +
3.8313 +
3.8314 + if test x$oasys_cv_path_google_perf_h = x ; then
3.8315 +- { { echo "$as_me:$LINENO: error: can't find usable google perftools installation" >&5
3.8316 +-echo "$as_me: error: can't find usable google perftools installation" >&2;}
3.8317 ++ { { $as_echo "$as_me:$LINENO: error: can't find usable google perftools installation" >&5
3.8318 ++$as_echo "$as_me: error: can't find usable google perftools installation" >&2;}
3.8319 + { (exit 1); exit 1; }; }
3.8320 + fi
3.8321 +
3.8322 +@@ -7397,8 +8051,8 @@
3.8323 + LDFLAGS="$ac_save_LDFLAGS -L$ac_google_perflibdir"
3.8324 + LIBS="$ac_save_LIBS -lprofiler"
3.8325 +
3.8326 +- { echo "$as_me:$LINENO: checking for google perftolos library libprofiler in $ac_google_perflibdir" >&5
3.8327 +-echo $ECHO_N "checking for google perftolos library libprofiler in $ac_google_perflibdir... $ECHO_C" >&6; }
3.8328 ++ { $as_echo "$as_me:$LINENO: checking for google perftolos library libprofiler in $ac_google_perflibdir" >&5
3.8329 ++$as_echo_n "checking for google perftolos library libprofiler in $ac_google_perflibdir... " >&6; }
3.8330 + cat >conftest.$ac_ext <<_ACEOF
3.8331 + /* confdefs.h. */
3.8332 + _ACEOF
3.8333 +@@ -7424,34 +8078,38 @@
3.8334 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.8335 + *) ac_try_echo=$ac_try;;
3.8336 + esac
3.8337 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.8338 +- (eval "$ac_link") 2>conftest.er1
3.8339 +- ac_status=$?
3.8340 +- grep -v '^ *+' conftest.er1 >conftest.err
3.8341 +- rm -f conftest.er1
3.8342 +- cat conftest.err >&5
3.8343 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.8344 +- (exit $ac_status); } && {
3.8345 +- test -z "$ac_cxx_werror_flag" ||
3.8346 +- test ! -s conftest.err
3.8347 +- } && test -s conftest$ac_exeext &&
3.8348 +- $as_test_x conftest$ac_exeext; then
3.8349 +-
3.8350 +- { echo "$as_me:$LINENO: result: yes" >&5
3.8351 +-echo "${ECHO_T}yes" >&6; }
3.8352 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.8353 ++$as_echo "$ac_try_echo") >&5
3.8354 ++ (eval "$ac_link") 2>conftest.er1
3.8355 ++ ac_status=$?
3.8356 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.8357 ++ rm -f conftest.er1
3.8358 ++ cat conftest.err >&5
3.8359 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.8360 ++ (exit $ac_status); } && {
3.8361 ++ test -z "$ac_cxx_werror_flag" ||
3.8362 ++ test ! -s conftest.err
3.8363 ++ } && test -s conftest$ac_exeext && {
3.8364 ++ test "$cross_compiling" = yes ||
3.8365 ++ $as_test_x conftest$ac_exeext
3.8366 ++ }; then
3.8367 ++
3.8368 ++ { $as_echo "$as_me:$LINENO: result: yes" >&5
3.8369 ++$as_echo "yes" >&6; }
3.8370 + oasys_cv_path_google_perf_lib=$ac_google_perflibdir
3.8371 + break
3.8372 +
3.8373 + else
3.8374 +- echo "$as_me: failed program was:" >&5
3.8375 +-sed 's/^/| /' conftest.$ac_ext >&5
3.8376 +-
3.8377 +-
3.8378 +- { echo "$as_me:$LINENO: result: no" >&5
3.8379 +-echo "${ECHO_T}no" >&6; }
3.8380 +-
3.8381 +-fi
3.8382 +-
3.8383 ++ $as_echo "$as_me: failed program was:" >&5
3.8384 ++sed 's/^/| /' conftest.$ac_ext >&5
3.8385 ++
3.8386 ++
3.8387 ++ { $as_echo "$as_me:$LINENO: result: no" >&5
3.8388 ++$as_echo "no" >&6; }
3.8389 ++
3.8390 ++fi
3.8391 ++
3.8392 ++rm -rf conftest.dSYM
3.8393 + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
3.8394 + conftest$ac_exeext conftest.$ac_ext
3.8395 + done
3.8396 +@@ -7468,8 +8126,8 @@
3.8397 +
3.8398 +
3.8399 + if test x$oasys_cv_path_google_perf_lib = x ; then
3.8400 +- { { echo "$as_me:$LINENO: error: can't find usable google perftools library" >&5
3.8401 +-echo "$as_me: error: can't find usable google perftools library" >&2;}
3.8402 ++ { { $as_echo "$as_me:$LINENO: error: can't find usable google perftools library" >&5
3.8403 ++$as_echo "$as_me: error: can't find usable google perftools library" >&2;}
3.8404 + { (exit 1); exit 1; }; }
3.8405 + fi
3.8406 +
3.8407 +@@ -7501,16 +8159,16 @@
3.8408 + ac_has_libbluetooth="no"
3.8409 + ac_has_bluetooth_h="no"
3.8410 +
3.8411 +- { echo "$as_me:$LINENO: checking whether bluetooth support should be enabled" >&5
3.8412 +-echo $ECHO_N "checking whether bluetooth support should be enabled... $ECHO_C" >&6; }
3.8413 ++ { $as_echo "$as_me:$LINENO: checking whether bluetooth support should be enabled" >&5
3.8414 ++$as_echo_n "checking whether bluetooth support should be enabled... " >&6; }
3.8415 +
3.8416 + if test "$ac_use_bluez" = "no"; then
3.8417 +- { echo "$as_me:$LINENO: result: no" >&5
3.8418 +-echo "${ECHO_T}no" >&6; }
3.8419 +-
3.8420 +- else
3.8421 +- { echo "$as_me:$LINENO: result: $ac_use_bluez" >&5
3.8422 +-echo "${ECHO_T}$ac_use_bluez" >&6; }
3.8423 ++ { $as_echo "$as_me:$LINENO: result: no" >&5
3.8424 ++$as_echo "no" >&6; }
3.8425 ++
3.8426 ++ else
3.8427 ++ { $as_echo "$as_me:$LINENO: result: $ac_use_bluez" >&5
3.8428 ++$as_echo "$ac_use_bluez" >&6; }
3.8429 +
3.8430 +
3.8431 + ac_extlib_save_CFLAGS=$CFLAGS
3.8432 +@@ -7521,10 +8179,10 @@
3.8433 + LDFLAGS=
3.8434 + LIBS=
3.8435 +
3.8436 +- { echo "$as_me:$LINENO: checking for library containing baswap" >&5
3.8437 +-echo $ECHO_N "checking for library containing baswap... $ECHO_C" >&6; }
3.8438 ++ { $as_echo "$as_me:$LINENO: checking for library containing baswap" >&5
3.8439 ++$as_echo_n "checking for library containing baswap... " >&6; }
3.8440 + if test "${ac_cv_search_baswap+set}" = set; then
3.8441 +- echo $ECHO_N "(cached) $ECHO_C" >&6
3.8442 ++ $as_echo_n "(cached) " >&6
3.8443 + else
3.8444 + ac_func_search_save_LIBS=$LIBS
3.8445 + cat >conftest.$ac_ext <<_ACEOF
3.8446 +@@ -7562,26 +8220,30 @@
3.8447 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.8448 + *) ac_try_echo=$ac_try;;
3.8449 + esac
3.8450 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.8451 +- (eval "$ac_link") 2>conftest.er1
3.8452 +- ac_status=$?
3.8453 +- grep -v '^ *+' conftest.er1 >conftest.err
3.8454 +- rm -f conftest.er1
3.8455 +- cat conftest.err >&5
3.8456 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.8457 +- (exit $ac_status); } && {
3.8458 +- test -z "$ac_c_werror_flag" ||
3.8459 +- test ! -s conftest.err
3.8460 +- } && test -s conftest$ac_exeext &&
3.8461 +- $as_test_x conftest$ac_exeext; then
3.8462 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.8463 ++$as_echo "$ac_try_echo") >&5
3.8464 ++ (eval "$ac_link") 2>conftest.er1
3.8465 ++ ac_status=$?
3.8466 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.8467 ++ rm -f conftest.er1
3.8468 ++ cat conftest.err >&5
3.8469 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.8470 ++ (exit $ac_status); } && {
3.8471 ++ test -z "$ac_c_werror_flag" ||
3.8472 ++ test ! -s conftest.err
3.8473 ++ } && test -s conftest$ac_exeext && {
3.8474 ++ test "$cross_compiling" = yes ||
3.8475 ++ $as_test_x conftest$ac_exeext
3.8476 ++ }; then
3.8477 + ac_cv_search_baswap=$ac_res
3.8478 + else
3.8479 +- echo "$as_me: failed program was:" >&5
3.8480 +-sed 's/^/| /' conftest.$ac_ext >&5
3.8481 +-
3.8482 +-
3.8483 +-fi
3.8484 +-
3.8485 ++ $as_echo "$as_me: failed program was:" >&5
3.8486 ++sed 's/^/| /' conftest.$ac_ext >&5
3.8487 ++
3.8488 ++
3.8489 ++fi
3.8490 ++
3.8491 ++rm -rf conftest.dSYM
3.8492 + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
3.8493 + conftest$ac_exeext
3.8494 + if test "${ac_cv_search_baswap+set}" = set; then
3.8495 +@@ -7596,8 +8258,8 @@
3.8496 + rm conftest.$ac_ext
3.8497 + LIBS=$ac_func_search_save_LIBS
3.8498 + fi
3.8499 +-{ echo "$as_me:$LINENO: result: $ac_cv_search_baswap" >&5
3.8500 +-echo "${ECHO_T}$ac_cv_search_baswap" >&6; }
3.8501 ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_baswap" >&5
3.8502 ++$as_echo "$ac_cv_search_baswap" >&6; }
3.8503 + ac_res=$ac_cv_search_baswap
3.8504 + if test "$ac_res" != no; then
3.8505 + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
3.8506 +@@ -7625,20 +8287,21 @@
3.8507 +
3.8508 + for ac_header in bluetooth/bluetooth.h
3.8509 + do
3.8510 +-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
3.8511 ++as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
3.8512 + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
3.8513 +- { echo "$as_me:$LINENO: checking for $ac_header" >&5
3.8514 +-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
3.8515 ++ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
3.8516 ++$as_echo_n "checking for $ac_header... " >&6; }
3.8517 + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
3.8518 +- echo $ECHO_N "(cached) $ECHO_C" >&6
3.8519 +-fi
3.8520 +-ac_res=`eval echo '${'$as_ac_Header'}'`
3.8521 +- { echo "$as_me:$LINENO: result: $ac_res" >&5
3.8522 +-echo "${ECHO_T}$ac_res" >&6; }
3.8523 ++ $as_echo_n "(cached) " >&6
3.8524 ++fi
3.8525 ++ac_res=`eval 'as_val=${'$as_ac_Header'}
3.8526 ++ $as_echo "$as_val"'`
3.8527 ++ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
3.8528 ++$as_echo "$ac_res" >&6; }
3.8529 + else
3.8530 + # Is the header compilable?
3.8531 +-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
3.8532 +-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
3.8533 ++{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
3.8534 ++$as_echo_n "checking $ac_header usability... " >&6; }
3.8535 + cat >conftest.$ac_ext <<_ACEOF
3.8536 + /* confdefs.h. */
3.8537 + _ACEOF
3.8538 +@@ -7654,32 +8317,33 @@
3.8539 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.8540 + *) ac_try_echo=$ac_try;;
3.8541 + esac
3.8542 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.8543 +- (eval "$ac_compile") 2>conftest.er1
3.8544 +- ac_status=$?
3.8545 +- grep -v '^ *+' conftest.er1 >conftest.err
3.8546 +- rm -f conftest.er1
3.8547 +- cat conftest.err >&5
3.8548 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.8549 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.8550 ++$as_echo "$ac_try_echo") >&5
3.8551 ++ (eval "$ac_compile") 2>conftest.er1
3.8552 ++ ac_status=$?
3.8553 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.8554 ++ rm -f conftest.er1
3.8555 ++ cat conftest.err >&5
3.8556 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.8557 + (exit $ac_status); } && {
3.8558 + test -z "$ac_c_werror_flag" ||
3.8559 + test ! -s conftest.err
3.8560 + } && test -s conftest.$ac_objext; then
3.8561 + ac_header_compiler=yes
3.8562 + else
3.8563 +- echo "$as_me: failed program was:" >&5
3.8564 ++ $as_echo "$as_me: failed program was:" >&5
3.8565 + sed 's/^/| /' conftest.$ac_ext >&5
3.8566 +
3.8567 + ac_header_compiler=no
3.8568 + fi
3.8569 +
3.8570 + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3.8571 +-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
3.8572 +-echo "${ECHO_T}$ac_header_compiler" >&6; }
3.8573 ++{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
3.8574 ++$as_echo "$ac_header_compiler" >&6; }
3.8575 +
3.8576 + # Is the header present?
3.8577 +-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
3.8578 +-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
3.8579 ++{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
3.8580 ++$as_echo_n "checking $ac_header presence... " >&6; }
3.8581 + cat >conftest.$ac_ext <<_ACEOF
3.8582 + /* confdefs.h. */
3.8583 + _ACEOF
3.8584 +@@ -7693,69 +8357,73 @@
3.8585 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.8586 + *) ac_try_echo=$ac_try;;
3.8587 + esac
3.8588 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.8589 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.8590 ++$as_echo "$ac_try_echo") >&5
3.8591 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
3.8592 + ac_status=$?
3.8593 + grep -v '^ *+' conftest.er1 >conftest.err
3.8594 + rm -f conftest.er1
3.8595 + cat conftest.err >&5
3.8596 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.8597 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.8598 + (exit $ac_status); } >/dev/null && {
3.8599 + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
3.8600 + test ! -s conftest.err
3.8601 + }; then
3.8602 + ac_header_preproc=yes
3.8603 + else
3.8604 +- echo "$as_me: failed program was:" >&5
3.8605 ++ $as_echo "$as_me: failed program was:" >&5
3.8606 + sed 's/^/| /' conftest.$ac_ext >&5
3.8607 +
3.8608 + ac_header_preproc=no
3.8609 + fi
3.8610 +
3.8611 + rm -f conftest.err conftest.$ac_ext
3.8612 +-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
3.8613 +-echo "${ECHO_T}$ac_header_preproc" >&6; }
3.8614 ++{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
3.8615 ++$as_echo "$ac_header_preproc" >&6; }
3.8616 +
3.8617 + # So? What about this header?
3.8618 + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
3.8619 + yes:no: )
3.8620 +- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
3.8621 +-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
3.8622 +- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
3.8623 +-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
3.8624 ++ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
3.8625 ++$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
3.8626 ++ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
3.8627 ++$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
3.8628 + ac_header_preproc=yes
3.8629 + ;;
3.8630 + no:yes:* )
3.8631 +- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
3.8632 +-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
3.8633 +- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
3.8634 +-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
3.8635 +- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
3.8636 +-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
3.8637 +- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
3.8638 +-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
3.8639 +- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
3.8640 +-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
3.8641 +- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
3.8642 +-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
3.8643 +-
3.8644 +- ;;
3.8645 +-esac
3.8646 +-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
3.8647 +-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
3.8648 ++ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
3.8649 ++$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
3.8650 ++ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
3.8651 ++$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
3.8652 ++ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
3.8653 ++$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
3.8654 ++ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
3.8655 ++$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
3.8656 ++ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
3.8657 ++$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
3.8658 ++ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
3.8659 ++$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
3.8660 ++
3.8661 ++ ;;
3.8662 ++esac
3.8663 ++{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
3.8664 ++$as_echo_n "checking for $ac_header... " >&6; }
3.8665 + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
3.8666 +- echo $ECHO_N "(cached) $ECHO_C" >&6
3.8667 ++ $as_echo_n "(cached) " >&6
3.8668 + else
3.8669 + eval "$as_ac_Header=\$ac_header_preproc"
3.8670 + fi
3.8671 +-ac_res=`eval echo '${'$as_ac_Header'}'`
3.8672 +- { echo "$as_me:$LINENO: result: $ac_res" >&5
3.8673 +-echo "${ECHO_T}$ac_res" >&6; }
3.8674 +-
3.8675 +-fi
3.8676 +-if test `eval echo '${'$as_ac_Header'}'` = yes; then
3.8677 ++ac_res=`eval 'as_val=${'$as_ac_Header'}
3.8678 ++ $as_echo "$as_val"'`
3.8679 ++ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
3.8680 ++$as_echo "$ac_res" >&6; }
3.8681 ++
3.8682 ++fi
3.8683 ++as_val=`eval 'as_val=${'$as_ac_Header'}
3.8684 ++ $as_echo "$as_val"'`
3.8685 ++ if test "x$as_val" = x""yes; then
3.8686 + cat >>confdefs.h <<_ACEOF
3.8687 +-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
3.8688 ++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
3.8689 + _ACEOF
3.8690 + ac_has_bluetooth_h="yes"
3.8691 + fi
3.8692 +@@ -7763,8 +8431,8 @@
3.8693 + done
3.8694 +
3.8695 +
3.8696 +- { echo "$as_me:$LINENO: checking whether bluetooth support was found" >&5
3.8697 +-echo $ECHO_N "checking whether bluetooth support was found... $ECHO_C" >&6; }
3.8698 ++ { $as_echo "$as_me:$LINENO: checking whether bluetooth support was found" >&5
3.8699 ++$as_echo_n "checking whether bluetooth support was found... " >&6; }
3.8700 +
3.8701 + if test "$ac_has_libbluetooth" = yes -a "$ac_has_bluetooth_h" = yes; then
3.8702 +
3.8703 +@@ -7772,16 +8440,16 @@
3.8704 + #define OASYS_BLUETOOTH_ENABLED 1
3.8705 + _ACEOF
3.8706 +
3.8707 +- { echo "$as_me:$LINENO: result: yes" >&5
3.8708 +-echo "${ECHO_T}yes" >&6; }
3.8709 ++ { $as_echo "$as_me:$LINENO: result: yes" >&5
3.8710 ++$as_echo "yes" >&6; }
3.8711 +
3.8712 + elif test "$ac_use_bluez" = "try" ; then
3.8713 +- { echo "$as_me:$LINENO: result: no" >&5
3.8714 +-echo "${ECHO_T}no" >&6; }
3.8715 ++ { $as_echo "$as_me:$LINENO: result: no" >&5
3.8716 ++$as_echo "no" >&6; }
3.8717 +
3.8718 + else
3.8719 +- { { echo "$as_me:$LINENO: error: can't find bluez headers or library" >&5
3.8720 +-echo "$as_me: error: can't find bluez headers or library" >&2;}
3.8721 ++ { { $as_echo "$as_me:$LINENO: error: can't find bluez headers or library" >&5
3.8722 ++$as_echo "$as_me: error: can't find bluez headers or library" >&2;}
3.8723 + { (exit 1); exit 1; }; }
3.8724 + fi
3.8725 + fi
3.8726 +@@ -7796,21 +8464,21 @@
3.8727 + fi
3.8728 +
3.8729 +
3.8730 +- { echo "$as_me:$LINENO: checking whether expat support should be enabled" >&5
3.8731 +-echo $ECHO_N "checking whether expat support should be enabled... $ECHO_C" >&6; }
3.8732 ++ { $as_echo "$as_me:$LINENO: checking whether expat support should be enabled" >&5
3.8733 ++$as_echo_n "checking whether expat support should be enabled... " >&6; }
3.8734 +
3.8735 + if test "$ac_expatdir" = no ; then
3.8736 +- { echo "$as_me:$LINENO: result: no" >&5
3.8737 +-echo "${ECHO_T}no" >&6; }
3.8738 ++ { $as_echo "$as_me:$LINENO: result: no" >&5
3.8739 ++$as_echo "no" >&6; }
3.8740 + LIBEXPAT_ENABLED=0
3.8741 + else
3.8742 +
3.8743 + if test "$ac_expatdir" = try ; then
3.8744 +- { echo "$as_me:$LINENO: result: try" >&5
3.8745 +-echo "${ECHO_T}try" >&6; }
3.8746 +- else
3.8747 +- { echo "$as_me:$LINENO: result: yes (dir $ac_expatdir)" >&5
3.8748 +-echo "${ECHO_T}yes (dir $ac_expatdir)" >&6; }
3.8749 ++ { $as_echo "$as_me:$LINENO: result: try" >&5
3.8750 ++$as_echo "try" >&6; }
3.8751 ++ else
3.8752 ++ { $as_echo "$as_me:$LINENO: result: yes (dir $ac_expatdir)" >&5
3.8753 ++$as_echo "yes (dir $ac_expatdir)" >&6; }
3.8754 + fi
3.8755 + if test "$ac_expatdir" = yes -a ! x$oasys_cv_path_expat_h = x ; then
3.8756 + if test ! "$oasys_cv_lib_expat" = "" ; then
3.8757 +@@ -7852,8 +8520,8 @@
3.8758 + LIBS="-l$ac_expatlib $ac_save_LIBS"
3.8759 + fi
3.8760 +
3.8761 +- { echo "$as_me:$LINENO: checking for expat in $ac_expatincdir, $ac_expatlibdir, -l$ac_expatlib" >&5
3.8762 +-echo $ECHO_N "checking for expat in $ac_expatincdir, $ac_expatlibdir, -l$ac_expatlib... $ECHO_C" >&6; }
3.8763 ++ { $as_echo "$as_me:$LINENO: checking for expat in $ac_expatincdir, $ac_expatlibdir, -l$ac_expatlib" >&5
3.8764 ++$as_echo_n "checking for expat in $ac_expatincdir, $ac_expatlibdir, -l$ac_expatlib... " >&6; }
3.8765 + cat >conftest.$ac_ext <<_ACEOF
3.8766 + /* confdefs.h. */
3.8767 + _ACEOF
3.8768 +@@ -7880,39 +8548,43 @@
3.8769 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.8770 + *) ac_try_echo=$ac_try;;
3.8771 + esac
3.8772 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.8773 +- (eval "$ac_link") 2>conftest.er1
3.8774 +- ac_status=$?
3.8775 +- grep -v '^ *+' conftest.er1 >conftest.err
3.8776 +- rm -f conftest.er1
3.8777 +- cat conftest.err >&5
3.8778 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.8779 +- (exit $ac_status); } && {
3.8780 +- test -z "$ac_c_werror_flag" ||
3.8781 +- test ! -s conftest.err
3.8782 +- } && test -s conftest$ac_exeext &&
3.8783 +- $as_test_x conftest$ac_exeext; then
3.8784 +-
3.8785 +- { echo "$as_me:$LINENO: result: yes" >&5
3.8786 +-echo "${ECHO_T}yes" >&6; }
3.8787 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.8788 ++$as_echo "$ac_try_echo") >&5
3.8789 ++ (eval "$ac_link") 2>conftest.er1
3.8790 ++ ac_status=$?
3.8791 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.8792 ++ rm -f conftest.er1
3.8793 ++ cat conftest.err >&5
3.8794 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.8795 ++ (exit $ac_status); } && {
3.8796 ++ test -z "$ac_c_werror_flag" ||
3.8797 ++ test ! -s conftest.err
3.8798 ++ } && test -s conftest$ac_exeext && {
3.8799 ++ test "$cross_compiling" = yes ||
3.8800 ++ $as_test_x conftest$ac_exeext
3.8801 ++ }; then
3.8802 ++
3.8803 ++ { $as_echo "$as_me:$LINENO: result: yes" >&5
3.8804 ++$as_echo "yes" >&6; }
3.8805 + oasys_cv_path_expat_h=$ac_expatincdir
3.8806 + oasys_cv_path_expat_lib=$ac_expatlibdir
3.8807 + oasys_cv_lib_expat=$ac_expatlib
3.8808 + break 4
3.8809 +
3.8810 + else
3.8811 +- echo "$as_me: failed program was:" >&5
3.8812 +-sed 's/^/| /' conftest.$ac_ext >&5
3.8813 +-
3.8814 +-
3.8815 +- { echo "$as_me:$LINENO: result: no" >&5
3.8816 +-echo "${ECHO_T}no" >&6; }
3.8817 ++ $as_echo "$as_me: failed program was:" >&5
3.8818 ++sed 's/^/| /' conftest.$ac_ext >&5
3.8819 ++
3.8820 ++
3.8821 ++ { $as_echo "$as_me:$LINENO: result: no" >&5
3.8822 ++$as_echo "no" >&6; }
3.8823 + oasys_cv_path_expat_h=
3.8824 + oasys_cv_path_expat_lib=
3.8825 + oasys_cv_lib_expat=
3.8826 +
3.8827 + fi
3.8828 +
3.8829 ++rm -rf conftest.dSYM
3.8830 + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
3.8831 + conftest$ac_exeext conftest.$ac_ext
3.8832 + done
3.8833 +@@ -7922,17 +8594,17 @@
3.8834 + LDFLAGS="$ac_save_LDFLAGS"
3.8835 + LIBS="$ac_save_LIBS"
3.8836 +
3.8837 +- { echo "$as_me:$LINENO: checking whether libexpat was found" >&5
3.8838 +-echo $ECHO_N "checking whether libexpat was found... $ECHO_C" >&6; }
3.8839 ++ { $as_echo "$as_me:$LINENO: checking whether libexpat was found" >&5
3.8840 ++$as_echo_n "checking whether libexpat was found... " >&6; }
3.8841 + if test ! x$oasys_cv_path_expat_h = x ; then
3.8842 +- { echo "$as_me:$LINENO: result: yes" >&5
3.8843 +-echo "${ECHO_T}yes" >&6; }
3.8844 ++ { $as_echo "$as_me:$LINENO: result: yes" >&5
3.8845 ++$as_echo "yes" >&6; }
3.8846 + elif test $ac_expatdir = try ; then
3.8847 +- { echo "$as_me:$LINENO: result: no" >&5
3.8848 +-echo "${ECHO_T}no" >&6; }
3.8849 +- else
3.8850 +- { { echo "$as_me:$LINENO: error: can't find usable expat installation" >&5
3.8851 +-echo "$as_me: error: can't find usable expat installation" >&2;}
3.8852 ++ { $as_echo "$as_me:$LINENO: result: no" >&5
3.8853 ++$as_echo "no" >&6; }
3.8854 ++ else
3.8855 ++ { { $as_echo "$as_me:$LINENO: error: can't find usable expat installation" >&5
3.8856 ++$as_echo "$as_me: error: can't find usable expat installation" >&2;}
3.8857 + { (exit 1); exit 1; }; }
3.8858 + fi
3.8859 +
3.8860 +@@ -7971,24 +8643,28 @@
3.8861 + fi
3.8862 +
3.8863 +
3.8864 +- { echo "$as_me:$LINENO: checking whether xerces-c support should be enabled" >&5
3.8865 +-echo $ECHO_N "checking whether xerces-c support should be enabled... $ECHO_C" >&6; }
3.8866 ++ { $as_echo "$as_me:$LINENO: checking whether xerces-c support should be enabled" >&5
3.8867 ++$as_echo_n "checking whether xerces-c support should be enabled... " >&6; }
3.8868 +
3.8869 + if test "$ac_with_xerces_c" = no; then
3.8870 +- { echo "$as_me:$LINENO: result: no" >&5
3.8871 +-echo "${ECHO_T}no" >&6; }
3.8872 ++ { $as_echo "$as_me:$LINENO: result: no" >&5
3.8873 ++$as_echo "no" >&6; }
3.8874 + XERCES_C_ENABLED=0
3.8875 ++ echo ""
3.8876 ++ { $as_echo "$as_me:$LINENO: Proceeding without xerces-c support as requested" >&5
3.8877 ++$as_echo "$as_me: Proceeding without xerces-c support as requested" >&6;}
3.8878 ++ echo ""
3.8879 + else
3.8880 +
3.8881 + if test "$ac_with_xerces_c" = try \
3.8882 + -o "$ac_with_xerces_c" = yes \
3.8883 + -o "$ac_with_xerces_c" = "" ; then
3.8884 +- { echo "$as_me:$LINENO: result: try" >&5
3.8885 +-echo "${ECHO_T}try" >&6; }
3.8886 ++ { $as_echo "$as_me:$LINENO: result: try" >&5
3.8887 ++$as_echo "try" >&6; }
3.8888 + ac_xerces_inst_dirs="/usr /usr/local"
3.8889 + else
3.8890 +- { echo "$as_me:$LINENO: result: yes (dir $ac_with_xerces_c)" >&5
3.8891 +-echo "${ECHO_T}yes (dir $ac_with_xerces_c)" >&6; }
3.8892 ++ { $as_echo "$as_me:$LINENO: result: yes (dir $ac_with_xerces_c)" >&5
3.8893 ++$as_echo "yes (dir $ac_with_xerces_c)" >&6; }
3.8894 + ac_xerces_inst_dirs="$ac_with_xerces_c"
3.8895 + fi
3.8896 +
3.8897 +@@ -7996,10 +8672,10 @@
3.8898 + ac_save_LDFLAGS="$LDFLAGS"
3.8899 + ac_save_LIBS="$LIBS"
3.8900 +
3.8901 +- { echo "$as_me:$LINENO: checking whether xerces-c (>= v2.6.0) was found" >&5
3.8902 +-echo $ECHO_N "checking whether xerces-c (>= v2.6.0) was found... $ECHO_C" >&6; }
3.8903 ++ { $as_echo "$as_me:$LINENO: checking whether xerces-c (>= v2.6.0) was found" >&5
3.8904 ++$as_echo_n "checking whether xerces-c (>= v2.6.0) was found... " >&6; }
3.8905 + if test "${oasys_cv_path_xerces_c+set}" = set; then
3.8906 +- echo $ECHO_N "(cached) $ECHO_C" >&6
3.8907 ++ $as_echo_n "(cached) " >&6
3.8908 + else
3.8909 +
3.8910 + for ac_xerces_inst_dir in $ac_xerces_inst_dirs; do
3.8911 +@@ -8053,24 +8729,27 @@
3.8912 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.8913 + *) ac_try_echo=$ac_try;;
3.8914 + esac
3.8915 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.8916 +- (eval "$ac_link") 2>conftest.er1
3.8917 +- ac_status=$?
3.8918 +- grep -v '^ *+' conftest.er1 >conftest.err
3.8919 +- rm -f conftest.er1
3.8920 +- cat conftest.err >&5
3.8921 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.8922 +- (exit $ac_status); } && {
3.8923 +- test -z "$ac_cxx_werror_flag" ||
3.8924 +- test ! -s conftest.err
3.8925 +- } && test -s conftest$ac_exeext &&
3.8926 +- $as_test_x conftest$ac_exeext; then
3.8927 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.8928 ++$as_echo "$ac_try_echo") >&5
3.8929 ++ (eval "$ac_link") 2>conftest.er1
3.8930 ++ ac_status=$?
3.8931 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.8932 ++ rm -f conftest.er1
3.8933 ++ cat conftest.err >&5
3.8934 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.8935 ++ (exit $ac_status); } && {
3.8936 ++ test -z "$ac_cxx_werror_flag" ||
3.8937 ++ test ! -s conftest.err
3.8938 ++ } && test -s conftest$ac_exeext && {
3.8939 ++ test "$cross_compiling" = yes ||
3.8940 ++ $as_test_x conftest$ac_exeext
3.8941 ++ }; then
3.8942 +
3.8943 + oasys_cv_path_xerces_c="$ac_xerces_inst_dir"
3.8944 + break
3.8945 +
3.8946 + else
3.8947 +- echo "$as_me: failed program was:" >&5
3.8948 ++ $as_echo "$as_me: failed program was:" >&5
3.8949 + sed 's/^/| /' conftest.$ac_ext >&5
3.8950 +
3.8951 +
3.8952 +@@ -8079,6 +8758,7 @@
3.8953 +
3.8954 + fi
3.8955 +
3.8956 ++rm -rf conftest.dSYM
3.8957 + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
3.8958 + conftest$ac_exeext conftest.$ac_ext
3.8959 + fi
3.8960 +@@ -8092,12 +8772,12 @@
3.8961 + LIBS="$ac_save_LIBS"
3.8962 +
3.8963 + if test -z "$oasys_cv_path_xerces_c"; then
3.8964 +- { echo "$as_me:$LINENO: result: no" >&5
3.8965 +-echo "${ECHO_T}no" >&6; }
3.8966 ++ { $as_echo "$as_me:$LINENO: result: no" >&5
3.8967 ++$as_echo "no" >&6; }
3.8968 + XERCES_C_ENABLED=0
3.8969 + else
3.8970 +- { echo "$as_me:$LINENO: result: yes" >&5
3.8971 +-echo "${ECHO_T}yes" >&6; }
3.8972 ++ { $as_echo "$as_me:$LINENO: result: yes" >&5
3.8973 ++$as_echo "yes" >&6; }
3.8974 + XERCES_C_ENABLED=1
3.8975 +
3.8976 + cat >>confdefs.h <<\_ACEOF
3.8977 +@@ -8113,6 +8793,241 @@
3.8978 +
3.8979 + fi
3.8980 +
3.8981 ++ac_ext=cpp
3.8982 ++ac_cpp='$CXXCPP $CPPFLAGS'
3.8983 ++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
3.8984 ++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
3.8985 ++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
3.8986 ++{ $as_echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
3.8987 ++$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
3.8988 ++if test -z "$CXXCPP"; then
3.8989 ++ if test "${ac_cv_prog_CXXCPP+set}" = set; then
3.8990 ++ $as_echo_n "(cached) " >&6
3.8991 ++else
3.8992 ++ # Double quotes because CXXCPP needs to be expanded
3.8993 ++ for CXXCPP in "$CXX -E" "/lib/cpp"
3.8994 ++ do
3.8995 ++ ac_preproc_ok=false
3.8996 ++for ac_cxx_preproc_warn_flag in '' yes
3.8997 ++do
3.8998 ++ # Use a header file that comes with gcc, so configuring glibc
3.8999 ++ # with a fresh cross-compiler works.
3.9000 ++ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
3.9001 ++ # <limits.h> exists even on freestanding compilers.
3.9002 ++ # On the NeXT, cc -E runs the code through the compiler's parser,
3.9003 ++ # not just through cpp. "Syntax error" is here to catch this case.
3.9004 ++ cat >conftest.$ac_ext <<_ACEOF
3.9005 ++/* confdefs.h. */
3.9006 ++_ACEOF
3.9007 ++cat confdefs.h >>conftest.$ac_ext
3.9008 ++cat >>conftest.$ac_ext <<_ACEOF
3.9009 ++/* end confdefs.h. */
3.9010 ++#ifdef __STDC__
3.9011 ++# include <limits.h>
3.9012 ++#else
3.9013 ++# include <assert.h>
3.9014 ++#endif
3.9015 ++ Syntax error
3.9016 ++_ACEOF
3.9017 ++if { (ac_try="$ac_cpp conftest.$ac_ext"
3.9018 ++case "(($ac_try" in
3.9019 ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.9020 ++ *) ac_try_echo=$ac_try;;
3.9021 ++esac
3.9022 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.9023 ++$as_echo "$ac_try_echo") >&5
3.9024 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
3.9025 ++ ac_status=$?
3.9026 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.9027 ++ rm -f conftest.er1
3.9028 ++ cat conftest.err >&5
3.9029 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.9030 ++ (exit $ac_status); } >/dev/null && {
3.9031 ++ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
3.9032 ++ test ! -s conftest.err
3.9033 ++ }; then
3.9034 ++ :
3.9035 ++else
3.9036 ++ $as_echo "$as_me: failed program was:" >&5
3.9037 ++sed 's/^/| /' conftest.$ac_ext >&5
3.9038 ++
3.9039 ++ # Broken: fails on valid input.
3.9040 ++continue
3.9041 ++fi
3.9042 ++
3.9043 ++rm -f conftest.err conftest.$ac_ext
3.9044 ++
3.9045 ++ # OK, works on sane cases. Now check whether nonexistent headers
3.9046 ++ # can be detected and how.
3.9047 ++ cat >conftest.$ac_ext <<_ACEOF
3.9048 ++/* confdefs.h. */
3.9049 ++_ACEOF
3.9050 ++cat confdefs.h >>conftest.$ac_ext
3.9051 ++cat >>conftest.$ac_ext <<_ACEOF
3.9052 ++/* end confdefs.h. */
3.9053 ++#include <ac_nonexistent.h>
3.9054 ++_ACEOF
3.9055 ++if { (ac_try="$ac_cpp conftest.$ac_ext"
3.9056 ++case "(($ac_try" in
3.9057 ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.9058 ++ *) ac_try_echo=$ac_try;;
3.9059 ++esac
3.9060 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.9061 ++$as_echo "$ac_try_echo") >&5
3.9062 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
3.9063 ++ ac_status=$?
3.9064 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.9065 ++ rm -f conftest.er1
3.9066 ++ cat conftest.err >&5
3.9067 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.9068 ++ (exit $ac_status); } >/dev/null && {
3.9069 ++ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
3.9070 ++ test ! -s conftest.err
3.9071 ++ }; then
3.9072 ++ # Broken: success on invalid input.
3.9073 ++continue
3.9074 ++else
3.9075 ++ $as_echo "$as_me: failed program was:" >&5
3.9076 ++sed 's/^/| /' conftest.$ac_ext >&5
3.9077 ++
3.9078 ++ # Passes both tests.
3.9079 ++ac_preproc_ok=:
3.9080 ++break
3.9081 ++fi
3.9082 ++
3.9083 ++rm -f conftest.err conftest.$ac_ext
3.9084 ++
3.9085 ++done
3.9086 ++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
3.9087 ++rm -f conftest.err conftest.$ac_ext
3.9088 ++if $ac_preproc_ok; then
3.9089 ++ break
3.9090 ++fi
3.9091 ++
3.9092 ++ done
3.9093 ++ ac_cv_prog_CXXCPP=$CXXCPP
3.9094 ++
3.9095 ++fi
3.9096 ++ CXXCPP=$ac_cv_prog_CXXCPP
3.9097 ++else
3.9098 ++ ac_cv_prog_CXXCPP=$CXXCPP
3.9099 ++fi
3.9100 ++{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5
3.9101 ++$as_echo "$CXXCPP" >&6; }
3.9102 ++ac_preproc_ok=false
3.9103 ++for ac_cxx_preproc_warn_flag in '' yes
3.9104 ++do
3.9105 ++ # Use a header file that comes with gcc, so configuring glibc
3.9106 ++ # with a fresh cross-compiler works.
3.9107 ++ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
3.9108 ++ # <limits.h> exists even on freestanding compilers.
3.9109 ++ # On the NeXT, cc -E runs the code through the compiler's parser,
3.9110 ++ # not just through cpp. "Syntax error" is here to catch this case.
3.9111 ++ cat >conftest.$ac_ext <<_ACEOF
3.9112 ++/* confdefs.h. */
3.9113 ++_ACEOF
3.9114 ++cat confdefs.h >>conftest.$ac_ext
3.9115 ++cat >>conftest.$ac_ext <<_ACEOF
3.9116 ++/* end confdefs.h. */
3.9117 ++#ifdef __STDC__
3.9118 ++# include <limits.h>
3.9119 ++#else
3.9120 ++# include <assert.h>
3.9121 ++#endif
3.9122 ++ Syntax error
3.9123 ++_ACEOF
3.9124 ++if { (ac_try="$ac_cpp conftest.$ac_ext"
3.9125 ++case "(($ac_try" in
3.9126 ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.9127 ++ *) ac_try_echo=$ac_try;;
3.9128 ++esac
3.9129 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.9130 ++$as_echo "$ac_try_echo") >&5
3.9131 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
3.9132 ++ ac_status=$?
3.9133 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.9134 ++ rm -f conftest.er1
3.9135 ++ cat conftest.err >&5
3.9136 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.9137 ++ (exit $ac_status); } >/dev/null && {
3.9138 ++ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
3.9139 ++ test ! -s conftest.err
3.9140 ++ }; then
3.9141 ++ :
3.9142 ++else
3.9143 ++ $as_echo "$as_me: failed program was:" >&5
3.9144 ++sed 's/^/| /' conftest.$ac_ext >&5
3.9145 ++
3.9146 ++ # Broken: fails on valid input.
3.9147 ++continue
3.9148 ++fi
3.9149 ++
3.9150 ++rm -f conftest.err conftest.$ac_ext
3.9151 ++
3.9152 ++ # OK, works on sane cases. Now check whether nonexistent headers
3.9153 ++ # can be detected and how.
3.9154 ++ cat >conftest.$ac_ext <<_ACEOF
3.9155 ++/* confdefs.h. */
3.9156 ++_ACEOF
3.9157 ++cat confdefs.h >>conftest.$ac_ext
3.9158 ++cat >>conftest.$ac_ext <<_ACEOF
3.9159 ++/* end confdefs.h. */
3.9160 ++#include <ac_nonexistent.h>
3.9161 ++_ACEOF
3.9162 ++if { (ac_try="$ac_cpp conftest.$ac_ext"
3.9163 ++case "(($ac_try" in
3.9164 ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.9165 ++ *) ac_try_echo=$ac_try;;
3.9166 ++esac
3.9167 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.9168 ++$as_echo "$ac_try_echo") >&5
3.9169 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
3.9170 ++ ac_status=$?
3.9171 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.9172 ++ rm -f conftest.er1
3.9173 ++ cat conftest.err >&5
3.9174 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.9175 ++ (exit $ac_status); } >/dev/null && {
3.9176 ++ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
3.9177 ++ test ! -s conftest.err
3.9178 ++ }; then
3.9179 ++ # Broken: success on invalid input.
3.9180 ++continue
3.9181 ++else
3.9182 ++ $as_echo "$as_me: failed program was:" >&5
3.9183 ++sed 's/^/| /' conftest.$ac_ext >&5
3.9184 ++
3.9185 ++ # Passes both tests.
3.9186 ++ac_preproc_ok=:
3.9187 ++break
3.9188 ++fi
3.9189 ++
3.9190 ++rm -f conftest.err conftest.$ac_ext
3.9191 ++
3.9192 ++done
3.9193 ++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
3.9194 ++rm -f conftest.err conftest.$ac_ext
3.9195 ++if $ac_preproc_ok; then
3.9196 ++ :
3.9197 ++else
3.9198 ++ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
3.9199 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3.9200 ++{ { $as_echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
3.9201 ++See \`config.log' for more details." >&5
3.9202 ++$as_echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
3.9203 ++See \`config.log' for more details." >&2;}
3.9204 ++ { (exit 1); exit 1; }; }; }
3.9205 ++fi
3.9206 ++
3.9207 ++ac_ext=cpp
3.9208 ++ac_cpp='$CXXCPP $CPPFLAGS'
3.9209 ++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
3.9210 ++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
3.9211 ++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
3.9212 ++
3.9213 ++
3.9214 ++
3.9215 ++#ac_tclreadlinedir='system'
3.9216 +
3.9217 +
3.9218 + # Check whether --with-tclreadline was given.
3.9219 +@@ -8123,22 +9038,21 @@
3.9220 + fi
3.9221 +
3.9222 +
3.9223 +- { echo "$as_me:$LINENO: checking whether tclreadline support should be enabled" >&5
3.9224 +-echo $ECHO_N "checking whether tclreadline support should be enabled... $ECHO_C" >&6; }
3.9225 +-
3.9226 +- if test "$ac_tclreadline" = no ; then
3.9227 +- { echo "$as_me:$LINENO: result: no" >&5
3.9228 +-echo "${ECHO_T}no" >&6; }
3.9229 ++ { $as_echo "$as_me:$LINENO: checking whether tclreadline support should be enabled" >&5
3.9230 ++$as_echo_n "checking whether tclreadline support should be enabled... " >&6; }
3.9231 ++ if test "$ac_tclreadline" = no ; then
3.9232 ++ { $as_echo "$as_me:$LINENO: result: no" >&5
3.9233 ++$as_echo "no" >&6; }
3.9234 + TCLREADLINE_ENABLED=0
3.9235 +
3.9236 + else
3.9237 +
3.9238 + if test "$ac_tclreadline" = try ; then
3.9239 +- { echo "$as_me:$LINENO: result: try" >&5
3.9240 +-echo "${ECHO_T}try" >&6; }
3.9241 +- else
3.9242 +- { echo "$as_me:$LINENO: result: yes" >&5
3.9243 +-echo "${ECHO_T}yes" >&6; }
3.9244 ++ { $as_echo "$as_me:$LINENO: result: try" >&5
3.9245 ++$as_echo "try" >&6; }
3.9246 ++ else
3.9247 ++ { $as_echo "$as_me:$LINENO: result: yes" >&5
3.9248 ++$as_echo "yes" >&6; }
3.9249 + fi
3.9250 +
3.9251 + if test $BUILD_SYSTEM = 'CYGWIN' ; then
3.9252 +@@ -8153,10 +9067,160 @@
3.9253 + LDFLAGS=
3.9254 + LIBS=
3.9255 +
3.9256 +- { echo "$as_me:$LINENO: checking for library containing readline" >&5
3.9257 +-echo $ECHO_N "checking for library containing readline... $ECHO_C" >&6; }
3.9258 ++ { $as_echo "$as_me:$LINENO: checking searching for the readline library development headers" >&5
3.9259 ++$as_echo_n "checking searching for the readline library development headers... " >&6; }
3.9260 ++
3.9261 ++for ac_header in readline/readline.h
3.9262 ++do
3.9263 ++as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
3.9264 ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
3.9265 ++ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
3.9266 ++$as_echo_n "checking for $ac_header... " >&6; }
3.9267 ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
3.9268 ++ $as_echo_n "(cached) " >&6
3.9269 ++fi
3.9270 ++ac_res=`eval 'as_val=${'$as_ac_Header'}
3.9271 ++ $as_echo "$as_val"'`
3.9272 ++ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
3.9273 ++$as_echo "$ac_res" >&6; }
3.9274 ++else
3.9275 ++ # Is the header compilable?
3.9276 ++{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
3.9277 ++$as_echo_n "checking $ac_header usability... " >&6; }
3.9278 ++cat >conftest.$ac_ext <<_ACEOF
3.9279 ++/* confdefs.h. */
3.9280 ++_ACEOF
3.9281 ++cat confdefs.h >>conftest.$ac_ext
3.9282 ++cat >>conftest.$ac_ext <<_ACEOF
3.9283 ++/* end confdefs.h. */
3.9284 ++$ac_includes_default
3.9285 ++#include <$ac_header>
3.9286 ++_ACEOF
3.9287 ++rm -f conftest.$ac_objext
3.9288 ++if { (ac_try="$ac_compile"
3.9289 ++case "(($ac_try" in
3.9290 ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.9291 ++ *) ac_try_echo=$ac_try;;
3.9292 ++esac
3.9293 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.9294 ++$as_echo "$ac_try_echo") >&5
3.9295 ++ (eval "$ac_compile") 2>conftest.er1
3.9296 ++ ac_status=$?
3.9297 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.9298 ++ rm -f conftest.er1
3.9299 ++ cat conftest.err >&5
3.9300 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.9301 ++ (exit $ac_status); } && {
3.9302 ++ test -z "$ac_cxx_werror_flag" ||
3.9303 ++ test ! -s conftest.err
3.9304 ++ } && test -s conftest.$ac_objext; then
3.9305 ++ ac_header_compiler=yes
3.9306 ++else
3.9307 ++ $as_echo "$as_me: failed program was:" >&5
3.9308 ++sed 's/^/| /' conftest.$ac_ext >&5
3.9309 ++
3.9310 ++ ac_header_compiler=no
3.9311 ++fi
3.9312 ++
3.9313 ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3.9314 ++{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
3.9315 ++$as_echo "$ac_header_compiler" >&6; }
3.9316 ++
3.9317 ++# Is the header present?
3.9318 ++{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
3.9319 ++$as_echo_n "checking $ac_header presence... " >&6; }
3.9320 ++cat >conftest.$ac_ext <<_ACEOF
3.9321 ++/* confdefs.h. */
3.9322 ++_ACEOF
3.9323 ++cat confdefs.h >>conftest.$ac_ext
3.9324 ++cat >>conftest.$ac_ext <<_ACEOF
3.9325 ++/* end confdefs.h. */
3.9326 ++#include <$ac_header>
3.9327 ++_ACEOF
3.9328 ++if { (ac_try="$ac_cpp conftest.$ac_ext"
3.9329 ++case "(($ac_try" in
3.9330 ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.9331 ++ *) ac_try_echo=$ac_try;;
3.9332 ++esac
3.9333 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.9334 ++$as_echo "$ac_try_echo") >&5
3.9335 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
3.9336 ++ ac_status=$?
3.9337 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.9338 ++ rm -f conftest.er1
3.9339 ++ cat conftest.err >&5
3.9340 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.9341 ++ (exit $ac_status); } >/dev/null && {
3.9342 ++ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
3.9343 ++ test ! -s conftest.err
3.9344 ++ }; then
3.9345 ++ ac_header_preproc=yes
3.9346 ++else
3.9347 ++ $as_echo "$as_me: failed program was:" >&5
3.9348 ++sed 's/^/| /' conftest.$ac_ext >&5
3.9349 ++
3.9350 ++ ac_header_preproc=no
3.9351 ++fi
3.9352 ++
3.9353 ++rm -f conftest.err conftest.$ac_ext
3.9354 ++{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
3.9355 ++$as_echo "$ac_header_preproc" >&6; }
3.9356 ++
3.9357 ++# So? What about this header?
3.9358 ++case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
3.9359 ++ yes:no: )
3.9360 ++ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
3.9361 ++$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
3.9362 ++ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
3.9363 ++$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
3.9364 ++ ac_header_preproc=yes
3.9365 ++ ;;
3.9366 ++ no:yes:* )
3.9367 ++ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
3.9368 ++$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
3.9369 ++ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
3.9370 ++$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
3.9371 ++ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
3.9372 ++$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
3.9373 ++ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
3.9374 ++$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
3.9375 ++ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
3.9376 ++$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
3.9377 ++ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
3.9378 ++$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
3.9379 ++
3.9380 ++ ;;
3.9381 ++esac
3.9382 ++{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
3.9383 ++$as_echo_n "checking for $ac_header... " >&6; }
3.9384 ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
3.9385 ++ $as_echo_n "(cached) " >&6
3.9386 ++else
3.9387 ++ eval "$as_ac_Header=\$ac_header_preproc"
3.9388 ++fi
3.9389 ++ac_res=`eval 'as_val=${'$as_ac_Header'}
3.9390 ++ $as_echo "$as_val"'`
3.9391 ++ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
3.9392 ++$as_echo "$ac_res" >&6; }
3.9393 ++
3.9394 ++fi
3.9395 ++as_val=`eval 'as_val=${'$as_ac_Header'}
3.9396 ++ $as_echo "$as_val"'`
3.9397 ++ if test "x$as_val" = x""yes; then
3.9398 ++ cat >>confdefs.h <<_ACEOF
3.9399 ++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
3.9400 ++_ACEOF
3.9401 ++ TCLREADLINE_ENABLED=1
3.9402 ++else
3.9403 ++ TCLREADLINE_ENABLED=0
3.9404 ++fi
3.9405 ++
3.9406 ++done
3.9407 ++
3.9408 ++ { $as_echo "$as_me:$LINENO: checking for library containing readline" >&5
3.9409 ++$as_echo_n "checking for library containing readline... " >&6; }
3.9410 + if test "${ac_cv_search_readline+set}" = set; then
3.9411 +- echo $ECHO_N "(cached) $ECHO_C" >&6
3.9412 ++ $as_echo_n "(cached) " >&6
3.9413 + else
3.9414 + ac_func_search_save_LIBS=$LIBS
3.9415 + cat >conftest.$ac_ext <<_ACEOF
3.9416 +@@ -8194,26 +9258,30 @@
3.9417 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.9418 + *) ac_try_echo=$ac_try;;
3.9419 + esac
3.9420 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.9421 +- (eval "$ac_link") 2>conftest.er1
3.9422 +- ac_status=$?
3.9423 +- grep -v '^ *+' conftest.er1 >conftest.err
3.9424 +- rm -f conftest.er1
3.9425 +- cat conftest.err >&5
3.9426 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.9427 +- (exit $ac_status); } && {
3.9428 +- test -z "$ac_cxx_werror_flag" ||
3.9429 +- test ! -s conftest.err
3.9430 +- } && test -s conftest$ac_exeext &&
3.9431 +- $as_test_x conftest$ac_exeext; then
3.9432 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.9433 ++$as_echo "$ac_try_echo") >&5
3.9434 ++ (eval "$ac_link") 2>conftest.er1
3.9435 ++ ac_status=$?
3.9436 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.9437 ++ rm -f conftest.er1
3.9438 ++ cat conftest.err >&5
3.9439 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.9440 ++ (exit $ac_status); } && {
3.9441 ++ test -z "$ac_cxx_werror_flag" ||
3.9442 ++ test ! -s conftest.err
3.9443 ++ } && test -s conftest$ac_exeext && {
3.9444 ++ test "$cross_compiling" = yes ||
3.9445 ++ $as_test_x conftest$ac_exeext
3.9446 ++ }; then
3.9447 + ac_cv_search_readline=$ac_res
3.9448 + else
3.9449 +- echo "$as_me: failed program was:" >&5
3.9450 +-sed 's/^/| /' conftest.$ac_ext >&5
3.9451 +-
3.9452 +-
3.9453 +-fi
3.9454 +-
3.9455 ++ $as_echo "$as_me: failed program was:" >&5
3.9456 ++sed 's/^/| /' conftest.$ac_ext >&5
3.9457 ++
3.9458 ++
3.9459 ++fi
3.9460 ++
3.9461 ++rm -rf conftest.dSYM
3.9462 + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
3.9463 + conftest$ac_exeext
3.9464 + if test "${ac_cv_search_readline+set}" = set; then
3.9465 +@@ -8228,8 +9296,8 @@
3.9466 + rm conftest.$ac_ext
3.9467 + LIBS=$ac_func_search_save_LIBS
3.9468 + fi
3.9469 +-{ echo "$as_me:$LINENO: result: $ac_cv_search_readline" >&5
3.9470 +-echo "${ECHO_T}$ac_cv_search_readline" >&6; }
3.9471 ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_readline" >&5
3.9472 ++$as_echo "$ac_cv_search_readline" >&6; }
3.9473 + ac_res=$ac_cv_search_readline
3.9474 + if test "$ac_res" != no; then
3.9475 + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
3.9476 +@@ -8257,11 +9325,11 @@
3.9477 +
3.9478 + fi
3.9479 +
3.9480 +- if test $TCLREADLINE_ENABLED = 1 ; then
3.9481 +- { echo "$as_me:$LINENO: checking whether readline is GNU readline or BSD editline" >&5
3.9482 +-echo $ECHO_N "checking whether readline is GNU readline or BSD editline... $ECHO_C" >&6; }
3.9483 ++ if test "$TCLREADLINE_ENABLED" = 1; then
3.9484 ++ { $as_echo "$as_me:$LINENO: checking whether readline is GNU readline or BSD editline" >&5
3.9485 ++$as_echo_n "checking whether readline is GNU readline or BSD editline... " >&6; }
3.9486 + if test "${oasys_cv_readline_is_editline+set}" = set; then
3.9487 +- echo $ECHO_N "(cached) $ECHO_C" >&6
3.9488 ++ $as_echo_n "(cached) " >&6
3.9489 + else
3.9490 + cat >conftest.$ac_ext <<_ACEOF
3.9491 + /* confdefs.h. */
3.9492 +@@ -8291,31 +9359,35 @@
3.9493 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.9494 + *) ac_try_echo=$ac_try;;
3.9495 + esac
3.9496 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.9497 +- (eval "$ac_link") 2>conftest.er1
3.9498 +- ac_status=$?
3.9499 +- grep -v '^ *+' conftest.er1 >conftest.err
3.9500 +- rm -f conftest.er1
3.9501 +- cat conftest.err >&5
3.9502 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.9503 +- (exit $ac_status); } && {
3.9504 +- test -z "$ac_cxx_werror_flag" ||
3.9505 +- test ! -s conftest.err
3.9506 +- } && test -s conftest$ac_exeext &&
3.9507 +- $as_test_x conftest$ac_exeext; then
3.9508 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.9509 ++$as_echo "$ac_try_echo") >&5
3.9510 ++ (eval "$ac_link") 2>conftest.er1
3.9511 ++ ac_status=$?
3.9512 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.9513 ++ rm -f conftest.er1
3.9514 ++ cat conftest.err >&5
3.9515 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.9516 ++ (exit $ac_status); } && {
3.9517 ++ test -z "$ac_cxx_werror_flag" ||
3.9518 ++ test ! -s conftest.err
3.9519 ++ } && test -s conftest$ac_exeext && {
3.9520 ++ test "$cross_compiling" = yes ||
3.9521 ++ $as_test_x conftest$ac_exeext
3.9522 ++ }; then
3.9523 + oasys_cv_readline_is_editline=GNU
3.9524 + else
3.9525 +- echo "$as_me: failed program was:" >&5
3.9526 ++ $as_echo "$as_me: failed program was:" >&5
3.9527 + sed 's/^/| /' conftest.$ac_ext >&5
3.9528 +
3.9529 + oasys_cv_readline_is_editline=editline
3.9530 + fi
3.9531 +
3.9532 +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
3.9533 +- conftest$ac_exeext conftest.$ac_ext
3.9534 +-fi
3.9535 +-{ echo "$as_me:$LINENO: result: $oasys_cv_readline_is_editline" >&5
3.9536 +-echo "${ECHO_T}$oasys_cv_readline_is_editline" >&6; }
3.9537 ++rm -rf conftest.dSYM
3.9538 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
3.9539 ++ conftest$ac_exeext conftest.$ac_ext
3.9540 ++fi
3.9541 ++{ $as_echo "$as_me:$LINENO: result: $oasys_cv_readline_is_editline" >&5
3.9542 ++$as_echo "$oasys_cv_readline_is_editline" >&6; }
3.9543 + if test $oasys_cv_readline_is_editline = editline ; then
3.9544 +
3.9545 + cat >>confdefs.h <<_ACEOF
3.9546 +@@ -8324,15 +9396,48 @@
3.9547 +
3.9548 + fi
3.9549 +
3.9550 +- { echo "$as_me:$LINENO: checking whether tclreadline support was found" >&5
3.9551 +-echo $ECHO_N "checking whether tclreadline support was found... $ECHO_C" >&6; }
3.9552 +- { echo "$as_me:$LINENO: result: yes" >&5
3.9553 +-echo "${ECHO_T}yes" >&6; }
3.9554 +- else
3.9555 +- { echo "$as_me:$LINENO: checking whether tclreadline support was found" >&5
3.9556 +-echo $ECHO_N "checking whether tclreadline support was found... $ECHO_C" >&6; }
3.9557 +- { echo "$as_me:$LINENO: result: no" >&5
3.9558 +-echo "${ECHO_T}no" >&6; }
3.9559 ++ { $as_echo "$as_me:$LINENO: checking whether tclreadline support was found" >&5
3.9560 ++$as_echo_n "checking whether tclreadline support was found... " >&6; }
3.9561 ++ { $as_echo "$as_me:$LINENO: result: yes" >&5
3.9562 ++$as_echo "yes" >&6; }
3.9563 ++
3.9564 ++ else
3.9565 ++
3.9566 ++ { $as_echo "$as_me:$LINENO: checking whether tclreadline support was found" >&5
3.9567 ++$as_echo_n "checking whether tclreadline support was found... " >&6; }
3.9568 ++ { $as_echo "$as_me:$LINENO: result: no" >&5
3.9569 ++$as_echo "no" >&6; }
3.9570 ++ if test "$ac_tclreadline" = yes; then
3.9571 ++
3.9572 ++cat <<EOF
3.9573 ++
3.9574 ++Configure error with tclreadline...
3.9575 ++
3.9576 ++If you do not want tclreadline support at all, you can specify
3.9577 ++--without-tclreadline.
3.9578 ++
3.9579 ++Download tclreadline from http://tclreadline.sourceforge.net/
3.9580 ++
3.9581 ++Before trying to compile tclreadline you should do the following things:
3.9582 ++
3.9583 ++ (a) Make sure you have tcl 8.0 or higher.
3.9584 ++ tclreadline relies on a proper tcl installation:
3.9585 ++ It uses the tclConfig.sh file, which should reside somewhere
3.9586 ++ in /usr/local/lib/ or /usr/local/lib/tcl8.0/...
3.9587 ++
3.9588 ++ (b) Make sure you have gnu readline 2.2 or higher.
3.9589 ++ tclreadline uses the gnu readline callback handler
3.9590 ++
3.9591 ++ (c) The usual ./configure; make; make install sequence should do the rest.
3.9592 ++
3.9593 ++
3.9594 ++EOF
3.9595 ++
3.9596 ++
3.9597 ++ { { $as_echo "$as_me:$LINENO: error: can't find usable tclreadline" >&5
3.9598 ++$as_echo "$as_me: error: can't find usable tclreadline" >&2;}
3.9599 ++ { (exit 1); exit 1; }; }
3.9600 ++ fi
3.9601 + fi
3.9602 +
3.9603 + fi # ac_tclreadline != no
3.9604 +@@ -8354,16 +9459,16 @@
3.9605 + fi
3.9606 +
3.9607 +
3.9608 +- { echo "$as_me:$LINENO: checking whether zlib support should be enabled" >&5
3.9609 +-echo $ECHO_N "checking whether zlib support should be enabled... $ECHO_C" >&6; }
3.9610 ++ { $as_echo "$as_me:$LINENO: checking whether zlib support should be enabled" >&5
3.9611 ++$as_echo_n "checking whether zlib support should be enabled... " >&6; }
3.9612 +
3.9613 + if test "$ac_use_zlib" = "no"; then
3.9614 +- { echo "$as_me:$LINENO: result: no" >&5
3.9615 +-echo "${ECHO_T}no" >&6; }
3.9616 +-
3.9617 +- else
3.9618 +- { echo "$as_me:$LINENO: result: $ac_use_zlib" >&5
3.9619 +-echo "${ECHO_T}$ac_use_zlib" >&6; }
3.9620 ++ { $as_echo "$as_me:$LINENO: result: no" >&5
3.9621 ++$as_echo "no" >&6; }
3.9622 ++
3.9623 ++ else
3.9624 ++ { $as_echo "$as_me:$LINENO: result: $ac_use_zlib" >&5
3.9625 ++$as_echo "$ac_use_zlib" >&6; }
3.9626 +
3.9627 +
3.9628 + ac_extlib_save_CFLAGS=$CFLAGS
3.9629 +@@ -8374,10 +9479,10 @@
3.9630 + LDFLAGS=
3.9631 + LIBS=
3.9632 +
3.9633 +- { echo "$as_me:$LINENO: checking for library containing compress" >&5
3.9634 +-echo $ECHO_N "checking for library containing compress... $ECHO_C" >&6; }
3.9635 ++ { $as_echo "$as_me:$LINENO: checking for library containing compress" >&5
3.9636 ++$as_echo_n "checking for library containing compress... " >&6; }
3.9637 + if test "${ac_cv_search_compress+set}" = set; then
3.9638 +- echo $ECHO_N "(cached) $ECHO_C" >&6
3.9639 ++ $as_echo_n "(cached) " >&6
3.9640 + else
3.9641 + ac_func_search_save_LIBS=$LIBS
3.9642 + cat >conftest.$ac_ext <<_ACEOF
3.9643 +@@ -8415,26 +9520,30 @@
3.9644 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.9645 + *) ac_try_echo=$ac_try;;
3.9646 + esac
3.9647 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.9648 +- (eval "$ac_link") 2>conftest.er1
3.9649 +- ac_status=$?
3.9650 +- grep -v '^ *+' conftest.er1 >conftest.err
3.9651 +- rm -f conftest.er1
3.9652 +- cat conftest.err >&5
3.9653 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.9654 +- (exit $ac_status); } && {
3.9655 +- test -z "$ac_cxx_werror_flag" ||
3.9656 +- test ! -s conftest.err
3.9657 +- } && test -s conftest$ac_exeext &&
3.9658 +- $as_test_x conftest$ac_exeext; then
3.9659 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.9660 ++$as_echo "$ac_try_echo") >&5
3.9661 ++ (eval "$ac_link") 2>conftest.er1
3.9662 ++ ac_status=$?
3.9663 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.9664 ++ rm -f conftest.er1
3.9665 ++ cat conftest.err >&5
3.9666 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.9667 ++ (exit $ac_status); } && {
3.9668 ++ test -z "$ac_cxx_werror_flag" ||
3.9669 ++ test ! -s conftest.err
3.9670 ++ } && test -s conftest$ac_exeext && {
3.9671 ++ test "$cross_compiling" = yes ||
3.9672 ++ $as_test_x conftest$ac_exeext
3.9673 ++ }; then
3.9674 + ac_cv_search_compress=$ac_res
3.9675 + else
3.9676 +- echo "$as_me: failed program was:" >&5
3.9677 +-sed 's/^/| /' conftest.$ac_ext >&5
3.9678 +-
3.9679 +-
3.9680 +-fi
3.9681 +-
3.9682 ++ $as_echo "$as_me: failed program was:" >&5
3.9683 ++sed 's/^/| /' conftest.$ac_ext >&5
3.9684 ++
3.9685 ++
3.9686 ++fi
3.9687 ++
3.9688 ++rm -rf conftest.dSYM
3.9689 + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
3.9690 + conftest$ac_exeext
3.9691 + if test "${ac_cv_search_compress+set}" = set; then
3.9692 +@@ -8449,18 +9558,18 @@
3.9693 + rm conftest.$ac_ext
3.9694 + LIBS=$ac_func_search_save_LIBS
3.9695 + fi
3.9696 +-{ echo "$as_me:$LINENO: result: $ac_cv_search_compress" >&5
3.9697 +-echo "${ECHO_T}$ac_cv_search_compress" >&6; }
3.9698 ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_compress" >&5
3.9699 ++$as_echo "$ac_cv_search_compress" >&6; }
3.9700 + ac_res=$ac_cv_search_compress
3.9701 + if test "$ac_res" != no; then
3.9702 + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
3.9703 + ac_has_libz="yes"
3.9704 + fi
3.9705 +
3.9706 +- { echo "$as_me:$LINENO: checking for library containing compressBound" >&5
3.9707 +-echo $ECHO_N "checking for library containing compressBound... $ECHO_C" >&6; }
3.9708 ++ { $as_echo "$as_me:$LINENO: checking for library containing compressBound" >&5
3.9709 ++$as_echo_n "checking for library containing compressBound... " >&6; }
3.9710 + if test "${ac_cv_search_compressBound+set}" = set; then
3.9711 +- echo $ECHO_N "(cached) $ECHO_C" >&6
3.9712 ++ $as_echo_n "(cached) " >&6
3.9713 + else
3.9714 + ac_func_search_save_LIBS=$LIBS
3.9715 + cat >conftest.$ac_ext <<_ACEOF
3.9716 +@@ -8498,26 +9607,30 @@
3.9717 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.9718 + *) ac_try_echo=$ac_try;;
3.9719 + esac
3.9720 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.9721 +- (eval "$ac_link") 2>conftest.er1
3.9722 +- ac_status=$?
3.9723 +- grep -v '^ *+' conftest.er1 >conftest.err
3.9724 +- rm -f conftest.er1
3.9725 +- cat conftest.err >&5
3.9726 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.9727 +- (exit $ac_status); } && {
3.9728 +- test -z "$ac_cxx_werror_flag" ||
3.9729 +- test ! -s conftest.err
3.9730 +- } && test -s conftest$ac_exeext &&
3.9731 +- $as_test_x conftest$ac_exeext; then
3.9732 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.9733 ++$as_echo "$ac_try_echo") >&5
3.9734 ++ (eval "$ac_link") 2>conftest.er1
3.9735 ++ ac_status=$?
3.9736 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.9737 ++ rm -f conftest.er1
3.9738 ++ cat conftest.err >&5
3.9739 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.9740 ++ (exit $ac_status); } && {
3.9741 ++ test -z "$ac_cxx_werror_flag" ||
3.9742 ++ test ! -s conftest.err
3.9743 ++ } && test -s conftest$ac_exeext && {
3.9744 ++ test "$cross_compiling" = yes ||
3.9745 ++ $as_test_x conftest$ac_exeext
3.9746 ++ }; then
3.9747 + ac_cv_search_compressBound=$ac_res
3.9748 + else
3.9749 +- echo "$as_me: failed program was:" >&5
3.9750 +-sed 's/^/| /' conftest.$ac_ext >&5
3.9751 +-
3.9752 +-
3.9753 +-fi
3.9754 +-
3.9755 ++ $as_echo "$as_me: failed program was:" >&5
3.9756 ++sed 's/^/| /' conftest.$ac_ext >&5
3.9757 ++
3.9758 ++
3.9759 ++fi
3.9760 ++
3.9761 ++rm -rf conftest.dSYM
3.9762 + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
3.9763 + conftest$ac_exeext
3.9764 + if test "${ac_cv_search_compressBound+set}" = set; then
3.9765 +@@ -8532,8 +9645,8 @@
3.9766 + rm conftest.$ac_ext
3.9767 + LIBS=$ac_func_search_save_LIBS
3.9768 + fi
3.9769 +-{ echo "$as_me:$LINENO: result: $ac_cv_search_compressBound" >&5
3.9770 +-echo "${ECHO_T}$ac_cv_search_compressBound" >&6; }
3.9771 ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_compressBound" >&5
3.9772 ++$as_echo "$ac_cv_search_compressBound" >&6; }
3.9773 + ac_res=$ac_cv_search_compressBound
3.9774 + if test "$ac_res" != no; then
3.9775 + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
3.9776 +@@ -8558,8 +9671,8 @@
3.9777 + LIBS=$ac_extlib_save_LIBS
3.9778 +
3.9779 +
3.9780 +- { echo "$as_me:$LINENO: checking whether zlib support was found" >&5
3.9781 +-echo $ECHO_N "checking whether zlib support was found... $ECHO_C" >&6; }
3.9782 ++ { $as_echo "$as_me:$LINENO: checking whether zlib support was found" >&5
3.9783 ++$as_echo_n "checking whether zlib support was found... " >&6; }
3.9784 +
3.9785 + if test "$ac_has_libz" = yes ; then
3.9786 +
3.9787 +@@ -8567,8 +9680,8 @@
3.9788 + #define OASYS_ZLIB_ENABLED 1
3.9789 + _ACEOF
3.9790 +
3.9791 +- { echo "$as_me:$LINENO: result: yes" >&5
3.9792 +-echo "${ECHO_T}yes" >&6; }
3.9793 ++ { $as_echo "$as_me:$LINENO: result: yes" >&5
3.9794 ++$as_echo "yes" >&6; }
3.9795 +
3.9796 + if test "$ac_zlib_has_compressBound" = yes ; then
3.9797 +
3.9798 +@@ -8579,12 +9692,12 @@
3.9799 + fi
3.9800 +
3.9801 + elif test "$ac_use_zlib" = "try" ; then
3.9802 +- { echo "$as_me:$LINENO: result: no" >&5
3.9803 +-echo "${ECHO_T}no" >&6; }
3.9804 ++ { $as_echo "$as_me:$LINENO: result: no" >&5
3.9805 ++$as_echo "no" >&6; }
3.9806 +
3.9807 + else
3.9808 +- { { echo "$as_me:$LINENO: error: can't find zlib library" >&5
3.9809 +-echo "$as_me: error: can't find zlib library" >&2;}
3.9810 ++ { { $as_echo "$as_me:$LINENO: error: can't find zlib library" >&5
3.9811 ++$as_echo "$as_me: error: can't find zlib library" >&2;}
3.9812 + { (exit 1); exit 1; }; }
3.9813 + fi
3.9814 + fi
3.9815 +@@ -8602,10 +9715,10 @@
3.9816 + if test -n "$ac_tool_prefix"; then
3.9817 + # Extract the first word of "${ac_tool_prefix}$ac_with_xsd_tool", so it can be a program name with args.
3.9818 + set dummy ${ac_tool_prefix}$ac_with_xsd_tool; ac_word=$2
3.9819 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
3.9820 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
3.9821 ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
3.9822 ++$as_echo_n "checking for $ac_word... " >&6; }
3.9823 + if test "${ac_cv_prog_XSD_TOOL+set}" = set; then
3.9824 +- echo $ECHO_N "(cached) $ECHO_C" >&6
3.9825 ++ $as_echo_n "(cached) " >&6
3.9826 + else
3.9827 + if test -n "$XSD_TOOL"; then
3.9828 + ac_cv_prog_XSD_TOOL="$XSD_TOOL" # Let the user override the test.
3.9829 +@@ -8618,7 +9731,7 @@
3.9830 + for ac_exec_ext in '' $ac_executable_extensions; do
3.9831 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3.9832 + ac_cv_prog_XSD_TOOL="${ac_tool_prefix}$ac_with_xsd_tool"
3.9833 +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3.9834 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3.9835 + break 2
3.9836 + fi
3.9837 + done
3.9838 +@@ -8629,11 +9742,11 @@
3.9839 + fi
3.9840 + XSD_TOOL=$ac_cv_prog_XSD_TOOL
3.9841 + if test -n "$XSD_TOOL"; then
3.9842 +- { echo "$as_me:$LINENO: result: $XSD_TOOL" >&5
3.9843 +-echo "${ECHO_T}$XSD_TOOL" >&6; }
3.9844 +-else
3.9845 +- { echo "$as_me:$LINENO: result: no" >&5
3.9846 +-echo "${ECHO_T}no" >&6; }
3.9847 ++ { $as_echo "$as_me:$LINENO: result: $XSD_TOOL" >&5
3.9848 ++$as_echo "$XSD_TOOL" >&6; }
3.9849 ++else
3.9850 ++ { $as_echo "$as_me:$LINENO: result: no" >&5
3.9851 ++$as_echo "no" >&6; }
3.9852 + fi
3.9853 +
3.9854 +
3.9855 +@@ -8642,10 +9755,10 @@
3.9856 + ac_ct_XSD_TOOL=$XSD_TOOL
3.9857 + # Extract the first word of "$ac_with_xsd_tool", so it can be a program name with args.
3.9858 + set dummy $ac_with_xsd_tool; ac_word=$2
3.9859 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
3.9860 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
3.9861 ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
3.9862 ++$as_echo_n "checking for $ac_word... " >&6; }
3.9863 + if test "${ac_cv_prog_ac_ct_XSD_TOOL+set}" = set; then
3.9864 +- echo $ECHO_N "(cached) $ECHO_C" >&6
3.9865 ++ $as_echo_n "(cached) " >&6
3.9866 + else
3.9867 + if test -n "$ac_ct_XSD_TOOL"; then
3.9868 + ac_cv_prog_ac_ct_XSD_TOOL="$ac_ct_XSD_TOOL" # Let the user override the test.
3.9869 +@@ -8658,7 +9771,7 @@
3.9870 + for ac_exec_ext in '' $ac_executable_extensions; do
3.9871 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3.9872 + ac_cv_prog_ac_ct_XSD_TOOL="$ac_with_xsd_tool"
3.9873 +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3.9874 ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3.9875 + break 2
3.9876 + fi
3.9877 + done
3.9878 +@@ -8669,11 +9782,11 @@
3.9879 + fi
3.9880 + ac_ct_XSD_TOOL=$ac_cv_prog_ac_ct_XSD_TOOL
3.9881 + if test -n "$ac_ct_XSD_TOOL"; then
3.9882 +- { echo "$as_me:$LINENO: result: $ac_ct_XSD_TOOL" >&5
3.9883 +-echo "${ECHO_T}$ac_ct_XSD_TOOL" >&6; }
3.9884 +-else
3.9885 +- { echo "$as_me:$LINENO: result: no" >&5
3.9886 +-echo "${ECHO_T}no" >&6; }
3.9887 ++ { $as_echo "$as_me:$LINENO: result: $ac_ct_XSD_TOOL" >&5
3.9888 ++$as_echo "$ac_ct_XSD_TOOL" >&6; }
3.9889 ++else
3.9890 ++ { $as_echo "$as_me:$LINENO: result: no" >&5
3.9891 ++$as_echo "no" >&6; }
3.9892 + fi
3.9893 +
3.9894 + if test "x$ac_ct_XSD_TOOL" = x; then
3.9895 +@@ -8681,12 +9794,8 @@
3.9896 + else
3.9897 + case $cross_compiling:$ac_tool_warned in
3.9898 + yes:)
3.9899 +-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
3.9900 +-whose name does not start with the host triplet. If you think this
3.9901 +-configuration is useful to you, please write to autoconf@gnu.org." >&5
3.9902 +-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
3.9903 +-whose name does not start with the host triplet. If you think this
3.9904 +-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
3.9905 ++{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
3.9906 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
3.9907 + ac_tool_warned=yes ;;
3.9908 + esac
3.9909 + XSD_TOOL=$ac_ct_XSD_TOOL
3.9910 +@@ -8696,19 +9805,19 @@
3.9911 + fi
3.9912 +
3.9913 + if test -z "$XSD_TOOL" ; then
3.9914 +- { echo "$as_me:$LINENO: Cannot find a working xsd tool" >&5
3.9915 +-echo "$as_me: Cannot find a working xsd tool" >&6;}
3.9916 +- { echo "$as_me:$LINENO: You will not be able to regenerate XML schema bindings" >&5
3.9917 +-echo "$as_me: You will not be able to regenerate XML schema bindings" >&6;}
3.9918 +- { echo "$as_me:$LINENO: if you make changes to the .xsd file" >&5
3.9919 +-echo "$as_me: if you make changes to the .xsd file" >&6;}
3.9920 +- { echo "$as_me:$LINENO: Use --with-xsd-tool=(name) to specify the location of this tool" >&5
3.9921 +-echo "$as_me: Use --with-xsd-tool=(name) to specify the location of this tool" >&6;}
3.9922 +- fi
3.9923 +-
3.9924 +-
3.9925 +-
3.9926 +- ac_dbvers='4.6 4.5 4.4 4.3 4.2 4.1'
3.9927 ++ { $as_echo "$as_me:$LINENO: Cannot find a working xsd tool" >&5
3.9928 ++$as_echo "$as_me: Cannot find a working xsd tool" >&6;}
3.9929 ++ { $as_echo "$as_me:$LINENO: You will not be able to regenerate XML schema bindings" >&5
3.9930 ++$as_echo "$as_me: You will not be able to regenerate XML schema bindings" >&6;}
3.9931 ++ { $as_echo "$as_me:$LINENO: if you make changes to the .xsd file" >&5
3.9932 ++$as_echo "$as_me: if you make changes to the .xsd file" >&6;}
3.9933 ++ { $as_echo "$as_me:$LINENO: Use --with-xsd-tool=(name) to specify the location of this tool" >&5
3.9934 ++$as_echo "$as_me: Use --with-xsd-tool=(name) to specify the location of this tool" >&6;}
3.9935 ++ fi
3.9936 ++
3.9937 ++
3.9938 ++
3.9939 ++ ac_dbvers='4.7 4.6 4.5 4.4 4.3 4.2 4.1'
3.9940 + ac_dbdir='yes'
3.9941 +
3.9942 +
3.9943 +@@ -8782,8 +9891,8 @@
3.9944 + LDFLAGS="$ac_save_LDFLAGS"
3.9945 + LIBS="$ac_save_LIBS"
3.9946 +
3.9947 +- { echo "$as_me:$LINENO: checking for Berkeley DB header (version $ac_dbver) in $ac_dbincdir" >&5
3.9948 +-echo $ECHO_N "checking for Berkeley DB header (version $ac_dbver) in $ac_dbincdir... $ECHO_C" >&6; }
3.9949 ++ { $as_echo "$as_me:$LINENO: checking for Berkeley DB header (version $ac_dbver) in $ac_dbincdir" >&5
3.9950 ++$as_echo_n "checking for Berkeley DB header (version $ac_dbver) in $ac_dbincdir... " >&6; }
3.9951 + cat >conftest.$ac_ext <<_ACEOF
3.9952 + /* confdefs.h. */
3.9953 + _ACEOF
3.9954 +@@ -8813,33 +9922,37 @@
3.9955 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.9956 + *) ac_try_echo=$ac_try;;
3.9957 + esac
3.9958 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.9959 +- (eval "$ac_link") 2>conftest.er1
3.9960 +- ac_status=$?
3.9961 +- grep -v '^ *+' conftest.er1 >conftest.err
3.9962 +- rm -f conftest.er1
3.9963 +- cat conftest.err >&5
3.9964 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.9965 +- (exit $ac_status); } && {
3.9966 +- test -z "$ac_cxx_werror_flag" ||
3.9967 +- test ! -s conftest.err
3.9968 +- } && test -s conftest$ac_exeext &&
3.9969 +- $as_test_x conftest$ac_exeext; then
3.9970 +-
3.9971 +- { echo "$as_me:$LINENO: result: yes" >&5
3.9972 +-echo "${ECHO_T}yes" >&6; }
3.9973 +-
3.9974 +-else
3.9975 +- echo "$as_me: failed program was:" >&5
3.9976 +-sed 's/^/| /' conftest.$ac_ext >&5
3.9977 +-
3.9978 +-
3.9979 +- { echo "$as_me:$LINENO: result: no" >&5
3.9980 +-echo "${ECHO_T}no" >&6; }
3.9981 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.9982 ++$as_echo "$ac_try_echo") >&5
3.9983 ++ (eval "$ac_link") 2>conftest.er1
3.9984 ++ ac_status=$?
3.9985 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.9986 ++ rm -f conftest.er1
3.9987 ++ cat conftest.err >&5
3.9988 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.9989 ++ (exit $ac_status); } && {
3.9990 ++ test -z "$ac_cxx_werror_flag" ||
3.9991 ++ test ! -s conftest.err
3.9992 ++ } && test -s conftest$ac_exeext && {
3.9993 ++ test "$cross_compiling" = yes ||
3.9994 ++ $as_test_x conftest$ac_exeext
3.9995 ++ }; then
3.9996 ++
3.9997 ++ { $as_echo "$as_me:$LINENO: result: yes" >&5
3.9998 ++$as_echo "yes" >&6; }
3.9999 ++
3.10000 ++else
3.10001 ++ $as_echo "$as_me: failed program was:" >&5
3.10002 ++sed 's/^/| /' conftest.$ac_ext >&5
3.10003 ++
3.10004 ++
3.10005 ++ { $as_echo "$as_me:$LINENO: result: no" >&5
3.10006 ++$as_echo "no" >&6; }
3.10007 + continue
3.10008 +
3.10009 + fi
3.10010 +
3.10011 ++rm -rf conftest.dSYM
3.10012 + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
3.10013 + conftest$ac_exeext conftest.$ac_ext
3.10014 +
3.10015 +@@ -8853,8 +9966,8 @@
3.10016 + LIBS="-l$ac_dblib $ac_save_LIBS"
3.10017 + fi
3.10018 +
3.10019 +- { echo "$as_me:$LINENO: checking for Berkeley DB library in $ac_dblibdir, -l$ac_dblib" >&5
3.10020 +-echo $ECHO_N "checking for Berkeley DB library in $ac_dblibdir, -l$ac_dblib... $ECHO_C" >&6; }
3.10021 ++ { $as_echo "$as_me:$LINENO: checking for Berkeley DB library in $ac_dblibdir, -l$ac_dblib" >&5
3.10022 ++$as_echo_n "checking for Berkeley DB library in $ac_dblibdir, -l$ac_dblib... " >&6; }
3.10023 + cat >conftest.$ac_ext <<_ACEOF
3.10024 + /* confdefs.h. */
3.10025 + _ACEOF
3.10026 +@@ -8881,36 +9994,40 @@
3.10027 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.10028 + *) ac_try_echo=$ac_try;;
3.10029 + esac
3.10030 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.10031 +- (eval "$ac_link") 2>conftest.er1
3.10032 +- ac_status=$?
3.10033 +- grep -v '^ *+' conftest.er1 >conftest.err
3.10034 +- rm -f conftest.er1
3.10035 +- cat conftest.err >&5
3.10036 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.10037 +- (exit $ac_status); } && {
3.10038 +- test -z "$ac_cxx_werror_flag" ||
3.10039 +- test ! -s conftest.err
3.10040 +- } && test -s conftest$ac_exeext &&
3.10041 +- $as_test_x conftest$ac_exeext; then
3.10042 +-
3.10043 +- { echo "$as_me:$LINENO: result: yes" >&5
3.10044 +-echo "${ECHO_T}yes" >&6; }
3.10045 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.10046 ++$as_echo "$ac_try_echo") >&5
3.10047 ++ (eval "$ac_link") 2>conftest.er1
3.10048 ++ ac_status=$?
3.10049 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.10050 ++ rm -f conftest.er1
3.10051 ++ cat conftest.err >&5
3.10052 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.10053 ++ (exit $ac_status); } && {
3.10054 ++ test -z "$ac_cxx_werror_flag" ||
3.10055 ++ test ! -s conftest.err
3.10056 ++ } && test -s conftest$ac_exeext && {
3.10057 ++ test "$cross_compiling" = yes ||
3.10058 ++ $as_test_x conftest$ac_exeext
3.10059 ++ }; then
3.10060 ++
3.10061 ++ { $as_echo "$as_me:$LINENO: result: yes" >&5
3.10062 ++$as_echo "yes" >&6; }
3.10063 + oasys_cv_db_incpath=$ac_dbincdir
3.10064 + oasys_cv_db_libpath=$ac_dblibdir
3.10065 + oasys_cv_db_lib=$ac_dblib
3.10066 + break 5
3.10067 +
3.10068 + else
3.10069 +- echo "$as_me: failed program was:" >&5
3.10070 +-sed 's/^/| /' conftest.$ac_ext >&5
3.10071 +-
3.10072 +-
3.10073 +- { echo "$as_me:$LINENO: result: no" >&5
3.10074 +-echo "${ECHO_T}no" >&6; }
3.10075 +-
3.10076 +-fi
3.10077 +-
3.10078 ++ $as_echo "$as_me: failed program was:" >&5
3.10079 ++sed 's/^/| /' conftest.$ac_ext >&5
3.10080 ++
3.10081 ++
3.10082 ++ { $as_echo "$as_me:$LINENO: result: no" >&5
3.10083 ++$as_echo "no" >&6; }
3.10084 ++
3.10085 ++fi
3.10086 ++
3.10087 ++rm -rf conftest.dSYM
3.10088 + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
3.10089 + conftest$ac_exeext conftest.$ac_ext
3.10090 +
3.10091 +@@ -8957,8 +10074,8 @@
3.10092 + EOF
3.10093 +
3.10094 +
3.10095 +- { { echo "$as_me:$LINENO: error: can't find usable Berkeley DB installation" >&5
3.10096 +-echo "$as_me: error: can't find usable Berkeley DB installation" >&2;}
3.10097 ++ { { $as_echo "$as_me:$LINENO: error: can't find usable Berkeley DB installation" >&5
3.10098 ++$as_echo "$as_me: error: can't find usable Berkeley DB installation" >&2;}
3.10099 + { (exit 1); exit 1; }; }
3.10100 + fi
3.10101 +
3.10102 +@@ -9012,10 +10129,12 @@
3.10103 + _ACEOF
3.10104 +
3.10105 +
3.10106 +- { echo "$as_me:$LINENO: checking for library containing request_init" >&5
3.10107 +-echo $ECHO_N "checking for library containing request_init... $ECHO_C" >&6; }
3.10108 ++ { $as_echo "$as_me:$LINENO: checking for mysql external dependencies.: checking for request_init() in libwrap" >&5
3.10109 ++$as_echo_n "checking for mysql external dependencies.: checking for request_init() in libwrap... " >&6; }
3.10110 ++ { $as_echo "$as_me:$LINENO: checking for library containing request_init" >&5
3.10111 ++$as_echo_n "checking for library containing request_init... " >&6; }
3.10112 + if test "${ac_cv_search_request_init+set}" = set; then
3.10113 +- echo $ECHO_N "(cached) $ECHO_C" >&6
3.10114 ++ $as_echo_n "(cached) " >&6
3.10115 + else
3.10116 + ac_func_search_save_LIBS=$LIBS
3.10117 + cat >conftest.$ac_ext <<_ACEOF
3.10118 +@@ -9053,26 +10172,30 @@
3.10119 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.10120 + *) ac_try_echo=$ac_try;;
3.10121 + esac
3.10122 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.10123 +- (eval "$ac_link") 2>conftest.er1
3.10124 +- ac_status=$?
3.10125 +- grep -v '^ *+' conftest.er1 >conftest.err
3.10126 +- rm -f conftest.er1
3.10127 +- cat conftest.err >&5
3.10128 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.10129 +- (exit $ac_status); } && {
3.10130 +- test -z "$ac_cxx_werror_flag" ||
3.10131 +- test ! -s conftest.err
3.10132 +- } && test -s conftest$ac_exeext &&
3.10133 +- $as_test_x conftest$ac_exeext; then
3.10134 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.10135 ++$as_echo "$ac_try_echo") >&5
3.10136 ++ (eval "$ac_link") 2>conftest.er1
3.10137 ++ ac_status=$?
3.10138 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.10139 ++ rm -f conftest.er1
3.10140 ++ cat conftest.err >&5
3.10141 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.10142 ++ (exit $ac_status); } && {
3.10143 ++ test -z "$ac_cxx_werror_flag" ||
3.10144 ++ test ! -s conftest.err
3.10145 ++ } && test -s conftest$ac_exeext && {
3.10146 ++ test "$cross_compiling" = yes ||
3.10147 ++ $as_test_x conftest$ac_exeext
3.10148 ++ }; then
3.10149 + ac_cv_search_request_init=$ac_res
3.10150 + else
3.10151 +- echo "$as_me: failed program was:" >&5
3.10152 +-sed 's/^/| /' conftest.$ac_ext >&5
3.10153 +-
3.10154 +-
3.10155 +-fi
3.10156 +-
3.10157 ++ $as_echo "$as_me: failed program was:" >&5
3.10158 ++sed 's/^/| /' conftest.$ac_ext >&5
3.10159 ++
3.10160 ++
3.10161 ++fi
3.10162 ++
3.10163 ++rm -rf conftest.dSYM
3.10164 + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
3.10165 + conftest$ac_exeext
3.10166 + if test "${ac_cv_search_request_init+set}" = set; then
3.10167 +@@ -9087,22 +10210,24 @@
3.10168 + rm conftest.$ac_ext
3.10169 + LIBS=$ac_func_search_save_LIBS
3.10170 + fi
3.10171 +-{ echo "$as_me:$LINENO: result: $ac_cv_search_request_init" >&5
3.10172 +-echo "${ECHO_T}$ac_cv_search_request_init" >&6; }
3.10173 ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_request_init" >&5
3.10174 ++$as_echo "$ac_cv_search_request_init" >&6; }
3.10175 + ac_res=$ac_cv_search_request_init
3.10176 + if test "$ac_res" != no; then
3.10177 + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
3.10178 +
3.10179 + else
3.10180 +- { { echo "$as_me:$LINENO: error: can't find request_init() in libwrap" >&5
3.10181 +-echo "$as_me: error: can't find request_init() in libwrap" >&2;}
3.10182 +- { (exit 1); exit 1; }; }
3.10183 +-fi
3.10184 +-
3.10185 +- { echo "$as_me:$LINENO: checking for library containing exp" >&5
3.10186 +-echo $ECHO_N "checking for library containing exp... $ECHO_C" >&6; }
3.10187 ++ { { $as_echo "$as_me:$LINENO: error: can't find request_init() in libwrap" >&5
3.10188 ++$as_echo "$as_me: error: can't find request_init() in libwrap" >&2;}
3.10189 ++ { (exit 1); exit 1; }; }
3.10190 ++fi
3.10191 ++
3.10192 ++ { $as_echo "$as_me:$LINENO: checking for mysql external dependencies.: checking for exp() in libm" >&5
3.10193 ++$as_echo_n "checking for mysql external dependencies.: checking for exp() in libm... " >&6; }
3.10194 ++ { $as_echo "$as_me:$LINENO: checking for library containing exp" >&5
3.10195 ++$as_echo_n "checking for library containing exp... " >&6; }
3.10196 + if test "${ac_cv_search_exp+set}" = set; then
3.10197 +- echo $ECHO_N "(cached) $ECHO_C" >&6
3.10198 ++ $as_echo_n "(cached) " >&6
3.10199 + else
3.10200 + ac_func_search_save_LIBS=$LIBS
3.10201 + cat >conftest.$ac_ext <<_ACEOF
3.10202 +@@ -9140,26 +10265,30 @@
3.10203 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.10204 + *) ac_try_echo=$ac_try;;
3.10205 + esac
3.10206 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.10207 +- (eval "$ac_link") 2>conftest.er1
3.10208 +- ac_status=$?
3.10209 +- grep -v '^ *+' conftest.er1 >conftest.err
3.10210 +- rm -f conftest.er1
3.10211 +- cat conftest.err >&5
3.10212 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.10213 +- (exit $ac_status); } && {
3.10214 +- test -z "$ac_cxx_werror_flag" ||
3.10215 +- test ! -s conftest.err
3.10216 +- } && test -s conftest$ac_exeext &&
3.10217 +- $as_test_x conftest$ac_exeext; then
3.10218 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.10219 ++$as_echo "$ac_try_echo") >&5
3.10220 ++ (eval "$ac_link") 2>conftest.er1
3.10221 ++ ac_status=$?
3.10222 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.10223 ++ rm -f conftest.er1
3.10224 ++ cat conftest.err >&5
3.10225 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.10226 ++ (exit $ac_status); } && {
3.10227 ++ test -z "$ac_cxx_werror_flag" ||
3.10228 ++ test ! -s conftest.err
3.10229 ++ } && test -s conftest$ac_exeext && {
3.10230 ++ test "$cross_compiling" = yes ||
3.10231 ++ $as_test_x conftest$ac_exeext
3.10232 ++ }; then
3.10233 + ac_cv_search_exp=$ac_res
3.10234 + else
3.10235 +- echo "$as_me: failed program was:" >&5
3.10236 +-sed 's/^/| /' conftest.$ac_ext >&5
3.10237 +-
3.10238 +-
3.10239 +-fi
3.10240 +-
3.10241 ++ $as_echo "$as_me: failed program was:" >&5
3.10242 ++sed 's/^/| /' conftest.$ac_ext >&5
3.10243 ++
3.10244 ++
3.10245 ++fi
3.10246 ++
3.10247 ++rm -rf conftest.dSYM
3.10248 + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
3.10249 + conftest$ac_exeext
3.10250 + if test "${ac_cv_search_exp+set}" = set; then
3.10251 +@@ -9174,22 +10303,24 @@
3.10252 + rm conftest.$ac_ext
3.10253 + LIBS=$ac_func_search_save_LIBS
3.10254 + fi
3.10255 +-{ echo "$as_me:$LINENO: result: $ac_cv_search_exp" >&5
3.10256 +-echo "${ECHO_T}$ac_cv_search_exp" >&6; }
3.10257 ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_exp" >&5
3.10258 ++$as_echo "$ac_cv_search_exp" >&6; }
3.10259 + ac_res=$ac_cv_search_exp
3.10260 + if test "$ac_res" != no; then
3.10261 + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
3.10262 +
3.10263 + else
3.10264 +- { { echo "$as_me:$LINENO: error: can't find exp() in libm" >&5
3.10265 +-echo "$as_me: error: can't find exp() in libm" >&2;}
3.10266 +- { (exit 1); exit 1; }; }
3.10267 +-fi
3.10268 +-
3.10269 +- { echo "$as_me:$LINENO: checking for library containing crypt" >&5
3.10270 +-echo $ECHO_N "checking for library containing crypt... $ECHO_C" >&6; }
3.10271 ++ { { $as_echo "$as_me:$LINENO: error: can't find exp() in libm" >&5
3.10272 ++$as_echo "$as_me: error: can't find exp() in libm" >&2;}
3.10273 ++ { (exit 1); exit 1; }; }
3.10274 ++fi
3.10275 ++
3.10276 ++ { $as_echo "$as_me:$LINENO: checking for mysql external dependencies.: checking for crypt() in libcrypt" >&5
3.10277 ++$as_echo_n "checking for mysql external dependencies.: checking for crypt() in libcrypt... " >&6; }
3.10278 ++ { $as_echo "$as_me:$LINENO: checking for library containing crypt" >&5
3.10279 ++$as_echo_n "checking for library containing crypt... " >&6; }
3.10280 + if test "${ac_cv_search_crypt+set}" = set; then
3.10281 +- echo $ECHO_N "(cached) $ECHO_C" >&6
3.10282 ++ $as_echo_n "(cached) " >&6
3.10283 + else
3.10284 + ac_func_search_save_LIBS=$LIBS
3.10285 + cat >conftest.$ac_ext <<_ACEOF
3.10286 +@@ -9227,26 +10358,30 @@
3.10287 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.10288 + *) ac_try_echo=$ac_try;;
3.10289 + esac
3.10290 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.10291 +- (eval "$ac_link") 2>conftest.er1
3.10292 +- ac_status=$?
3.10293 +- grep -v '^ *+' conftest.er1 >conftest.err
3.10294 +- rm -f conftest.er1
3.10295 +- cat conftest.err >&5
3.10296 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.10297 +- (exit $ac_status); } && {
3.10298 +- test -z "$ac_cxx_werror_flag" ||
3.10299 +- test ! -s conftest.err
3.10300 +- } && test -s conftest$ac_exeext &&
3.10301 +- $as_test_x conftest$ac_exeext; then
3.10302 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.10303 ++$as_echo "$ac_try_echo") >&5
3.10304 ++ (eval "$ac_link") 2>conftest.er1
3.10305 ++ ac_status=$?
3.10306 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.10307 ++ rm -f conftest.er1
3.10308 ++ cat conftest.err >&5
3.10309 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.10310 ++ (exit $ac_status); } && {
3.10311 ++ test -z "$ac_cxx_werror_flag" ||
3.10312 ++ test ! -s conftest.err
3.10313 ++ } && test -s conftest$ac_exeext && {
3.10314 ++ test "$cross_compiling" = yes ||
3.10315 ++ $as_test_x conftest$ac_exeext
3.10316 ++ }; then
3.10317 + ac_cv_search_crypt=$ac_res
3.10318 + else
3.10319 +- echo "$as_me: failed program was:" >&5
3.10320 +-sed 's/^/| /' conftest.$ac_ext >&5
3.10321 +-
3.10322 +-
3.10323 +-fi
3.10324 +-
3.10325 ++ $as_echo "$as_me: failed program was:" >&5
3.10326 ++sed 's/^/| /' conftest.$ac_ext >&5
3.10327 ++
3.10328 ++
3.10329 ++fi
3.10330 ++
3.10331 ++rm -rf conftest.dSYM
3.10332 + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
3.10333 + conftest$ac_exeext
3.10334 + if test "${ac_cv_search_crypt+set}" = set; then
3.10335 +@@ -9261,22 +10396,24 @@
3.10336 + rm conftest.$ac_ext
3.10337 + LIBS=$ac_func_search_save_LIBS
3.10338 + fi
3.10339 +-{ echo "$as_me:$LINENO: result: $ac_cv_search_crypt" >&5
3.10340 +-echo "${ECHO_T}$ac_cv_search_crypt" >&6; }
3.10341 ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_crypt" >&5
3.10342 ++$as_echo "$ac_cv_search_crypt" >&6; }
3.10343 + ac_res=$ac_cv_search_crypt
3.10344 + if test "$ac_res" != no; then
3.10345 + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
3.10346 +
3.10347 + else
3.10348 +- { { echo "$as_me:$LINENO: error: can't find crypt() in libcrypt" >&5
3.10349 +-echo "$as_me: error: can't find crypt() in libcrypt" >&2;}
3.10350 +- { (exit 1); exit 1; }; }
3.10351 +-fi
3.10352 +-
3.10353 +- { echo "$as_me:$LINENO: checking for library containing compress" >&5
3.10354 +-echo $ECHO_N "checking for library containing compress... $ECHO_C" >&6; }
3.10355 ++ { { $as_echo "$as_me:$LINENO: error: can't find crypt() in libcrypt" >&5
3.10356 ++$as_echo "$as_me: error: can't find crypt() in libcrypt" >&2;}
3.10357 ++ { (exit 1); exit 1; }; }
3.10358 ++fi
3.10359 ++
3.10360 ++ { $as_echo "$as_me:$LINENO: checking for mysql external dependencies.: checking for compress() in libz" >&5
3.10361 ++$as_echo_n "checking for mysql external dependencies.: checking for compress() in libz... " >&6; }
3.10362 ++ { $as_echo "$as_me:$LINENO: checking for library containing compress" >&5
3.10363 ++$as_echo_n "checking for library containing compress... " >&6; }
3.10364 + if test "${ac_cv_search_compress+set}" = set; then
3.10365 +- echo $ECHO_N "(cached) $ECHO_C" >&6
3.10366 ++ $as_echo_n "(cached) " >&6
3.10367 + else
3.10368 + ac_func_search_save_LIBS=$LIBS
3.10369 + cat >conftest.$ac_ext <<_ACEOF
3.10370 +@@ -9314,26 +10451,30 @@
3.10371 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.10372 + *) ac_try_echo=$ac_try;;
3.10373 + esac
3.10374 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.10375 +- (eval "$ac_link") 2>conftest.er1
3.10376 +- ac_status=$?
3.10377 +- grep -v '^ *+' conftest.er1 >conftest.err
3.10378 +- rm -f conftest.er1
3.10379 +- cat conftest.err >&5
3.10380 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.10381 +- (exit $ac_status); } && {
3.10382 +- test -z "$ac_cxx_werror_flag" ||
3.10383 +- test ! -s conftest.err
3.10384 +- } && test -s conftest$ac_exeext &&
3.10385 +- $as_test_x conftest$ac_exeext; then
3.10386 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.10387 ++$as_echo "$ac_try_echo") >&5
3.10388 ++ (eval "$ac_link") 2>conftest.er1
3.10389 ++ ac_status=$?
3.10390 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.10391 ++ rm -f conftest.er1
3.10392 ++ cat conftest.err >&5
3.10393 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.10394 ++ (exit $ac_status); } && {
3.10395 ++ test -z "$ac_cxx_werror_flag" ||
3.10396 ++ test ! -s conftest.err
3.10397 ++ } && test -s conftest$ac_exeext && {
3.10398 ++ test "$cross_compiling" = yes ||
3.10399 ++ $as_test_x conftest$ac_exeext
3.10400 ++ }; then
3.10401 + ac_cv_search_compress=$ac_res
3.10402 + else
3.10403 +- echo "$as_me: failed program was:" >&5
3.10404 +-sed 's/^/| /' conftest.$ac_ext >&5
3.10405 +-
3.10406 +-
3.10407 +-fi
3.10408 +-
3.10409 ++ $as_echo "$as_me: failed program was:" >&5
3.10410 ++sed 's/^/| /' conftest.$ac_ext >&5
3.10411 ++
3.10412 ++
3.10413 ++fi
3.10414 ++
3.10415 ++rm -rf conftest.dSYM
3.10416 + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
3.10417 + conftest$ac_exeext
3.10418 + if test "${ac_cv_search_compress+set}" = set; then
3.10419 +@@ -9348,15 +10489,15 @@
3.10420 + rm conftest.$ac_ext
3.10421 + LIBS=$ac_func_search_save_LIBS
3.10422 + fi
3.10423 +-{ echo "$as_me:$LINENO: result: $ac_cv_search_compress" >&5
3.10424 +-echo "${ECHO_T}$ac_cv_search_compress" >&6; }
3.10425 ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_compress" >&5
3.10426 ++$as_echo "$ac_cv_search_compress" >&6; }
3.10427 + ac_res=$ac_cv_search_compress
3.10428 + if test "$ac_res" != no; then
3.10429 + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
3.10430 +
3.10431 + else
3.10432 +- { { echo "$as_me:$LINENO: error: can't find compress() in libz" >&5
3.10433 +-echo "$as_me: error: can't find compress() in libz" >&2;}
3.10434 ++ { { $as_echo "$as_me:$LINENO: error: can't find compress() in libz" >&5
3.10435 ++$as_echo "$as_me: error: can't find compress() in libz" >&2;}
3.10436 + { (exit 1); exit 1; }; }
3.10437 + fi
3.10438 +
3.10439 +@@ -9397,8 +10538,8 @@
3.10440 + LDFLAGS="$ac_save_LDFLAGS"
3.10441 + LIBS="$ac_save_LIBS"
3.10442 +
3.10443 +- { echo "$as_me:$LINENO: checking for mysql header mysql.h in $ac_mysqlincdir" >&5
3.10444 +-echo $ECHO_N "checking for mysql header mysql.h in $ac_mysqlincdir... $ECHO_C" >&6; }
3.10445 ++ { $as_echo "$as_me:$LINENO: checking for mysql header mysql.h in $ac_mysqlincdir" >&5
3.10446 ++$as_echo_n "checking for mysql header mysql.h in $ac_mysqlincdir... " >&6; }
3.10447 + cat >conftest.$ac_ext <<_ACEOF
3.10448 + /* confdefs.h. */
3.10449 + _ACEOF
3.10450 +@@ -9423,42 +10564,46 @@
3.10451 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.10452 + *) ac_try_echo=$ac_try;;
3.10453 + esac
3.10454 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.10455 +- (eval "$ac_link") 2>conftest.er1
3.10456 +- ac_status=$?
3.10457 +- grep -v '^ *+' conftest.er1 >conftest.err
3.10458 +- rm -f conftest.er1
3.10459 +- cat conftest.err >&5
3.10460 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.10461 +- (exit $ac_status); } && {
3.10462 +- test -z "$ac_cxx_werror_flag" ||
3.10463 +- test ! -s conftest.err
3.10464 +- } && test -s conftest$ac_exeext &&
3.10465 +- $as_test_x conftest$ac_exeext; then
3.10466 +-
3.10467 +- { echo "$as_me:$LINENO: result: yes" >&5
3.10468 +-echo "${ECHO_T}yes" >&6; }
3.10469 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.10470 ++$as_echo "$ac_try_echo") >&5
3.10471 ++ (eval "$ac_link") 2>conftest.er1
3.10472 ++ ac_status=$?
3.10473 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.10474 ++ rm -f conftest.er1
3.10475 ++ cat conftest.err >&5
3.10476 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.10477 ++ (exit $ac_status); } && {
3.10478 ++ test -z "$ac_cxx_werror_flag" ||
3.10479 ++ test ! -s conftest.err
3.10480 ++ } && test -s conftest$ac_exeext && {
3.10481 ++ test "$cross_compiling" = yes ||
3.10482 ++ $as_test_x conftest$ac_exeext
3.10483 ++ }; then
3.10484 ++
3.10485 ++ { $as_echo "$as_me:$LINENO: result: yes" >&5
3.10486 ++$as_echo "yes" >&6; }
3.10487 + oasys_cv_path_mysql_h=$ac_mysqlincdir
3.10488 + break
3.10489 +
3.10490 + else
3.10491 +- echo "$as_me: failed program was:" >&5
3.10492 +-sed 's/^/| /' conftest.$ac_ext >&5
3.10493 +-
3.10494 +-
3.10495 +- { echo "$as_me:$LINENO: result: no" >&5
3.10496 +-echo "${ECHO_T}no" >&6; }
3.10497 ++ $as_echo "$as_me: failed program was:" >&5
3.10498 ++sed 's/^/| /' conftest.$ac_ext >&5
3.10499 ++
3.10500 ++
3.10501 ++ { $as_echo "$as_me:$LINENO: result: no" >&5
3.10502 ++$as_echo "no" >&6; }
3.10503 + continue
3.10504 +
3.10505 + fi
3.10506 +
3.10507 ++rm -rf conftest.dSYM
3.10508 + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
3.10509 + conftest$ac_exeext conftest.$ac_ext
3.10510 + done
3.10511 +
3.10512 + if test x$oasys_cv_path_mysql_h = x ; then
3.10513 +- { { echo "$as_me:$LINENO: error: can't find usable mysql installation" >&5
3.10514 +-echo "$as_me: error: can't find usable mysql installation" >&2;}
3.10515 ++ { { $as_echo "$as_me:$LINENO: error: can't find usable mysql installation" >&5
3.10516 ++$as_echo "$as_me: error: can't find usable mysql installation" >&2;}
3.10517 + { (exit 1); exit 1; }; }
3.10518 + fi
3.10519 +
3.10520 +@@ -9471,8 +10616,8 @@
3.10521 + LIBS="$ac_save_LIBS -lmysqld"
3.10522 + fi
3.10523 +
3.10524 +- { echo "$as_me:$LINENO: checking for mysql library libmysql in $ac_mysqllibdir" >&5
3.10525 +-echo $ECHO_N "checking for mysql library libmysql in $ac_mysqllibdir... $ECHO_C" >&6; }
3.10526 ++ { $as_echo "$as_me:$LINENO: checking for mysql library libmysql in $ac_mysqllibdir" >&5
3.10527 ++$as_echo_n "checking for mysql library libmysql in $ac_mysqllibdir... " >&6; }
3.10528 + cat >conftest.$ac_ext <<_ACEOF
3.10529 + /* confdefs.h. */
3.10530 + _ACEOF
3.10531 +@@ -9499,34 +10644,38 @@
3.10532 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.10533 + *) ac_try_echo=$ac_try;;
3.10534 + esac
3.10535 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.10536 +- (eval "$ac_link") 2>conftest.er1
3.10537 +- ac_status=$?
3.10538 +- grep -v '^ *+' conftest.er1 >conftest.err
3.10539 +- rm -f conftest.er1
3.10540 +- cat conftest.err >&5
3.10541 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.10542 +- (exit $ac_status); } && {
3.10543 +- test -z "$ac_cxx_werror_flag" ||
3.10544 +- test ! -s conftest.err
3.10545 +- } && test -s conftest$ac_exeext &&
3.10546 +- $as_test_x conftest$ac_exeext; then
3.10547 +-
3.10548 +- { echo "$as_me:$LINENO: result: yes" >&5
3.10549 +-echo "${ECHO_T}yes" >&6; }
3.10550 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.10551 ++$as_echo "$ac_try_echo") >&5
3.10552 ++ (eval "$ac_link") 2>conftest.er1
3.10553 ++ ac_status=$?
3.10554 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.10555 ++ rm -f conftest.er1
3.10556 ++ cat conftest.err >&5
3.10557 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.10558 ++ (exit $ac_status); } && {
3.10559 ++ test -z "$ac_cxx_werror_flag" ||
3.10560 ++ test ! -s conftest.err
3.10561 ++ } && test -s conftest$ac_exeext && {
3.10562 ++ test "$cross_compiling" = yes ||
3.10563 ++ $as_test_x conftest$ac_exeext
3.10564 ++ }; then
3.10565 ++
3.10566 ++ { $as_echo "$as_me:$LINENO: result: yes" >&5
3.10567 ++$as_echo "yes" >&6; }
3.10568 + oasys_cv_path_mysql_lib=$ac_mysqllibdir
3.10569 + break
3.10570 +
3.10571 + else
3.10572 +- echo "$as_me: failed program was:" >&5
3.10573 +-sed 's/^/| /' conftest.$ac_ext >&5
3.10574 +-
3.10575 +-
3.10576 +- { echo "$as_me:$LINENO: result: no" >&5
3.10577 +-echo "${ECHO_T}no" >&6; }
3.10578 +-
3.10579 +-fi
3.10580 +-
3.10581 ++ $as_echo "$as_me: failed program was:" >&5
3.10582 ++sed 's/^/| /' conftest.$ac_ext >&5
3.10583 ++
3.10584 ++
3.10585 ++ { $as_echo "$as_me:$LINENO: result: no" >&5
3.10586 ++$as_echo "no" >&6; }
3.10587 ++
3.10588 ++fi
3.10589 ++
3.10590 ++rm -rf conftest.dSYM
3.10591 + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
3.10592 + conftest$ac_exeext conftest.$ac_ext
3.10593 + done
3.10594 +@@ -9542,8 +10691,8 @@
3.10595 + LIBS="$ac_save_LIBS"
3.10596 +
3.10597 + if test x$oasys_cv_path_mysql_lib = x ; then
3.10598 +- { { echo "$as_me:$LINENO: error: can't find usable mysql library" >&5
3.10599 +-echo "$as_me: error: can't find usable mysql library" >&2;}
3.10600 ++ { { $as_echo "$as_me:$LINENO: error: can't find usable mysql library" >&5
3.10601 ++$as_echo "$as_me: error: can't find usable mysql library" >&2;}
3.10602 + { (exit 1); exit 1; }; }
3.10603 + fi
3.10604 +
3.10605 +@@ -9615,8 +10764,8 @@
3.10606 + LDFLAGS="$ac_save_LDFLAGS"
3.10607 + LIBS="$ac_save_LIBS"
3.10608 +
3.10609 +- { echo "$as_me:$LINENO: checking for postgres header libpq-fe.h in $ac_postgresincdir" >&5
3.10610 +-echo $ECHO_N "checking for postgres header libpq-fe.h in $ac_postgresincdir... $ECHO_C" >&6; }
3.10611 ++ { $as_echo "$as_me:$LINENO: checking for postgres header libpq-fe.h in $ac_postgresincdir" >&5
3.10612 ++$as_echo_n "checking for postgres header libpq-fe.h in $ac_postgresincdir... " >&6; }
3.10613 + cat >conftest.$ac_ext <<_ACEOF
3.10614 + /* confdefs.h. */
3.10615 + _ACEOF
3.10616 +@@ -9641,42 +10790,46 @@
3.10617 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.10618 + *) ac_try_echo=$ac_try;;
3.10619 + esac
3.10620 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.10621 +- (eval "$ac_link") 2>conftest.er1
3.10622 +- ac_status=$?
3.10623 +- grep -v '^ *+' conftest.er1 >conftest.err
3.10624 +- rm -f conftest.er1
3.10625 +- cat conftest.err >&5
3.10626 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.10627 +- (exit $ac_status); } && {
3.10628 +- test -z "$ac_cxx_werror_flag" ||
3.10629 +- test ! -s conftest.err
3.10630 +- } && test -s conftest$ac_exeext &&
3.10631 +- $as_test_x conftest$ac_exeext; then
3.10632 +-
3.10633 +- { echo "$as_me:$LINENO: result: yes" >&5
3.10634 +-echo "${ECHO_T}yes" >&6; }
3.10635 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.10636 ++$as_echo "$ac_try_echo") >&5
3.10637 ++ (eval "$ac_link") 2>conftest.er1
3.10638 ++ ac_status=$?
3.10639 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.10640 ++ rm -f conftest.er1
3.10641 ++ cat conftest.err >&5
3.10642 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.10643 ++ (exit $ac_status); } && {
3.10644 ++ test -z "$ac_cxx_werror_flag" ||
3.10645 ++ test ! -s conftest.err
3.10646 ++ } && test -s conftest$ac_exeext && {
3.10647 ++ test "$cross_compiling" = yes ||
3.10648 ++ $as_test_x conftest$ac_exeext
3.10649 ++ }; then
3.10650 ++
3.10651 ++ { $as_echo "$as_me:$LINENO: result: yes" >&5
3.10652 ++$as_echo "yes" >&6; }
3.10653 + oasys_cv_path_postgres_h=$ac_postgresincdir
3.10654 + break
3.10655 +
3.10656 + else
3.10657 +- echo "$as_me: failed program was:" >&5
3.10658 +-sed 's/^/| /' conftest.$ac_ext >&5
3.10659 +-
3.10660 +-
3.10661 +- { echo "$as_me:$LINENO: result: no" >&5
3.10662 +-echo "${ECHO_T}no" >&6; }
3.10663 ++ $as_echo "$as_me: failed program was:" >&5
3.10664 ++sed 's/^/| /' conftest.$ac_ext >&5
3.10665 ++
3.10666 ++
3.10667 ++ { $as_echo "$as_me:$LINENO: result: no" >&5
3.10668 ++$as_echo "no" >&6; }
3.10669 + continue
3.10670 +
3.10671 + fi
3.10672 +
3.10673 ++rm -rf conftest.dSYM
3.10674 + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
3.10675 + conftest$ac_exeext conftest.$ac_ext
3.10676 + done
3.10677 +
3.10678 + if test x$oasys_cv_path_postgres_h = x ; then
3.10679 +- { { echo "$as_me:$LINENO: error: can't find usable postgres installation" >&5
3.10680 +-echo "$as_me: error: can't find usable postgres installation" >&2;}
3.10681 ++ { { $as_echo "$as_me:$LINENO: error: can't find usable postgres installation" >&5
3.10682 ++$as_echo "$as_me: error: can't find usable postgres installation" >&2;}
3.10683 + { (exit 1); exit 1; }; }
3.10684 + fi
3.10685 +
3.10686 +@@ -9685,8 +10838,8 @@
3.10687 + LDFLAGS="$ac_save_LDFLAGS -L$ac_postgreslibdir"
3.10688 + LIBS="$ac_save_LIBS -lpq"
3.10689 +
3.10690 +- { echo "$as_me:$LINENO: checking for postgres library libpq in $ac_postgreslibdir" >&5
3.10691 +-echo $ECHO_N "checking for postgres library libpq in $ac_postgreslibdir... $ECHO_C" >&6; }
3.10692 ++ { $as_echo "$as_me:$LINENO: checking for postgres library libpq in $ac_postgreslibdir" >&5
3.10693 ++$as_echo_n "checking for postgres library libpq in $ac_postgreslibdir... " >&6; }
3.10694 + cat >conftest.$ac_ext <<_ACEOF
3.10695 + /* confdefs.h. */
3.10696 + _ACEOF
3.10697 +@@ -9712,34 +10865,38 @@
3.10698 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3.10699 + *) ac_try_echo=$ac_try;;
3.10700 + esac
3.10701 +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3.10702 +- (eval "$ac_link") 2>conftest.er1
3.10703 +- ac_status=$?
3.10704 +- grep -v '^ *+' conftest.er1 >conftest.err
3.10705 +- rm -f conftest.er1
3.10706 +- cat conftest.err >&5
3.10707 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.10708 +- (exit $ac_status); } && {
3.10709 +- test -z "$ac_cxx_werror_flag" ||
3.10710 +- test ! -s conftest.err
3.10711 +- } && test -s conftest$ac_exeext &&
3.10712 +- $as_test_x conftest$ac_exeext; then
3.10713 +-
3.10714 +- { echo "$as_me:$LINENO: result: yes" >&5
3.10715 +-echo "${ECHO_T}yes" >&6; }
3.10716 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3.10717 ++$as_echo "$ac_try_echo") >&5
3.10718 ++ (eval "$ac_link") 2>conftest.er1
3.10719 ++ ac_status=$?
3.10720 ++ grep -v '^ *+' conftest.er1 >conftest.err
3.10721 ++ rm -f conftest.er1
3.10722 ++ cat conftest.err >&5
3.10723 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3.10724 ++ (exit $ac_status); } && {
3.10725 ++ test -z "$ac_cxx_werror_flag" ||
3.10726 ++ test ! -s conftest.err
3.10727 ++ } && test -s conftest$ac_exeext && {
3.10728 ++ test "$cross_compiling" = yes ||
3.10729 ++ $as_test_x conftest$ac_exeext
3.10730 ++ }; then
3.10731 ++
3.10732 ++ { $as_echo "$as_me:$LINENO: result: yes" >&5
3.10733 ++$as_echo "yes" >&6; }
3.10734 + oasys_cv_path_postgres_lib=$ac_postgreslibdir
3.10735 + break
3.10736 +
3.10737 + else
3.10738 +- echo "$as_me: failed program was:" >&5
3.10739 +-sed 's/^/| /' conftest.$ac_ext >&5
3.10740 +-
3.10741 +-
3.10742 +- { echo "$as_me:$LINENO: result: no" >&5
3.10743 +-echo "${ECHO_T}no" >&6; }
3.10744 +-
3.10745 +-fi
3.10746 +-
3.10747 ++ $as_echo "$as_me: failed program was:" >&5
3.10748 ++sed 's/^/| /' conftest.$ac_ext >&5
3.10749 ++
3.10750 ++
3.10751 ++ { $as_echo "$as_me:$LINENO: result: no" >&5
3.10752 ++$as_echo "no" >&6; }
3.10753 ++
3.10754 ++fi
3.10755 ++
3.10756 ++rm -rf conftest.dSYM
3.10757 + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
3.10758 + conftest$ac_exeext conftest.$ac_ext
3.10759 + done
3.10760 +@@ -9749,8 +10906,8 @@
3.10761 + LIBS="$ac_save_LIBS"
3.10762 +
3.10763 + if test x$oasys_cv_path_postgres_lib = x ; then
3.10764 +- { { echo "$as_me:$LINENO: error: can't find usable postgres library" >&5
3.10765 +-echo "$as_me: error: can't find usable postgres library" >&2;}
3.10766 ++ { { $as_echo "$as_me:$LINENO: error: can't find usable postgres library" >&5
3.10767 ++$as_echo "$as_me: error: can't find usable postgres library" >&2;}
3.10768 + { (exit 1); exit 1; }; }
3.10769 + fi
3.10770 +
3.10771 +@@ -9779,8 +10936,8 @@
3.10772 + EXTERNAL_DS_ENABLED=0
3.10773 + else
3.10774 + if test ! "$XERCES_C_ENABLED" = 1 ; then
3.10775 +- { { echo "$as_me:$LINENO: error: external data store support requires xerces... install it or configure --disable-eds" >&5
3.10776 +-echo "$as_me: error: external data store support requires xerces... install it or configure --disable-eds" >&2;}
3.10777 ++ { { $as_echo "$as_me:$LINENO: error: external data store support requires xerces... install it or configure --disable-eds" >&5
3.10778 ++$as_echo "$as_me: error: external data store support requires xerces... install it or configure --disable-eds" >&2;}
3.10779 + { (exit 1); exit 1; }; }
3.10780 + fi
3.10781 + EXTERNAL_DS_ENABLED=1
3.10782 +@@ -9872,11 +11029,11 @@
3.10783 +
3.10784 +
3.10785 +
3.10786 +-rm -rf include share
3.10787 +-mkdir include
3.10788 +-mkdir share
3.10789 +-ln -s $SRCDIR include/oasys
3.10790 +-ln -s $SRCDIR share/oasys
3.10791 ++#rm -rf include share
3.10792 ++#mkdir include
3.10793 ++#mkdir share
3.10794 ++#ln -s $SRCDIR include/oasys
3.10795 ++#ln -s $SRCDIR share/oasys
3.10796 +
3.10797 + if test ! $SRCDIR = `pwd` ; then
3.10798 +
3.10799 +@@ -9911,11 +11068,12 @@
3.10800 + case $ac_val in #(
3.10801 + *${as_nl}*)
3.10802 + case $ac_var in #(
3.10803 +- *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
3.10804 +-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
3.10805 ++ *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
3.10806 ++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
3.10807 + esac
3.10808 + case $ac_var in #(
3.10809 + _ | IFS | as_nl) ;; #(
3.10810 ++ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
3.10811 + *) $as_unset $ac_var ;;
3.10812 + esac ;;
3.10813 + esac
3.10814 +@@ -9948,12 +11106,12 @@
3.10815 + if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
3.10816 + if test -w "$cache_file"; then
3.10817 + test "x$cache_file" != "x/dev/null" &&
3.10818 +- { echo "$as_me:$LINENO: updating cache $cache_file" >&5
3.10819 +-echo "$as_me: updating cache $cache_file" >&6;}
3.10820 ++ { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
3.10821 ++$as_echo "$as_me: updating cache $cache_file" >&6;}
3.10822 + cat confcache >$cache_file
3.10823 + else
3.10824 +- { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
3.10825 +-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
3.10826 ++ { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
3.10827 ++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
3.10828 + fi
3.10829 + fi
3.10830 + rm -f confcache
3.10831 +@@ -9969,7 +11127,7 @@
3.10832 + for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
3.10833 + # 1. Remove the extension, and $U if already installed.
3.10834 + ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
3.10835 +- ac_i=`echo "$ac_i" | sed "$ac_script"`
3.10836 ++ ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
3.10837 + # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
3.10838 + # will be set to the directory where LIBOBJS objects are built.
3.10839 + ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
3.10840 +@@ -9982,11 +11140,12 @@
3.10841 +
3.10842 +
3.10843 + : ${CONFIG_STATUS=./config.status}
3.10844 ++ac_write_fail=0
3.10845 + ac_clean_files_save=$ac_clean_files
3.10846 + ac_clean_files="$ac_clean_files $CONFIG_STATUS"
3.10847 +-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
3.10848 +-echo "$as_me: creating $CONFIG_STATUS" >&6;}
3.10849 +-cat >$CONFIG_STATUS <<_ACEOF
3.10850 ++{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
3.10851 ++$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
3.10852 ++cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
3.10853 + #! $SHELL
3.10854 + # Generated by $as_me.
3.10855 + # Run this file to recreate the current configuration.
3.10856 +@@ -9999,7 +11158,7 @@
3.10857 + SHELL=\${CONFIG_SHELL-$SHELL}
3.10858 + _ACEOF
3.10859 +
3.10860 +-cat >>$CONFIG_STATUS <<\_ACEOF
3.10861 ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
3.10862 + ## --------------------- ##
3.10863 + ## M4sh Initialization. ##
3.10864 + ## --------------------- ##
3.10865 +@@ -10009,7 +11168,7 @@
3.10866 + if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
3.10867 + emulate sh
3.10868 + NULLCMD=:
3.10869 +- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
3.10870 ++ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
3.10871 + # is contrary to our usage. Disable this feature.
3.10872 + alias -g '${1+"$@"}'='"$@"'
3.10873 + setopt NO_GLOB_SUBST
3.10874 +@@ -10031,17 +11190,45 @@
3.10875 + as_cr_digits='0123456789'
3.10876 + as_cr_alnum=$as_cr_Letters$as_cr_digits
3.10877 +
3.10878 ++as_nl='
3.10879 ++'
3.10880 ++export as_nl
3.10881 ++# Printing a long string crashes Solaris 7 /usr/bin/printf.
3.10882 ++as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
3.10883 ++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
3.10884 ++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
3.10885 ++if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
3.10886 ++ as_echo='printf %s\n'
3.10887 ++ as_echo_n='printf %s'
3.10888 ++else
3.10889 ++ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
3.10890 ++ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
3.10891 ++ as_echo_n='/usr/ucb/echo -n'
3.10892 ++ else
3.10893 ++ as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
3.10894 ++ as_echo_n_body='eval
3.10895 ++ arg=$1;
3.10896 ++ case $arg in
3.10897 ++ *"$as_nl"*)
3.10898 ++ expr "X$arg" : "X\\(.*\\)$as_nl";
3.10899 ++ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
3.10900 ++ esac;
3.10901 ++ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
3.10902 ++ '
3.10903 ++ export as_echo_n_body
3.10904 ++ as_echo_n='sh -c $as_echo_n_body as_echo'
3.10905 ++ fi
3.10906 ++ export as_echo_body
3.10907 ++ as_echo='sh -c $as_echo_body as_echo'
3.10908 ++fi
3.10909 ++
3.10910 + # The user is always right.
3.10911 + if test "${PATH_SEPARATOR+set}" != set; then
3.10912 +- echo "#! /bin/sh" >conf$$.sh
3.10913 +- echo "exit 0" >>conf$$.sh
3.10914 +- chmod +x conf$$.sh
3.10915 +- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
3.10916 +- PATH_SEPARATOR=';'
3.10917 +- else
3.10918 +- PATH_SEPARATOR=:
3.10919 +- fi
3.10920 +- rm -f conf$$.sh
3.10921 ++ PATH_SEPARATOR=:
3.10922 ++ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
3.10923 ++ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
3.10924 ++ PATH_SEPARATOR=';'
3.10925 ++ }
3.10926 + fi
3.10927 +
3.10928 + # Support unset when possible.
3.10929 +@@ -10057,8 +11244,6 @@
3.10930 + # there to prevent editors from complaining about space-tab.
3.10931 + # (If _AS_PATH_WALK were called with IFS unset, it would disable word
3.10932 + # splitting by setting IFS to empty value.)
3.10933 +-as_nl='
3.10934 +-'
3.10935 + IFS=" "" $as_nl"
3.10936 +
3.10937 + # Find who we are. Look in the path if we contain no directory separator.
3.10938 +@@ -10081,7 +11266,7 @@
3.10939 + as_myself=$0
3.10940 + fi
3.10941 + if test ! -f "$as_myself"; then
3.10942 +- echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
3.10943 ++ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
3.10944 + { (exit 1); exit 1; }
3.10945 + fi
3.10946 +
3.10947 +@@ -10094,17 +11279,10 @@
3.10948 + PS4='+ '
3.10949 +
3.10950 + # NLS nuisances.
3.10951 +-for as_var in \
3.10952 +- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
3.10953 +- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
3.10954 +- LC_TELEPHONE LC_TIME
3.10955 +-do
3.10956 +- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
3.10957 +- eval $as_var=C; export $as_var
3.10958 +- else
3.10959 +- ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
3.10960 +- fi
3.10961 +-done
3.10962 ++LC_ALL=C
3.10963 ++export LC_ALL
3.10964 ++LANGUAGE=C
3.10965 ++export LANGUAGE
3.10966 +
3.10967 + # Required to use basename.
3.10968 + if expr a : '\(a\)' >/dev/null 2>&1 &&
3.10969 +@@ -10126,7 +11304,7 @@
3.10970 + $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
3.10971 + X"$0" : 'X\(//\)$' \| \
3.10972 + X"$0" : 'X\(/\)' \| . 2>/dev/null ||
3.10973 +-echo X/"$0" |
3.10974 ++$as_echo X/"$0" |
3.10975 + sed '/^.*\/\([^/][^/]*\)\/*$/{
3.10976 + s//\1/
3.10977 + q
3.10978 +@@ -10177,7 +11355,7 @@
3.10979 + s/-\n.*//
3.10980 + ' >$as_me.lineno &&
3.10981 + chmod +x "$as_me.lineno" ||
3.10982 +- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
3.10983 ++ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
3.10984 + { (exit 1); exit 1; }; }
3.10985 +
3.10986 + # Don't try to exec as it changes $[0], causing all sort of problems
3.10987 +@@ -10205,7 +11383,6 @@
3.10988 + *)
3.10989 + ECHO_N='-n';;
3.10990 + esac
3.10991 +-
3.10992 + if expr a : '\(a\)' >/dev/null 2>&1 &&
3.10993 + test "X`expr 00001 : '.*\(...\)'`" = X001; then
3.10994 + as_expr=expr
3.10995 +@@ -10218,19 +11395,22 @@
3.10996 + rm -f conf$$.dir/conf$$.file
3.10997 + else
3.10998 + rm -f conf$$.dir
3.10999 +- mkdir conf$$.dir
3.11000 +-fi
3.11001 +-echo >conf$$.file
3.11002 +-if ln -s conf$$.file conf$$ 2>/dev/null; then
3.11003 +- as_ln_s='ln -s'
3.11004 +- # ... but there are two gotchas:
3.11005 +- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
3.11006 +- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
3.11007 +- # In both cases, we have to default to `cp -p'.
3.11008 +- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
3.11009 ++ mkdir conf$$.dir 2>/dev/null
3.11010 ++fi
3.11011 ++if (echo >conf$$.file) 2>/dev/null; then
3.11012 ++ if ln -s conf$$.file conf$$ 2>/dev/null; then
3.11013 ++ as_ln_s='ln -s'
3.11014 ++ # ... but there are two gotchas:
3.11015 ++ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
3.11016 ++ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
3.11017 ++ # In both cases, we have to default to `cp -p'.
3.11018 ++ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
3.11019 ++ as_ln_s='cp -p'
3.11020 ++ elif ln conf$$.file conf$$ 2>/dev/null; then
3.11021 ++ as_ln_s=ln
3.11022 ++ else
3.11023 + as_ln_s='cp -p'
3.11024 +-elif ln conf$$.file conf$$ 2>/dev/null; then
3.11025 +- as_ln_s=ln
3.11026 ++ fi
3.11027 + else
3.11028 + as_ln_s='cp -p'
3.11029 + fi
3.11030 +@@ -10255,10 +11435,10 @@
3.11031 + as_test_x='
3.11032 + eval sh -c '\''
3.11033 + if test -d "$1"; then
3.11034 +- test -d "$1/.";
3.11035 ++ test -d "$1/.";
3.11036 + else
3.11037 + case $1 in
3.11038 +- -*)set "./$1";;
3.11039 ++ -*)set "./$1";;
3.11040 + esac;
3.11041 + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
3.11042 + ???[sx]*):;;*)false;;esac;fi
3.11043 +@@ -10281,7 +11461,7 @@
3.11044 + # values after options handling.
3.11045 + ac_log="
3.11046 + This file was extended by $as_me, which was
3.11047 +-generated by GNU Autoconf 2.61. Invocation command line was
3.11048 ++generated by GNU Autoconf 2.63. Invocation command line was
3.11049 +
3.11050 + CONFIG_FILES = $CONFIG_FILES
3.11051 + CONFIG_HEADERS = $CONFIG_HEADERS
3.11052 +@@ -10294,29 +11474,39 @@
3.11053 +
3.11054 + _ACEOF
3.11055 +
3.11056 +-cat >>$CONFIG_STATUS <<_ACEOF
3.11057 ++case $ac_config_files in *"
3.11058 ++"*) set x $ac_config_files; shift; ac_config_files=$*;;
3.11059 ++esac
3.11060 ++
3.11061 ++case $ac_config_headers in *"
3.11062 ++"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
3.11063 ++esac
3.11064 ++
3.11065 ++
3.11066 ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
3.11067 + # Files that config.status was made for.
3.11068 + config_files="$ac_config_files"
3.11069 + config_headers="$ac_config_headers"
3.11070 +
3.11071 + _ACEOF
3.11072 +
3.11073 +-cat >>$CONFIG_STATUS <<\_ACEOF
3.11074 ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
3.11075 + ac_cs_usage="\
3.11076 + \`$as_me' instantiates files from templates according to the
3.11077 + current configuration.
3.11078 +
3.11079 +-Usage: $0 [OPTIONS] [FILE]...
3.11080 ++Usage: $0 [OPTION]... [FILE]...
3.11081 +
3.11082 + -h, --help print this help, then exit
3.11083 + -V, --version print version number and configuration settings, then exit
3.11084 +- -q, --quiet do not print progress messages
3.11085 ++ -q, --quiet, --silent
3.11086 ++ do not print progress messages
3.11087 + -d, --debug don't remove temporary files
3.11088 + --recheck update $as_me by reconfiguring in the same conditions
3.11089 +- --file=FILE[:TEMPLATE]
3.11090 +- instantiate the configuration file FILE
3.11091 +- --header=FILE[:TEMPLATE]
3.11092 +- instantiate the configuration header FILE
3.11093 ++ --file=FILE[:TEMPLATE]
3.11094 ++ instantiate the configuration file FILE
3.11095 ++ --header=FILE[:TEMPLATE]
3.11096 ++ instantiate the configuration header FILE
3.11097 +
3.11098 + Configuration files:
3.11099 + $config_files
3.11100 +@@ -10327,24 +11517,25 @@
3.11101 + Report bugs to <bug-autoconf@gnu.org>."
3.11102 +
3.11103 + _ACEOF
3.11104 +-cat >>$CONFIG_STATUS <<_ACEOF
3.11105 ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
3.11106 + ac_cs_version="\\
3.11107 + config.status
3.11108 +-configured by $0, generated by GNU Autoconf 2.61,
3.11109 +- with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
3.11110 +-
3.11111 +-Copyright (C) 2006 Free Software Foundation, Inc.
3.11112 ++configured by $0, generated by GNU Autoconf 2.63,
3.11113 ++ with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
3.11114 ++
3.11115 ++Copyright (C) 2008 Free Software Foundation, Inc.
3.11116 + This config.status script is free software; the Free Software Foundation
3.11117 + gives unlimited permission to copy, distribute and modify it."
3.11118 +
3.11119 + ac_pwd='$ac_pwd'
3.11120 + srcdir='$srcdir'
3.11121 + INSTALL='$INSTALL'
3.11122 +-_ACEOF
3.11123 +-
3.11124 +-cat >>$CONFIG_STATUS <<\_ACEOF
3.11125 +-# If no file are specified by the user, then we need to provide default
3.11126 +-# value. By we need to know if files were specified by the user.
3.11127 ++AWK='$AWK'
3.11128 ++test -n "\$AWK" || AWK=awk
3.11129 ++_ACEOF
3.11130 ++
3.11131 ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
3.11132 ++# The default lists apply if the user does not specify any file.
3.11133 + ac_need_defaults=:
3.11134 + while test $# != 0
3.11135 + do
3.11136 +@@ -10366,30 +11557,36 @@
3.11137 + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
3.11138 + ac_cs_recheck=: ;;
3.11139 + --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
3.11140 +- echo "$ac_cs_version"; exit ;;
3.11141 ++ $as_echo "$ac_cs_version"; exit ;;
3.11142 + --debug | --debu | --deb | --de | --d | -d )
3.11143 + debug=: ;;
3.11144 + --file | --fil | --fi | --f )
3.11145 + $ac_shift
3.11146 +- CONFIG_FILES="$CONFIG_FILES $ac_optarg"
3.11147 ++ case $ac_optarg in
3.11148 ++ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
3.11149 ++ esac
3.11150 ++ CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
3.11151 + ac_need_defaults=false;;
3.11152 + --header | --heade | --head | --hea )
3.11153 + $ac_shift
3.11154 +- CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
3.11155 ++ case $ac_optarg in
3.11156 ++ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
3.11157 ++ esac
3.11158 ++ CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
3.11159 + ac_need_defaults=false;;
3.11160 + --he | --h)
3.11161 + # Conflict between --help and --header
3.11162 +- { echo "$as_me: error: ambiguous option: $1
3.11163 ++ { $as_echo "$as_me: error: ambiguous option: $1
3.11164 + Try \`$0 --help' for more information." >&2
3.11165 + { (exit 1); exit 1; }; };;
3.11166 + --help | --hel | -h )
3.11167 +- echo "$ac_cs_usage"; exit ;;
3.11168 ++ $as_echo "$ac_cs_usage"; exit ;;
3.11169 + -q | -quiet | --quiet | --quie | --qui | --qu | --q \
3.11170 + | -silent | --silent | --silen | --sile | --sil | --si | --s)
3.11171 + ac_cs_silent=: ;;
3.11172 +
3.11173 + # This is an error.
3.11174 +- -*) { echo "$as_me: error: unrecognized option: $1
3.11175 ++ -*) { $as_echo "$as_me: error: unrecognized option: $1
3.11176 + Try \`$0 --help' for more information." >&2
3.11177 + { (exit 1); exit 1; }; } ;;
3.11178 +
3.11179 +@@ -10408,30 +11605,32 @@
3.11180 + fi
3.11181 +
3.11182 + _ACEOF
3.11183 +-cat >>$CONFIG_STATUS <<_ACEOF
3.11184 ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
3.11185 + if \$ac_cs_recheck; then
3.11186 +- echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
3.11187 +- CONFIG_SHELL=$SHELL
3.11188 ++ set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
3.11189 ++ shift
3.11190 ++ \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
3.11191 ++ CONFIG_SHELL='$SHELL'
3.11192 + export CONFIG_SHELL
3.11193 +- exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
3.11194 +-fi
3.11195 +-
3.11196 +-_ACEOF
3.11197 +-cat >>$CONFIG_STATUS <<\_ACEOF
3.11198 ++ exec "\$@"
3.11199 ++fi
3.11200 ++
3.11201 ++_ACEOF
3.11202 ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
3.11203 + exec 5>>config.log
3.11204 + {
3.11205 + echo
3.11206 + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
3.11207 + ## Running $as_me. ##
3.11208 + _ASBOX
3.11209 +- echo "$ac_log"
3.11210 ++ $as_echo "$ac_log"
3.11211 + } >&5
3.11212 +
3.11213 + _ACEOF
3.11214 +-cat >>$CONFIG_STATUS <<_ACEOF
3.11215 +-_ACEOF
3.11216 +-
3.11217 +-cat >>$CONFIG_STATUS <<\_ACEOF
3.11218 ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
3.11219 ++_ACEOF
3.11220 ++
3.11221 ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
3.11222 +
3.11223 + # Handling of arguments.
3.11224 + for ac_config_target in $ac_config_targets
3.11225 +@@ -10442,8 +11641,8 @@
3.11226 + "System.make") CONFIG_FILES="$CONFIG_FILES System.make" ;;
3.11227 + "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile:Makefile-Builddir.in" ;;
3.11228 +
3.11229 +- *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
3.11230 +-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
3.11231 ++ *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
3.11232 ++$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
3.11233 + { (exit 1); exit 1; }; };;
3.11234 + esac
3.11235 + done
3.11236 +@@ -10483,158 +11682,143 @@
3.11237 + (umask 077 && mkdir "$tmp")
3.11238 + } ||
3.11239 + {
3.11240 +- echo "$me: cannot create a temporary directory in ." >&2
3.11241 ++ $as_echo "$as_me: cannot create a temporary directory in ." >&2
3.11242 + { (exit 1); exit 1; }
3.11243 + }
3.11244 +
3.11245 +-#
3.11246 +-# Set up the sed scripts for CONFIG_FILES section.
3.11247 +-#
3.11248 +-
3.11249 +-# No need to generate the scripts if there are no CONFIG_FILES.
3.11250 +-# This happens for instance when ./config.status config.h
3.11251 ++# Set up the scripts for CONFIG_FILES section.
3.11252 ++# No need to generate them if there are no CONFIG_FILES.
3.11253 ++# This happens for instance with `./config.status config.h'.
3.11254 + if test -n "$CONFIG_FILES"; then
3.11255 +
3.11256 +-_ACEOF
3.11257 +-
3.11258 +-
3.11259 +-
3.11260 ++
3.11261 ++ac_cr='
3.11262 '
3.11263 ++ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
3.11264 ++if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
3.11265 ++ ac_cs_awk_cr='\\r'
3.11266 ++else
3.11267 ++ ac_cs_awk_cr=$ac_cr
3.11268 ++fi
3.11269 ++
3.11270 ++echo 'BEGIN {' >"$tmp/subs1.awk" &&
3.11271 ++_ACEOF
3.11272 ++
3.11273 ++
3.11274 ++{
3.11275 ++ echo "cat >conf$$subs.awk <<_ACEOF" &&
3.11276 ++ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
3.11277 ++ echo "_ACEOF"
3.11278 ++} >conf$$subs.sh ||
3.11279 ++ { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
3.11280 ++$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
3.11281 ++ { (exit 1); exit 1; }; }
3.11282 ++ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
3.11283 + ac_delim='%!_!# '
3.11284 + for ac_last_try in false false false false false :; do
3.11285 +- cat >conf$$subs.sed <<_ACEOF
3.11286 +-SHELL!$SHELL$ac_delim
3.11287 +-PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
3.11288 +-PACKAGE_NAME!$PACKAGE_NAME$ac_delim
3.11289 +-PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
3.11290 +-PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
3.11291 +-PACKAGE_STRING!$PACKAGE_STRING$ac_delim
3.11292 +-PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
3.11293 +-exec_prefix!$exec_prefix$ac_delim
3.11294 +-prefix!$prefix$ac_delim
3.11295 +-program_transform_name!$program_transform_name$ac_delim
3.11296 +-bindir!$bindir$ac_delim
3.11297 +-sbindir!$sbindir$ac_delim
3.11298 +-libexecdir!$libexecdir$ac_delim
3.11299 +-datarootdir!$datarootdir$ac_delim
3.11300 +-datadir!$datadir$ac_delim
3.11301 +-sysconfdir!$sysconfdir$ac_delim
3.11302 +-sharedstatedir!$sharedstatedir$ac_delim
3.11303 +-localstatedir!$localstatedir$ac_delim
3.11304 +-includedir!$includedir$ac_delim
3.11305 +-oldincludedir!$oldincludedir$ac_delim
3.11306 +-docdir!$docdir$ac_delim
3.11307 +-infodir!$infodir$ac_delim
3.11308 +-htmldir!$htmldir$ac_delim
3.11309 +-dvidir!$dvidir$ac_delim
3.11310 +-pdfdir!$pdfdir$ac_delim
3.11311 +-psdir!$psdir$ac_delim
3.11312 +-libdir!$libdir$ac_delim
3.11313 +-localedir!$localedir$ac_delim
3.11314 +-mandir!$mandir$ac_delim
3.11315 +-DEFS!$DEFS$ac_delim
3.11316 +-ECHO_C!$ECHO_C$ac_delim
3.11317 +-ECHO_N!$ECHO_N$ac_delim
3.11318 +-ECHO_T!$ECHO_T$ac_delim
3.11319 +-LIBS!$LIBS$ac_delim
3.11320 +-build_alias!$build_alias$ac_delim
3.11321 +-host_alias!$host_alias$ac_delim
3.11322 +-target_alias!$target_alias$ac_delim
3.11323 +-SRCDIR!$SRCDIR$ac_delim
3.11324 +-BUILDDIR!$BUILDDIR$ac_delim
3.11325 +-TARGET!$TARGET$ac_delim
3.11326 +-CC!$CC$ac_delim
3.11327 +-CFLAGS!$CFLAGS$ac_delim
3.11328 +-LDFLAGS!$LDFLAGS$ac_delim
3.11329 +-CPPFLAGS!$CPPFLAGS$ac_delim
3.11330 +-ac_ct_CC!$ac_ct_CC$ac_delim
3.11331 +-EXEEXT!$EXEEXT$ac_delim
3.11332 +-OBJEXT!$OBJEXT$ac_delim
3.11333 +-CXX!$CXX$ac_delim
3.11334 +-CXXFLAGS!$CXXFLAGS$ac_delim
3.11335 +-ac_ct_CXX!$ac_ct_CXX$ac_delim
3.11336 +-CPP!$CPP$ac_delim
3.11337 +-DEPFLAGS!$DEPFLAGS$ac_delim
3.11338 +-AR!$AR$ac_delim
3.11339 +-RANLIB!$RANLIB$ac_delim
3.11340 +-DEBUG!$DEBUG$ac_delim
3.11341 +-OPTIMIZE!$OPTIMIZE$ac_delim
3.11342 +-OPTIMIZE_WARN!$OPTIMIZE_WARN$ac_delim
3.11343 +-PROFILE!$PROFILE$ac_delim
3.11344 +-STATIC!$STATIC$ac_delim
3.11345 +-SHLIBS!$SHLIBS$ac_delim
3.11346 +-SHLIB_EXT!$SHLIB_EXT$ac_delim
3.11347 +-PICFLAGS!$PICFLAGS$ac_delim
3.11348 +-RPATH!$RPATH$ac_delim
3.11349 +-LDFLAGS_SHLIB!$LDFLAGS_SHLIB$ac_delim
3.11350 +-EXTRA_CFLAGS!$EXTRA_CFLAGS$ac_delim
3.11351 +-EXTRA_LDFLAGS!$EXTRA_LDFLAGS$ac_delim
3.11352 +-BUILD_SYSTEM!$BUILD_SYSTEM$ac_delim
3.11353 +-AWK!$AWK$ac_delim
3.11354 +-INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
3.11355 +-INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
3.11356 +-INSTALL_DATA!$INSTALL_DATA$ac_delim
3.11357 +-SET_MAKE!$SET_MAKE$ac_delim
3.11358 +-GREP!$GREP$ac_delim
3.11359 +-EGREP!$EGREP$ac_delim
3.11360 +-SYS_CFLAGS!$SYS_CFLAGS$ac_delim
3.11361 +-PYTHON!$PYTHON$ac_delim
3.11362 +-PYTHON_BUILD_EXT!$PYTHON_BUILD_EXT$ac_delim
3.11363 +-TCL_LDFLAGS!$TCL_LDFLAGS$ac_delim
3.11364 +-XSD_TOOL!$XSD_TOOL$ac_delim
3.11365 +-INCFLAGS!$INCFLAGS$ac_delim
3.11366 +-OASYS_INCDIR!$OASYS_INCDIR$ac_delim
3.11367 +-OASYS_LIBDIR!$OASYS_LIBDIR$ac_delim
3.11368 +-OASYS_ETCDIR!$OASYS_ETCDIR$ac_delim
3.11369 +-OASYS_LDFLAGS!$OASYS_LDFLAGS$ac_delim
3.11370 +-OASYS_LDFLAGS_STATIC!$OASYS_LDFLAGS_STATIC$ac_delim
3.11371 +-OASYS_COMPAT_LDFLAGS!$OASYS_COMPAT_LDFLAGS$ac_delim
3.11372 +-OASYS_VERSION!$OASYS_VERSION$ac_delim
3.11373 +-EXTLIB_CFLAGS!$EXTLIB_CFLAGS$ac_delim
3.11374 +-EXTLIB_LDFLAGS!$EXTLIB_LDFLAGS$ac_delim
3.11375 +-SYS_EXTLIB_CFLAGS!$SYS_EXTLIB_CFLAGS$ac_delim
3.11376 +-SYS_EXTLIB_LDFLAGS!$SYS_EXTLIB_LDFLAGS$ac_delim
3.11377 +-SUBDIR!$SUBDIR$ac_delim
3.11378 +-LIBOBJS!$LIBOBJS$ac_delim
3.11379 +-LTLIBOBJS!$LTLIBOBJS$ac_delim
3.11380 +-_ACEOF
3.11381 +-
3.11382 +- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 94; then
3.11383 ++ . ./conf$$subs.sh ||
3.11384 ++ { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
3.11385 ++$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
3.11386 ++ { (exit 1); exit 1; }; }
3.11387 ++
3.11388 ++ ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
3.11389 ++ if test $ac_delim_n = $ac_delim_num; then
3.11390 + break
3.11391 + elif $ac_last_try; then
3.11392 +- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
3.11393 +-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
3.11394 ++ { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
3.11395 ++$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
3.11396 + { (exit 1); exit 1; }; }
3.11397 + else
3.11398 + ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
3.11399 + fi
3.11400 + done
3.11401 +-
3.11402 +-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
3.11403 +-if test -n "$ac_eof"; then
3.11404 +- ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
3.11405 +- ac_eof=`expr $ac_eof + 1`
3.11406 +-fi
3.11407 +-
3.11408 +-cat >>$CONFIG_STATUS <<_ACEOF
3.11409 +-cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
3.11410 +-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
3.11411 +-_ACEOF
3.11412 +-sed '
3.11413 +-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
3.11414 +-s/^/s,@/; s/!/@,|#_!!_#|/
3.11415 +-:n
3.11416 +-t n
3.11417 +-s/'"$ac_delim"'$/,g/; t
3.11418 +-s/$/\\/; p
3.11419 +-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
3.11420 +-' >>$CONFIG_STATUS <conf$$subs.sed
3.11421 +-rm -f conf$$subs.sed
3.11422 +-cat >>$CONFIG_STATUS <<_ACEOF
3.11423 +-:end
3.11424 +-s/|#_!!_#|//g
3.11425 +-CEOF$ac_eof
3.11426 +-_ACEOF
3.11427 +-
3.11428 ++rm -f conf$$subs.sh
3.11429 ++
3.11430 ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
3.11431 ++cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
3.11432 ++_ACEOF
3.11433 ++sed -n '
3.11434 ++h
3.11435 ++s/^/S["/; s/!.*/"]=/
3.11436 ++p
3.11437 ++g
3.11438 ++s/^[^!]*!//
3.11439 ++:repl
3.11440 ++t repl
3.11441 ++s/'"$ac_delim"'$//
3.11442 ++t delim
3.11443 ++:nl
3.11444 ++h
3.11445 ++s/\(.\{148\}\).*/\1/
3.11446 ++t more1
3.11447 ++s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
3.11448 ++p
3.11449 ++n
3.11450 ++b repl
3.11451 ++:more1
3.11452 ++s/["\\]/\\&/g; s/^/"/; s/$/"\\/
3.11453 ++p
3.11454 ++g
3.11455 ++s/.\{148\}//
3.11456 ++t nl
3.11457 ++:delim
3.11458 ++h
3.11459 ++s/\(.\{148\}\).*/\1/
3.11460 ++t more2
3.11461 ++s/["\\]/\\&/g; s/^/"/; s/$/"/
3.11462 ++p
3.11463 ++b
3.11464 ++:more2
3.11465 ++s/["\\]/\\&/g; s/^/"/; s/$/"\\/
3.11466 ++p
3.11467 ++g
3.11468 ++s/.\{148\}//
3.11469 ++t delim
3.11470 ++' <conf$$subs.awk | sed '
3.11471 ++/^[^""]/{
3.11472 ++ N
3.11473 ++ s/\n//
3.11474 ++}
3.11475 ++' >>$CONFIG_STATUS || ac_write_fail=1
3.11476 ++rm -f conf$$subs.awk
3.11477 ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
3.11478 ++_ACAWK
3.11479 ++cat >>"\$tmp/subs1.awk" <<_ACAWK &&
3.11480 ++ for (key in S) S_is_set[key] = 1
3.11481 ++ FS = ""
3.11482 ++
3.11483 ++}
3.11484 ++{
3.11485 ++ line = $ 0
3.11486 ++ nfields = split(line, field, "@")
3.11487 ++ substed = 0
3.11488 ++ len = length(field[1])
3.11489 ++ for (i = 2; i < nfields; i++) {
3.11490 ++ key = field[i]
3.11491 ++ keylen = length(key)
3.11492 ++ if (S_is_set[key]) {
3.11493 ++ value = S[key]
3.11494 ++ line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
3.11495 ++ len += length(value) + length(field[++i])
3.11496 ++ substed = 1
3.11497 ++ } else
3.11498 ++ len += 1 + keylen
3.11499 ++ }
3.11500 ++
3.11501 ++ print line
3.11502 ++}
3.11503 ++
3.11504 ++_ACAWK
3.11505 ++_ACEOF
3.11506 ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
3.11507 ++if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
3.11508 ++ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
3.11509 ++else
3.11510 ++ cat
3.11511 ++fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
3.11512 ++ || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
3.11513 ++$as_echo "$as_me: error: could not setup config files machinery" >&2;}
3.11514 ++ { (exit 1); exit 1; }; }
3.11515 ++_ACEOF
3.11516 +
3.11517 + # VPATH may cause trouble with some makes, so we remove $(srcdir),
3.11518 + # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
3.11519 +@@ -10651,19 +11835,133 @@
3.11520 + }'
3.11521 + fi
3.11522 +
3.11523 +-cat >>$CONFIG_STATUS <<\_ACEOF
3.11524 ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
3.11525 + fi # test -n "$CONFIG_FILES"
3.11526 +
3.11527 +-
3.11528 +-for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS
3.11529 ++# Set up the scripts for CONFIG_HEADERS section.
3.11530 ++# No need to generate them if there are no CONFIG_HEADERS.
3.11531 ++# This happens for instance with `./config.status Makefile'.
3.11532 ++if test -n "$CONFIG_HEADERS"; then
3.11533 ++cat >"$tmp/defines.awk" <<\_ACAWK ||
3.11534 ++BEGIN {
3.11535 ++_ACEOF
3.11536 ++
3.11537 ++# Transform confdefs.h into an awk script `defines.awk', embedded as
3.11538 ++# here-document in config.status, that substitutes the proper values into
3.11539 ++# config.h.in to produce config.h.
3.11540 ++
3.11541 ++# Create a delimiter string that does not exist in confdefs.h, to ease
3.11542 ++# handling of long lines.
3.11543 ++ac_delim='%!_!# '
3.11544 ++for ac_last_try in false false :; do
3.11545 ++ ac_t=`sed -n "/$ac_delim/p" confdefs.h`
3.11546 ++ if test -z "$ac_t"; then
3.11547 ++ break
3.11548 ++ elif $ac_last_try; then
3.11549 ++ { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
3.11550 ++$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
3.11551 ++ { (exit 1); exit 1; }; }
3.11552 ++ else
3.11553 ++ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
3.11554 ++ fi
3.11555 ++done
3.11556 ++
3.11557 ++# For the awk script, D is an array of macro values keyed by name,
3.11558 ++# likewise P contains macro parameters if any. Preserve backslash
3.11559 ++# newline sequences.
3.11560 ++
3.11561 ++ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
3.11562 ++sed -n '
3.11563 ++s/.\{148\}/&'"$ac_delim"'/g
3.11564 ++t rset
3.11565 ++:rset
3.11566 ++s/^[ ]*#[ ]*define[ ][ ]*/ /
3.11567 ++t def
3.11568 ++d
3.11569 ++:def
3.11570 ++s/\\$//
3.11571 ++t bsnl
3.11572 ++s/["\\]/\\&/g
3.11573 ++s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\
3.11574 ++D["\1"]=" \3"/p
3.11575 ++s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p
3.11576 ++d
3.11577 ++:bsnl
3.11578 ++s/["\\]/\\&/g
3.11579 ++s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\
3.11580 ++D["\1"]=" \3\\\\\\n"\\/p
3.11581 ++t cont
3.11582 ++s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
3.11583 ++t cont
3.11584 ++d
3.11585 ++:cont
3.11586 ++n
3.11587 ++s/.\{148\}/&'"$ac_delim"'/g
3.11588 ++t clear
3.11589 ++:clear
3.11590 ++s/\\$//
3.11591 ++t bsnlc
3.11592 ++s/["\\]/\\&/g; s/^/"/; s/$/"/p
3.11593 ++d
3.11594 ++:bsnlc
3.11595 ++s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
3.11596 ++b cont
3.11597 ++' <confdefs.h | sed '
3.11598 ++s/'"$ac_delim"'/"\\\
3.11599 ++"/g' >>$CONFIG_STATUS || ac_write_fail=1
3.11600 ++
3.11601 ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
3.11602 ++ for (key in D) D_is_set[key] = 1
3.11603 ++ FS = ""
3.11604 ++}
3.11605 ++/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
3.11606 ++ line = \$ 0
3.11607 ++ split(line, arg, " ")
3.11608 ++ if (arg[1] == "#") {
3.11609 ++ defundef = arg[2]
3.11610 ++ mac1 = arg[3]
3.11611 ++ } else {
3.11612 ++ defundef = substr(arg[1], 2)
3.11613 ++ mac1 = arg[2]
3.11614 ++ }
3.11615 ++ split(mac1, mac2, "(") #)
3.11616 ++ macro = mac2[1]
3.11617 ++ prefix = substr(line, 1, index(line, defundef) - 1)
3.11618 ++ if (D_is_set[macro]) {
3.11619 ++ # Preserve the white space surrounding the "#".
3.11620 ++ print prefix "define", macro P[macro] D[macro]
3.11621 ++ next
3.11622 ++ } else {
3.11623 ++ # Replace #undef with comments. This is necessary, for example,
3.11624 ++ # in the case of _POSIX_SOURCE, which is predefined and required
3.11625 ++ # on some systems where configure will not decide to define it.
3.11626 ++ if (defundef == "undef") {
3.11627 ++ print "/*", prefix defundef, macro, "*/"
3.11628 ++ next
3.11629 ++ }
3.11630 ++ }
3.11631 ++}
3.11632 ++{ print }
3.11633 ++_ACAWK
3.11634 ++_ACEOF
3.11635 ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
3.11636 ++ { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
3.11637 ++$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
3.11638 ++ { (exit 1); exit 1; }; }
3.11639 ++fi # test -n "$CONFIG_HEADERS"
3.11640 ++
3.11641 ++
3.11642 ++eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS "
3.11643 ++shift
3.11644 ++for ac_tag
3.11645 + do
3.11646 + case $ac_tag in
3.11647 + :[FHLC]) ac_mode=$ac_tag; continue;;
3.11648 + esac
3.11649 + case $ac_mode$ac_tag in
3.11650 + :[FHL]*:*);;
3.11651 +- :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
3.11652 +-echo "$as_me: error: Invalid tag $ac_tag." >&2;}
3.11653 ++ :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
3.11654 ++$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
3.11655 + { (exit 1); exit 1; }; };;
3.11656 + :[FH]-) ac_tag=-:-;;
3.11657 + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
3.11658 +@@ -10692,26 +11990,38 @@
3.11659 + [\\/$]*) false;;
3.11660 + *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
3.11661 + esac ||
3.11662 +- { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
3.11663 +-echo "$as_me: error: cannot find input file: $ac_f" >&2;}
3.11664 ++ { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
3.11665 ++$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
3.11666 + { (exit 1); exit 1; }; };;
3.11667 + esac
3.11668 +- ac_file_inputs="$ac_file_inputs $ac_f"
3.11669 ++ case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
3.11670 ++ ac_file_inputs="$ac_file_inputs '$ac_f'"
3.11671 + done
3.11672 +
3.11673 + # Let's still pretend it is `configure' which instantiates (i.e., don't
3.11674 + # use $as_me), people would be surprised to read:
3.11675 + # /* config.h. Generated by config.status. */
3.11676 +- configure_input="Generated from "`IFS=:
3.11677 +- echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
3.11678 ++ configure_input='Generated from '`
3.11679 ++ $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
3.11680 ++ `' by configure.'
3.11681 + if test x"$ac_file" != x-; then
3.11682 + configure_input="$ac_file. $configure_input"
3.11683 +- { echo "$as_me:$LINENO: creating $ac_file" >&5
3.11684 +-echo "$as_me: creating $ac_file" >&6;}
3.11685 +- fi
3.11686 ++ { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
3.11687 ++$as_echo "$as_me: creating $ac_file" >&6;}
3.11688 ++ fi
3.11689 ++ # Neutralize special characters interpreted by sed in replacement strings.
3.11690 ++ case $configure_input in #(
3.11691 ++ *\&* | *\|* | *\\* )
3.11692 ++ ac_sed_conf_input=`$as_echo "$configure_input" |
3.11693 ++ sed 's/[\\\\&|]/\\\\&/g'`;; #(
3.11694 ++ *) ac_sed_conf_input=$configure_input;;
3.11695 ++ esac
3.11696 +
3.11697 + case $ac_tag in
3.11698 +- *:-:* | *:-) cat >"$tmp/stdin";;
3.11699 ++ *:-:* | *:-) cat >"$tmp/stdin" \
3.11700 ++ || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
3.11701 ++$as_echo "$as_me: error: could not create $ac_file" >&2;}
3.11702 ++ { (exit 1); exit 1; }; } ;;
3.11703 + esac
3.11704 + ;;
3.11705 + esac
3.11706 +@@ -10721,7 +12031,7 @@
3.11707 + X"$ac_file" : 'X\(//\)[^/]' \| \
3.11708 + X"$ac_file" : 'X\(//\)$' \| \
3.11709 + X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
3.11710 +-echo X"$ac_file" |
3.11711 ++$as_echo X"$ac_file" |
3.11712 + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
3.11713 + s//\1/
3.11714 + q
3.11715 +@@ -10747,7 +12057,7 @@
3.11716 + as_dirs=
3.11717 + while :; do
3.11718 + case $as_dir in #(
3.11719 +- *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
3.11720 ++ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
3.11721 + *) as_qdir=$as_dir;;
3.11722 + esac
3.11723 + as_dirs="'$as_qdir' $as_dirs"
3.11724 +@@ -10756,7 +12066,7 @@
3.11725 + X"$as_dir" : 'X\(//\)[^/]' \| \
3.11726 + X"$as_dir" : 'X\(//\)$' \| \
3.11727 + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
3.11728 +-echo X"$as_dir" |
3.11729 ++$as_echo X"$as_dir" |
3.11730 + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
3.11731 + s//\1/
3.11732 + q
3.11733 +@@ -10777,17 +12087,17 @@
3.11734 + test -d "$as_dir" && break
3.11735 + done
3.11736 + test -z "$as_dirs" || eval "mkdir $as_dirs"
3.11737 +- } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
3.11738 +-echo "$as_me: error: cannot create directory $as_dir" >&2;}
3.11739 ++ } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
3.11740 ++$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
3.11741 + { (exit 1); exit 1; }; }; }
3.11742 + ac_builddir=.
3.11743 +
3.11744 + case "$ac_dir" in
3.11745 + .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
3.11746 + *)
3.11747 +- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
3.11748 ++ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
3.11749 + # A ".." for each directory in $ac_dir_suffix.
3.11750 +- ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
3.11751 ++ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
3.11752 + case $ac_top_builddir_sub in
3.11753 + "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
3.11754 + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
3.11755 +@@ -10827,12 +12137,13 @@
3.11756 + esac
3.11757 + _ACEOF
3.11758 +
3.11759 +-cat >>$CONFIG_STATUS <<\_ACEOF
3.11760 ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
3.11761 + # If the template does not know about datarootdir, expand it.
3.11762 + # FIXME: This hack should be removed a few years after 2.60.
3.11763 + ac_datarootdir_hack=; ac_datarootdir_seen=
3.11764 +
3.11765 +-case `sed -n '/datarootdir/ {
3.11766 ++ac_sed_dataroot='
3.11767 ++/datarootdir/ {
3.11768 + p
3.11769 + q
3.11770 + }
3.11771 +@@ -10841,13 +12152,14 @@
3.11772 + /@infodir@/p
3.11773 + /@localedir@/p
3.11774 + /@mandir@/p
3.11775 +-' $ac_file_inputs` in
3.11776 ++'
3.11777 ++case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
3.11778 + *datarootdir*) ac_datarootdir_seen=yes;;
3.11779 + *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
3.11780 +- { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
3.11781 +-echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
3.11782 +-_ACEOF
3.11783 +-cat >>$CONFIG_STATUS <<_ACEOF
3.11784 ++ { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
3.11785 ++$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
3.11786 ++_ACEOF
3.11787 ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
3.11788 + ac_datarootdir_hack='
3.11789 + s&@datadir@&$datadir&g
3.11790 + s&@docdir@&$docdir&g
3.11791 +@@ -10861,15 +12173,16 @@
3.11792 + # Neutralize VPATH when `$srcdir' = `.'.
3.11793 + # Shell code in configure.ac might set extrasub.
3.11794 + # FIXME: do we really want to maintain this feature?
3.11795 +-cat >>$CONFIG_STATUS <<_ACEOF
3.11796 +- sed "$ac_vpsub
3.11797 ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
3.11798 ++ac_sed_extra="$ac_vpsub
3.11799 + $extrasub
3.11800 + _ACEOF
3.11801 +-cat >>$CONFIG_STATUS <<\_ACEOF
3.11802 ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
3.11803 + :t
3.11804 + /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
3.11805 +-s&@configure_input@&$configure_input&;t t
3.11806 ++s|@configure_input@|$ac_sed_conf_input|;t t
3.11807 + s&@top_builddir@&$ac_top_builddir_sub&;t t
3.11808 ++s&@top_build_prefix@&$ac_top_build_prefix&;t t
3.11809 + s&@srcdir@&$ac_srcdir&;t t
3.11810 + s&@abs_srcdir@&$ac_abs_srcdir&;t t
3.11811 + s&@top_srcdir@&$ac_top_srcdir&;t t
3.11812 +@@ -10879,119 +12192,58 @@
3.11813 + s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
3.11814 + s&@INSTALL@&$ac_INSTALL&;t t
3.11815 + $ac_datarootdir_hack
3.11816 +-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out
3.11817 ++"
3.11818 ++eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
3.11819 ++ || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
3.11820 ++$as_echo "$as_me: error: could not create $ac_file" >&2;}
3.11821 ++ { (exit 1); exit 1; }; }
3.11822 +
3.11823 + test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
3.11824 + { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
3.11825 + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
3.11826 +- { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
3.11827 ++ { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
3.11828 + which seems to be undefined. Please make sure it is defined." >&5
3.11829 +-echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
3.11830 ++$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
3.11831 + which seems to be undefined. Please make sure it is defined." >&2;}
3.11832 +
3.11833 + rm -f "$tmp/stdin"
3.11834 + case $ac_file in
3.11835 +- -) cat "$tmp/out"; rm -f "$tmp/out";;
3.11836 +- *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
3.11837 +- esac
3.11838 ++ -) cat "$tmp/out" && rm -f "$tmp/out";;
3.11839 ++ *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
3.11840 ++ esac \
3.11841 ++ || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
3.11842 ++$as_echo "$as_me: error: could not create $ac_file" >&2;}
3.11843 ++ { (exit 1); exit 1; }; }
3.11844 + ;;
3.11845 + :H)
3.11846 + #
3.11847 + # CONFIG_HEADER
3.11848 + #
3.11849 +-_ACEOF
3.11850 +-
3.11851 +-# Transform confdefs.h into a sed script `conftest.defines', that
3.11852 +-# substitutes the proper values into config.h.in to produce config.h.
3.11853 +-rm -f conftest.defines conftest.tail
3.11854 +-# First, append a space to every undef/define line, to ease matching.
3.11855 +-echo 's/$/ /' >conftest.defines
3.11856 +-# Then, protect against being on the right side of a sed subst, or in
3.11857 +-# an unquoted here document, in config.status. If some macros were
3.11858 +-# called several times there might be several #defines for the same
3.11859 +-# symbol, which is useless. But do not sort them, since the last
3.11860 +-# AC_DEFINE must be honored.
3.11861 +-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
3.11862 +-# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
3.11863 +-# NAME is the cpp macro being defined, VALUE is the value it is being given.
3.11864 +-# PARAMS is the parameter list in the macro definition--in most cases, it's
3.11865 +-# just an empty string.
3.11866 +-ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*'
3.11867 +-ac_dB='\\)[ (].*,\\1define\\2'
3.11868 +-ac_dC=' '
3.11869 +-ac_dD=' ,'
3.11870 +-
3.11871 +-uniq confdefs.h |
3.11872 +- sed -n '
3.11873 +- t rset
3.11874 +- :rset
3.11875 +- s/^[ ]*#[ ]*define[ ][ ]*//
3.11876 +- t ok
3.11877 +- d
3.11878 +- :ok
3.11879 +- s/[\\&,]/\\&/g
3.11880 +- s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
3.11881 +- s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
3.11882 +- ' >>conftest.defines
3.11883 +-
3.11884 +-# Remove the space that was appended to ease matching.
3.11885 +-# Then replace #undef with comments. This is necessary, for
3.11886 +-# example, in the case of _POSIX_SOURCE, which is predefined and required
3.11887 +-# on some systems where configure will not decide to define it.
3.11888 +-# (The regexp can be short, since the line contains either #define or #undef.)
3.11889 +-echo 's/ $//
3.11890 +-s,^[ #]*u.*,/* & */,' >>conftest.defines
3.11891 +-
3.11892 +-# Break up conftest.defines:
3.11893 +-ac_max_sed_lines=50
3.11894 +-
3.11895 +-# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1"
3.11896 +-# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2"
3.11897 +-# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1"
3.11898 +-# et cetera.
3.11899 +-ac_in='$ac_file_inputs'
3.11900 +-ac_out='"$tmp/out1"'
3.11901 +-ac_nxt='"$tmp/out2"'
3.11902 +-
3.11903 +-while :
3.11904 +-do
3.11905 +- # Write a here document:
3.11906 +- cat >>$CONFIG_STATUS <<_ACEOF
3.11907 +- # First, check the format of the line:
3.11908 +- cat >"\$tmp/defines.sed" <<\\CEOF
3.11909 +-/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def
3.11910 +-/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def
3.11911 +-b
3.11912 +-:def
3.11913 +-_ACEOF
3.11914 +- sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
3.11915 +- echo 'CEOF
3.11916 +- sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
3.11917 +- ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
3.11918 +- sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
3.11919 +- grep . conftest.tail >/dev/null || break
3.11920 +- rm -f conftest.defines
3.11921 +- mv conftest.tail conftest.defines
3.11922 +-done
3.11923 +-rm -f conftest.defines conftest.tail
3.11924 +-
3.11925 +-echo "ac_result=$ac_in" >>$CONFIG_STATUS
3.11926 +-cat >>$CONFIG_STATUS <<\_ACEOF
3.11927 + if test x"$ac_file" != x-; then
3.11928 +- echo "/* $configure_input */" >"$tmp/config.h"
3.11929 +- cat "$ac_result" >>"$tmp/config.h"
3.11930 +- if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
3.11931 +- { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
3.11932 +-echo "$as_me: $ac_file is unchanged" >&6;}
3.11933 +- else
3.11934 +- rm -f $ac_file
3.11935 +- mv "$tmp/config.h" $ac_file
3.11936 +- fi
3.11937 +- else
3.11938 +- echo "/* $configure_input */"
3.11939 +- cat "$ac_result"
3.11940 +- fi
3.11941 +- rm -f "$tmp/out12"
3.11942 ++ {
3.11943 ++ $as_echo "/* $configure_input */" \
3.11944 ++ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
3.11945 ++ } >"$tmp/config.h" \
3.11946 ++ || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
3.11947 ++$as_echo "$as_me: error: could not create $ac_file" >&2;}
3.11948 ++ { (exit 1); exit 1; }; }
3.11949 ++ if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
3.11950 ++ { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
3.11951 ++$as_echo "$as_me: $ac_file is unchanged" >&6;}
3.11952 ++ else
3.11953 ++ rm -f "$ac_file"
3.11954 ++ mv "$tmp/config.h" "$ac_file" \
3.11955 ++ || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
3.11956 ++$as_echo "$as_me: error: could not create $ac_file" >&2;}
3.11957 ++ { (exit 1); exit 1; }; }
3.11958 ++ fi
3.11959 ++ else
3.11960 ++ $as_echo "/* $configure_input */" \
3.11961 ++ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
3.11962 ++ || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
3.11963 ++$as_echo "$as_me: error: could not create -" >&2;}
3.11964 ++ { (exit 1); exit 1; }; }
3.11965 ++ fi
3.11966 + ;;
3.11967 +
3.11968 +
3.11969 +@@ -11005,6 +12257,11 @@
3.11970 + chmod +x $CONFIG_STATUS
3.11971 + ac_clean_files=$ac_clean_files_save
3.11972 +
3.11973 ++test $ac_write_fail = 0 ||
3.11974 ++ { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
3.11975 ++$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
3.11976 ++ { (exit 1); exit 1; }; }
3.11977 ++
3.11978 +
3.11979 + # configure is writing to config.log, and then calls config.status.
3.11980 + # config.status does its own redirection, appending to config.log.
3.11981 +@@ -11026,7 +12283,12 @@
3.11982 + # would make configure fail if this is the last instruction.
3.11983 + $ac_cs_success || { (exit 1); exit 1; }
3.11984 + fi
3.11985 ++if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
3.11986 ++ { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
3.11987 ++$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
3.11988 ++fi
3.11989 +
3.11990 +
3.11991 + make buildopts
3.11992 +
3.11993 ++
3.11994 +diff -r c6dc6a854b31 -r 7ce2b4528dee configure.ac
3.11995 +--- a/configure.ac Wed Nov 04 21:44:35 2009 -0800
3.11996 ++++ b/configure.ac Wed Nov 04 21:47:13 2009 -0800
3.11997 +@@ -148,11 +148,11 @@
3.11998 + dnl option to point to a source directory or a build directory.
3.11999 + dnl
3.12000 +
3.12001 +-rm -rf include share
3.12002 +-mkdir include
3.12003 +-mkdir share
3.12004 +-ln -s $SRCDIR include/oasys
3.12005 +-ln -s $SRCDIR share/oasys
3.12006 ++#rm -rf include share
3.12007 ++#mkdir include
3.12008 ++#mkdir share
3.12009 ++#ln -s $SRCDIR include/oasys
3.12010 ++#ln -s $SRCDIR share/oasys
3.12011 +
3.12012 + if test ! $SRCDIR = `pwd` ; then
3.12013 + AC_SUBST([SUBDIR])
3.12014 +@@ -163,3 +163,4 @@
3.12015 +
3.12016 + make buildopts
3.12017 +
3.12018 ++
3.12019 +diff -r c6dc6a854b31 -r 7ce2b4528dee debian/changelog
3.12020 +--- a/debian/changelog Wed Nov 04 21:44:35 2009 -0800
3.12021 ++++ b/debian/changelog Wed Nov 04 21:47:13 2009 -0800
3.12022 +@@ -1,3 +1,9 @@
3.12023 ++oasys (2.6.0) unstable; urgency=low
3.12024 ++
3.12025 ++ * 2.6.0 build 2.6.0 build
3.12026 ++
3.12027 ++ -- Alex McMahon <alex.mcmahon@cs.tcd.ie> Fri, 08 May 2009 16:46:17 +0100
3.12028 ++
3.12029 + oasys (1.3.0-2) unstable; urgency=low
3.12030 +
3.12031 + * tweak autoconf and build rules*
3.12032 +diff -r c6dc6a854b31 -r 7ce2b4528dee debian/control
3.12033 +--- a/debian/control Wed Nov 04 21:44:35 2009 -0800
3.12034 ++++ b/debian/control Wed Nov 04 21:47:13 2009 -0800
3.12035 +@@ -1,8 +1,8 @@
3.12036 + Source: oasys
3.12037 + Section: libs
3.12038 + Priority: optional
3.12039 +-Maintainer: Michael Demmer <demmer@cs.berkeley.edu>
3.12040 +-Build-Depends: make, gcc, g++, debhelper (>= 5), tcl8.3-dev | tcl8.4-dev, libdb4.3-dev | libdb4.4-dev, libxerces27-dev
3.12041 ++Maintainer: dtn-users mailing list [dtn-users@mailman.dtnrg.org]
3.12042 ++Build-Depends: make, gcc, g++, debhelper (>= 5), tcl8.3-dev | tcl8.4-dev | tcl8.5-dev, libdb4.3-dev | libdb4.4-dev | libdb4.5-dev |libdb4.6-dev | libdb4.7-dev, libxerces27-dev | libxerces-c2-dev | libxerces28-dev
3.12043 +
3.12044 +
3.12045 + Package: liboasys
3.12046 +diff -r c6dc6a854b31 -r 7ce2b4528dee debug/Formatter.cc
3.12047 +--- a/debug/Formatter.cc Wed Nov 04 21:44:35 2009 -0800
3.12048 ++++ b/debug/Formatter.cc Wed Nov 04 21:47:13 2009 -0800
3.12049 +@@ -17,7 +17,9 @@
3.12050 + #ifdef HAVE_CONFIG_H
3.12051 + # include <oasys-config.h>
3.12052 + #endif
3.12053 +-#include <stdarg.h>
3.12054 ++
3.12055 ++#include <cstdarg>
3.12056 ++#include <cstring>
3.12057 + #include <memory.h>
3.12058 + #include "Formatter.h"
3.12059 +
3.12060 +diff -r c6dc6a854b31 -r 7ce2b4528dee debug/Formatter.h
3.12061 +--- a/debug/Formatter.h Wed Nov 04 21:44:35 2009 -0800
3.12062 ++++ b/debug/Formatter.h Wed Nov 04 21:47:13 2009 -0800
3.12063 +@@ -31,6 +31,22 @@
3.12064 + * This class is intended to be used with a modified implementation of
3.12065 + * snprintf/vsnprintf, defined in Formatter.cc.
3.12066 + *
3.12067 ++ *********************************************************************
3.12068 ++ * WARNING!!! USERS BEWARE
3.12069 ++ *
3.12070 ++ * Because of the horrible hack used to implement this which goes back
3.12071 ++ * and forth between C++ and C and then back to C++...
3.12072 ++ * ANY CLASS WHICH INHERITS FROM THIS CLASS **MUST** DECLARE THIS CLASS
3.12073 ++ * FIRST IN ITS INHERITANCE LIST.
3.12074 ++ *
3.12075 ++ * If this is done, a pointer to a class instance will look like a
3.12076 ++ * pointer to a Formatter data structure when accessed from C.
3.12077 ++ *
3.12078 ++ * If this is not adhered to, the cast to Formatter* in
3.12079 ++ * formatter_format will not work and generally the test for
3.12080 ++ * FORMAT_MAGIC will fail.
3.12081 ++ *********************************************************************
3.12082 ++ *
3.12083 + * The modification implements a special control code combination of
3.12084 + * '*%p' that triggers a call to Formatter::format(), called on the
3.12085 + * object pointer passed in the vararg list.
3.12086 +@@ -110,9 +126,10 @@
3.12087 + // usually just used in logging output.
3.12088 + if (obj->format_magic_ != FORMAT_MAGIC)
3.12089 + {
3.12090 +- fprintf(stderr,
3.12091 +- "Formatter object invalid -- maybe need a cast "
3.12092 +- "to Formatter.");
3.12093 ++ fprintf(stderr,
3.12094 ++ "Formatter object invalid -- check that Formatter is "
3.12095 ++ "the *first* class in inheritance list of class using"
3.12096 ++ "the Formatter::format function!!");
3.12097 + StackTrace::print_current_trace(false);
3.12098 + oasys_break();
3.12099 +
3.12100 +diff -r c6dc6a854b31 -r 7ce2b4528dee debug/Log.cc
3.12101 +--- a/debug/Log.cc Wed Nov 04 21:44:35 2009 -0800
3.12102 ++++ b/debug/Log.cc Wed Nov 04 21:47:13 2009 -0800
3.12103 +@@ -40,6 +40,16 @@
3.12104 + #include "util/Glob.h"
3.12105 + #include "util/Time.h"
3.12106 +
3.12107 ++#ifndef IOV_MAX
3.12108 ++# if defined(_XOPEN_IOV_MAX)
3.12109 ++# define IOV_MAX _XOPEN_IOV_MAX
3.12110 ++# elif defined(DEF_IOV_MAX)
3.12111 ++# define IOV_MAX DEF_IOV_MAX
3.12112 ++# else
3.12113 ++# define IOV_MAX 16
3.12114 ++# endif
3.12115 ++#endif
3.12116 ++
3.12117 + /**
3.12118 + * Namespace for the oasys library of system support classes.
3.12119 + */
3.12120 +diff -r c6dc6a854b31 -r 7ce2b4528dee debug/Log.h
3.12121 +--- a/debug/Log.h Wed Nov 04 21:44:35 2009 -0800
3.12122 ++++ b/debug/Log.h Wed Nov 04 21:47:13 2009 -0800
3.12123 +@@ -89,14 +89,15 @@
3.12124 + * default SSSSS.uuuuuu
3.12125 + */
3.12126 +
3.12127 +-#include <stdarg.h>
3.12128 +-#include <stdio.h>
3.12129 ++#include <cstdarg>
3.12130 ++#include <cstdio>
3.12131 + #include <iostream> /* see http://mailman.dtnrg.org/pipermail/dtn-users/2007-January/000448.html */
3.12132 +-#include <string.h>
3.12133 ++#include <cstring>
3.12134 + #include <unistd.h>
3.12135 + #include <sys/time.h>
3.12136 + #include <string>
3.12137 + #include <vector>
3.12138 ++#include <strings.h>
3.12139 + #include <sys/uio.h>
3.12140 +
3.12141 + #if defined(__GNUC__)
3.12142 +diff -r c6dc6a854b31 -r 7ce2b4528dee doc/doxyfile
3.12143 +--- a/doc/doxyfile Wed Nov 04 21:44:35 2009 -0800
3.12144 ++++ b/doc/doxyfile Wed Nov 04 21:47:13 2009 -0800
3.12145 +@@ -1,4 +1,4 @@
3.12146 +-# Doxyfile 1.3.4
3.12147 ++# Doxyfile 1.5.8
3.12148 +
3.12149 + # This file describes the settings to be used by the documentation system
3.12150 + # doxygen (www.doxygen.org) for a project
3.12151 +@@ -14,6 +14,14 @@
3.12152 + # Project related configuration options
3.12153 + #---------------------------------------------------------------------------
3.12154 +
3.12155 ++# This tag specifies the encoding used for all characters in the config file
3.12156 ++# that follow. The default is UTF-8 which is also the encoding used for all
3.12157 ++# text before the first occurrence of this tag. Doxygen uses libiconv (or the
3.12158 ++# iconv built into libc) for the transcoding. See
3.12159 ++# http://www.gnu.org/software/libiconv for the list of possible encodings.
3.12160 ++
3.12161 ++DOXYFILE_ENCODING = UTF-8
3.12162 ++
3.12163 + # The PROJECT_NAME tag is a single word (or a sequence of words surrounded
3.12164 + # by quotes) that should identify the project.
3.12165 +
3.12166 +@@ -32,27 +40,28 @@
3.12167 +
3.12168 + OUTPUT_DIRECTORY = doc/doxygen
3.12169 +
3.12170 ++# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
3.12171 ++# 4096 sub-directories (in 2 levels) under the output directory of each output
3.12172 ++# format and will distribute the generated files over these directories.
3.12173 ++# Enabling this option can be useful when feeding doxygen a huge amount of
3.12174 ++# source files, where putting all generated files in the same directory would
3.12175 ++# otherwise cause performance problems for the file system.
3.12176 ++
3.12177 ++CREATE_SUBDIRS = NO
3.12178 ++
3.12179 + # The OUTPUT_LANGUAGE tag is used to specify the language in which all
3.12180 + # documentation generated by doxygen is written. Doxygen will use this
3.12181 + # information to generate all constant output in the proper language.
3.12182 + # The default language is English, other supported languages are:
3.12183 +-# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch,
3.12184 +-# Finnish, French, German, Greek, Hungarian, Italian, Japanese, Japanese-en
3.12185 +-# (Japanese with English messages), Korean, Norwegian, Polish, Portuguese,
3.12186 +-# Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian.
3.12187 ++# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
3.12188 ++# Croatian, Czech, Danish, Dutch, Farsi, Finnish, French, German, Greek,
3.12189 ++# Hungarian, Italian, Japanese, Japanese-en (Japanese with English messages),
3.12190 ++# Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, Polish,
3.12191 ++# Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, Slovene,
3.12192 ++# Spanish, Swedish, and Ukrainian.
3.12193 +
3.12194 + OUTPUT_LANGUAGE = English
3.12195 +
3.12196 +-# This tag can be used to specify the encoding used in the generated output.
3.12197 +-# The encoding is not always determined by the language that is chosen,
3.12198 +-# but also whether or not the output is meant for Windows or non-Windows users.
3.12199 +-# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES
3.12200 +-# forces the Windows encoding (this is the default for the Windows binary),
3.12201 +-# whereas setting the tag to NO uses a Unix-style encoding (the default for
3.12202 +-# all platforms other than Windows).
3.12203 +-
3.12204 +-USE_WINDOWS_ENCODING = NO
3.12205 +-
3.12206 + # If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
3.12207 + # include brief member descriptions after the members that are listed in
3.12208 + # the file and class documentation (similar to JavaDoc).
3.12209 +@@ -67,16 +76,28 @@
3.12210 +
3.12211 + REPEAT_BRIEF = YES
3.12212 +
3.12213 ++# This tag implements a quasi-intelligent brief description abbreviator
3.12214 ++# that is used to form the text in various listings. Each string
3.12215 ++# in this list, if found as the leading text of the brief description, will be
3.12216 ++# stripped from the text and the result after processing the whole list, is
3.12217 ++# used as the annotated text. Otherwise, the brief description is used as-is.
3.12218 ++# If left blank, the following values are used ("$name" is automatically
3.12219 ++# replaced with the name of the entity): "The $name class" "The $name widget"
3.12220 ++# "The $name file" "is" "provides" "specifies" "contains"
3.12221 ++# "represents" "a" "an" "the"
3.12222 ++
3.12223 ++ABBREVIATE_BRIEF =
3.12224 ++
3.12225 + # If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
3.12226 + # Doxygen will generate a detailed section even if there is only a brief
3.12227 + # description.
3.12228 +
3.12229 + ALWAYS_DETAILED_SEC = YES
3.12230 +
3.12231 +-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all inherited
3.12232 +-# members of a class in the documentation of that class as if those members were
3.12233 +-# ordinary class members. Constructors, destructors and assignment operators of
3.12234 +-# the base classes will not be shown.
3.12235 ++# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
3.12236 ++# inherited members of a class in the documentation of that class as if those
3.12237 ++# members were ordinary class members. Constructors, destructors and assignment
3.12238 ++# operators of the base classes will not be shown.
3.12239 +
3.12240 + INLINE_INHERITED_MEMB = NO
3.12241 +
3.12242 +@@ -89,10 +110,21 @@
3.12243 + # If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
3.12244 + # can be used to strip a user-defined part of the path. Stripping is
3.12245 + # only done if one of the specified strings matches the left-hand part of
3.12246 +-# the path. It is allowed to use relative paths in the argument list.
3.12247 ++# the path. The tag can be used to show relative paths in the file list.
3.12248 ++# If left blank the directory from which doxygen is run is used as the
3.12249 ++# path to strip.
3.12250 +
3.12251 + STRIP_FROM_PATH =
3.12252 +
3.12253 ++# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
3.12254 ++# the path mentioned in the documentation of a class, which tells
3.12255 ++# the reader which header file to include in order to use a class.
3.12256 ++# If left blank only the name of the header file containing the class
3.12257 ++# definition is used. Otherwise one should specify the include paths that
3.12258 ++# are normally passed to the compiler using the -I flag.
3.12259 ++
3.12260 ++STRIP_FROM_INC_PATH =
3.12261 ++
3.12262 + # If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
3.12263 + # (but less readable) file names. This can be useful is your file systems
3.12264 + # doesn't support long names like on DOS, Mac, or CD-ROM.
3.12265 +@@ -102,11 +134,19 @@
3.12266 + # If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
3.12267 + # will interpret the first line (until the first dot) of a JavaDoc-style
3.12268 + # comment as the brief description. If set to NO, the JavaDoc
3.12269 +-# comments will behave just like the Qt-style comments (thus requiring an
3.12270 +-# explict @brief command for a brief description.
3.12271 ++# comments will behave just like regular Qt-style comments
3.12272 ++# (thus requiring an explicit @brief command for a brief description.)
3.12273 +
3.12274 + JAVADOC_AUTOBRIEF = YES
3.12275 +
3.12276 ++# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
3.12277 ++# interpret the first line (until the first dot) of a Qt-style
3.12278 ++# comment as the brief description. If set to NO, the comments
3.12279 ++# will behave just like regular Qt-style comments (thus requiring
3.12280 ++# an explicit \brief command for a brief description.)
3.12281 ++
3.12282 ++QT_AUTOBRIEF = NO
3.12283 ++
3.12284 + # The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
3.12285 + # treat a multi-line C++ special comment block (i.e. a block of //! or ///
3.12286 + # comments) as a brief description. This used to be the default behaviour.
3.12287 +@@ -115,25 +155,17 @@
3.12288 +
3.12289 + MULTILINE_CPP_IS_BRIEF = NO
3.12290 +
3.12291 +-# If the DETAILS_AT_TOP tag is set to YES then Doxygen
3.12292 +-# will output the detailed description near the top, like JavaDoc.
3.12293 +-# If set to NO, the detailed description appears after the member
3.12294 +-# documentation.
3.12295 +-
3.12296 +-DETAILS_AT_TOP = YES
3.12297 +-
3.12298 + # If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
3.12299 + # member inherits the documentation from any documented member that it
3.12300 +-# reimplements.
3.12301 ++# re-implements.
3.12302 +
3.12303 + INHERIT_DOCS = YES
3.12304 +
3.12305 +-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
3.12306 +-# tag is set to YES, then doxygen will reuse the documentation of the first
3.12307 +-# member in the group (if any) for the other members of the group. By default
3.12308 +-# all members of a group must be documented explicitly.
3.12309 ++# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
3.12310 ++# a new page for each member. If set to NO, the documentation of a member will
3.12311 ++# be part of the file/class/namespace that contains it.
3.12312 +
3.12313 +-DISTRIBUTE_GROUP_DOC = YES
3.12314 ++SEPARATE_MEMBER_PAGES = NO
3.12315 +
3.12316 + # The TAB_SIZE tag can be used to set the number of spaces in a tab.
3.12317 + # Doxygen uses this value to replace tabs by spaces in code fragments.
3.12318 +@@ -149,20 +181,79 @@
3.12319 +
3.12320 + ALIASES =
3.12321 +
3.12322 +-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
3.12323 +-# only. Doxygen will then generate output that is more tailored for C.
3.12324 ++# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
3.12325 ++# sources only. Doxygen will then generate output that is more tailored for C.
3.12326 + # For instance, some of the names that are used will be different. The list
3.12327 + # of all members will be omitted, etc.
3.12328 +
3.12329 + OPTIMIZE_OUTPUT_FOR_C = NO
3.12330 +
3.12331 +-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java sources
3.12332 +-# only. Doxygen will then generate output that is more tailored for Java.
3.12333 +-# For instance, namespaces will be presented as packages, qualified scopes
3.12334 +-# will look different, etc.
3.12335 ++# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
3.12336 ++# sources only. Doxygen will then generate output that is more tailored for
3.12337 ++# Java. For instance, namespaces will be presented as packages, qualified
3.12338 ++# scopes will look different, etc.
3.12339 +
3.12340 + OPTIMIZE_OUTPUT_JAVA = NO
3.12341 +
3.12342 ++# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
3.12343 ++# sources only. Doxygen will then generate output that is more tailored for
3.12344 ++# Fortran.
3.12345 ++
3.12346 ++OPTIMIZE_FOR_FORTRAN = NO
3.12347 ++
3.12348 ++# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
3.12349 ++# sources. Doxygen will then generate output that is tailored for
3.12350 ++# VHDL.
3.12351 ++
3.12352 ++OPTIMIZE_OUTPUT_VHDL = NO
3.12353 ++
3.12354 ++# Doxygen selects the parser to use depending on the extension of the files it parses.
3.12355 ++# With this tag you can assign which parser to use for a given extension.
3.12356 ++# Doxygen has a built-in mapping, but you can override or extend it using this tag.
3.12357 ++# The format is ext=language, where ext is a file extension, and language is one of
3.12358 ++# the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP,
3.12359 ++# Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat
3.12360 ++# .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran),
3.12361 ++# use: inc=Fortran f=C
3.12362 ++
3.12363 ++EXTENSION_MAPPING =
3.12364 ++
3.12365 ++# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
3.12366 ++# to include (a tag file for) the STL sources as input, then you should
3.12367 ++# set this tag to YES in order to let doxygen match functions declarations and
3.12368 ++# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
3.12369 ++# func(std::string) {}). This also make the inheritance and collaboration
3.12370 ++# diagrams that involve STL classes more complete and accurate.
3.12371 ++
3.12372 ++BUILTIN_STL_SUPPORT = NO
3.12373 ++
3.12374 ++# If you use Microsoft's C++/CLI language, you should set this option to YES to
3.12375 ++# enable parsing support.
3.12376 ++
3.12377 ++CPP_CLI_SUPPORT = NO
3.12378 ++
3.12379 ++# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
3.12380 ++# Doxygen will parse them like normal C++ but will assume all classes use public
3.12381 ++# instead of private inheritance when no explicit protection keyword is present.
3.12382 ++
3.12383 ++SIP_SUPPORT = NO
3.12384 ++
3.12385 ++# For Microsoft's IDL there are propget and propput attributes to indicate getter
3.12386 ++# and setter methods for a property. Setting this option to YES (the default)
3.12387 ++# will make doxygen to replace the get and set methods by a property in the
3.12388 ++# documentation. This will only work if the methods are indeed getting or
3.12389 ++# setting a simple type. If this is not the case, or you want to show the
3.12390 ++# methods anyway, you should set this option to NO.
3.12391 ++
3.12392 ++IDL_PROPERTY_SUPPORT = YES
3.12393 ++
3.12394 ++# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
3.12395 ++# tag is set to YES, then doxygen will reuse the documentation of the first
3.12396 ++# member in the group (if any) for the other members of the group. By default
3.12397 ++# all members of a group must be documented explicitly.
3.12398 ++
3.12399 ++DISTRIBUTE_GROUP_DOC = YES
3.12400 ++
3.12401 + # Set the SUBGROUPING tag to YES (the default) to allow class member groups of
3.12402 + # the same type (for instance a group of public functions) to be put as a
3.12403 + # subgroup of that type (e.g. under the Public Functions section). Set it to
3.12404 +@@ -171,6 +262,32 @@
3.12405 +
3.12406 + SUBGROUPING = YES
3.12407 +
3.12408 ++# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
3.12409 ++# is documented as struct, union, or enum with the name of the typedef. So
3.12410 ++# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
3.12411 ++# with name TypeT. When disabled the typedef will appear as a member of a file,
3.12412 ++# namespace, or class. And the struct will be named TypeS. This can typically
3.12413 ++# be useful for C code in case the coding convention dictates that all compound
3.12414 ++# types are typedef'ed and only the typedef is referenced, never the tag name.
3.12415 ++
3.12416 ++TYPEDEF_HIDES_STRUCT = NO
3.12417 ++
3.12418 ++# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
3.12419 ++# determine which symbols to keep in memory and which to flush to disk.
3.12420 ++# When the cache is full, less often used symbols will be written to disk.
3.12421 ++# For small to medium size projects (<1000 input files) the default value is
3.12422 ++# probably good enough. For larger projects a too small cache size can cause
3.12423 ++# doxygen to be busy swapping symbols to and from disk most of the time
3.12424 ++# causing a significant performance penality.
3.12425 ++# If the system has enough physical memory increasing the cache will improve the
3.12426 ++# performance by keeping more symbols in memory. Note that the value works on
3.12427 ++# a logarithmic scale so increasing the size by one will rougly double the
3.12428 ++# memory usage. The cache size is given by this formula:
3.12429 ++# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
3.12430 ++# corresponding to a cache size of 2^16 = 65536 symbols
3.12431 ++
3.12432 ++SYMBOL_CACHE_SIZE = 0
3.12433 ++
3.12434 + #---------------------------------------------------------------------------
3.12435 + # Build related configuration options
3.12436 + #---------------------------------------------------------------------------
3.12437 +@@ -198,6 +315,21 @@
3.12438 +
3.12439 + EXTRACT_LOCAL_CLASSES = YES
3.12440 +
3.12441 ++# This flag is only useful for Objective-C code. When set to YES local
3.12442 ++# methods, which are defined in the implementation section but not in
3.12443 ++# the interface are included in the documentation.
3.12444 ++# If set to NO (the default) only methods in the interface are included.
3.12445 ++
3.12446 ++EXTRACT_LOCAL_METHODS = NO
3.12447 ++
3.12448 ++# If this flag is set to YES, the members of anonymous namespaces will be
3.12449 ++# extracted and appear in the documentation as a namespace called
3.12450 ++# 'anonymous_namespace{file}', where file will be replaced with the base
3.12451 ++# name of the file that contains the anonymous namespace. By default
3.12452 ++# anonymous namespace are hidden.
3.12453 ++
3.12454 ++EXTRACT_ANON_NSPACES = NO
3.12455 ++
3.12456 + # If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
3.12457 + # undocumented members of documented classes, files or namespaces.
3.12458 + # If set to NO (the default) these members will be included in the
3.12459 +@@ -238,7 +370,7 @@
3.12460 + # file names in lower-case letters. If set to YES upper-case letters are also
3.12461 + # allowed. This is useful if you have classes or files whose names only differ
3.12462 + # in case and if your file system supports case sensitive file names. Windows
3.12463 +-# users are advised to set this option to NO.
3.12464 ++# and Mac users are advised to set this option to NO.
3.12465 +
3.12466 + CASE_SENSE_NAMES = YES
3.12467 +
3.12468 +@@ -266,6 +398,29 @@
3.12469 +
3.12470 + SORT_MEMBER_DOCS = YES
3.12471 +
3.12472 ++# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
3.12473 ++# brief documentation of file, namespace and class members alphabetically
3.12474 ++# by member name. If set to NO (the default) the members will appear in
3.12475 ++# declaration order.
3.12476 ++
3.12477 ++SORT_BRIEF_DOCS = NO
3.12478 ++
3.12479 ++# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
3.12480 ++# hierarchy of group names into alphabetical order. If set to NO (the default)
3.12481 ++# the group names will appear in their defined order.
3.12482 ++
3.12483 ++SORT_GROUP_NAMES = NO
3.12484 ++
3.12485 ++# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
3.12486 ++# sorted by fully-qualified names, including namespaces. If set to
3.12487 ++# NO (the default), the class list will be sorted only by class name,
3.12488 ++# not including the namespace part.
3.12489 ++# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
3.12490 ++# Note: This option applies only to the class list, not to the
3.12491 ++# alphabetical list.
3.12492 ++
3.12493 ++SORT_BY_SCOPE_NAME = NO
3.12494 ++
3.12495 + # The GENERATE_TODOLIST tag can be used to enable (YES) or
3.12496 + # disable (NO) the todo list. This list is created by putting \todo
3.12497 + # commands in the documentation.
3.12498 +@@ -311,6 +466,44 @@
3.12499 +
3.12500 + SHOW_USED_FILES = YES
3.12501 +
3.12502 ++# If the sources in your project are distributed over multiple directories
3.12503 ++# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
3.12504 ++# in the documentation. The default is NO.
3.12505 ++
3.12506 ++SHOW_DIRECTORIES = NO
3.12507 ++
3.12508 ++# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
3.12509 ++# This will remove the Files entry from the Quick Index and from the
3.12510 ++# Folder Tree View (if specified). The default is YES.
3.12511 ++
3.12512 ++SHOW_FILES = YES
3.12513 ++
3.12514 ++# Set the SHOW_NAMESPACES tag to NO to disable the generation of the
3.12515 ++# Namespaces page.
3.12516 ++# This will remove the Namespaces entry from the Quick Index
3.12517 ++# and from the Folder Tree View (if specified). The default is YES.
3.12518 ++
3.12519 ++SHOW_NAMESPACES = YES
3.12520 ++
3.12521 ++# The FILE_VERSION_FILTER tag can be used to specify a program or script that
3.12522 ++# doxygen should invoke to get the current version for each file (typically from
3.12523 ++# the version control system). Doxygen will invoke the program by executing (via
3.12524 ++# popen()) the command <command> <input-file>, where <command> is the value of
3.12525 ++# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
3.12526 ++# provided by doxygen. Whatever the program writes to standard output
3.12527 ++# is used as the file version. See the manual for examples.
3.12528 ++
3.12529 ++FILE_VERSION_FILTER =
3.12530 ++
3.12531 ++# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by
3.12532 ++# doxygen. The layout file controls the global structure of the generated output files
3.12533 ++# in an output format independent way. The create the layout file that represents
3.12534 ++# doxygen's defaults, run doxygen with the -l option. You can optionally specify a
3.12535 ++# file name after the option, if omitted DoxygenLayout.xml will be used as the name
3.12536 ++# of the layout file.
3.12537 ++
3.12538 ++LAYOUT_FILE =
3.12539 ++
3.12540 + #---------------------------------------------------------------------------
3.12541 + # configuration options related to warning and progress messages
3.12542 + #---------------------------------------------------------------------------
3.12543 +@@ -339,10 +532,20 @@
3.12544 +
3.12545 + WARN_IF_DOC_ERROR = YES
3.12546 +
3.12547 ++# This WARN_NO_PARAMDOC option can be abled to get warnings for
3.12548 ++# functions that are documented, but have no documentation for their parameters
3.12549 ++# or return value. If set to NO (the default) doxygen will only warn about
3.12550 ++# wrong or incomplete parameter documentation, but not about the absence of
3.12551 ++# documentation.
3.12552 ++
3.12553 ++WARN_NO_PARAMDOC = NO
3.12554 ++
3.12555 + # The WARN_FORMAT tag determines the format of the warning messages that
3.12556 + # doxygen can produce. The string should contain the $file, $line, and $text
3.12557 + # tags, which will be replaced by the file and line number from which the
3.12558 +-# warning originated and the warning text.
3.12559 ++# warning originated and the warning text. Optionally the format may contain
3.12560 ++# $version, which will be replaced by the version of the file (if it could
3.12561 ++# be obtained via FILE_VERSION_FILTER)
3.12562 +
3.12563 + WARN_FORMAT = "$file:$line: $text"
3.12564 +
3.12565 +@@ -363,12 +566,20 @@
3.12566 +
3.12567 + INPUT = .
3.12568 +
3.12569 ++# This tag can be used to specify the character encoding of the source files
3.12570 ++# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
3.12571 ++# also the default input encoding. Doxygen uses libiconv (or the iconv built
3.12572 ++# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
3.12573 ++# the list of possible encodings.
3.12574 ++
3.12575 ++INPUT_ENCODING = UTF-8
3.12576 ++
3.12577 + # If the value of the INPUT tag contains directories, you can use the
3.12578 + # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
3.12579 + # and *.h) to filter out the source-files in the directories. If left
3.12580 + # blank the following patterns are tested:
3.12581 +-# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx *.hpp
3.12582 +-# *.h++ *.idl *.odl *.cs *.php *.php3 *.inc
3.12583 ++# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx
3.12584 ++# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
3.12585 +
3.12586 + FILE_PATTERNS =
3.12587 +
3.12588 +@@ -384,16 +595,28 @@
3.12589 +
3.12590 + EXCLUDE = debug/Formatter.cc
3.12591 +
3.12592 +-# The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories
3.12593 +-# that are symbolic links (a Unix filesystem feature) are excluded from the input.
3.12594 ++# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
3.12595 ++# directories that are symbolic links (a Unix filesystem feature) are excluded
3.12596 ++# from the input.
3.12597 +
3.12598 + EXCLUDE_SYMLINKS = NO
3.12599 +
3.12600 + # If the value of the INPUT tag contains directories, you can use the
3.12601 + # EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
3.12602 +-# certain files from those directories.
3.12603 ++# certain files from those directories. Note that the wildcards are matched
3.12604 ++# against the file with absolute path, so to exclude all test directories
3.12605 ++# for example use the pattern */test/*
3.12606 +
3.12607 +-EXCLUDE_PATTERNS = gdtoa* arith*.h
3.12608 ++EXCLUDE_PATTERNS = gdtoa* \
3.12609 ++ arith*.h
3.12610 ++
3.12611 ++# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
3.12612 ++# (namespaces, classes, functions, etc.) that should be excluded from the
3.12613 ++# output. The symbol name can be a fully qualified name, a word, or if the
3.12614 ++# wildcard * is used, a substring. Examples: ANamespace, AClass,
3.12615 ++# AClass::ANamespace, ANamespace::*Test
3.12616 ++
3.12617 ++EXCLUDE_SYMBOLS =
3.12618 +
3.12619 + # The EXAMPLE_PATH tag can be used to specify one or more files or
3.12620 + # directories that contain example code fragments that are included (see
3.12621 +@@ -426,10 +649,23 @@
3.12622 + # by executing (via popen()) the command <filter> <input-file>, where <filter>
3.12623 + # is the value of the INPUT_FILTER tag, and <input-file> is the name of an
3.12624 + # input file. Doxygen will then use the output that the filter program writes
3.12625 +-# to standard output.
3.12626 ++# to standard output.
3.12627 ++# If FILTER_PATTERNS is specified, this tag will be
3.12628 ++# ignored.
3.12629 +
3.12630 + INPUT_FILTER =
3.12631 +
3.12632 ++# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
3.12633 ++# basis.
3.12634 ++# Doxygen will compare the file name with each pattern and apply the
3.12635 ++# filter if there is a match.
3.12636 ++# The filters are a list of the form:
3.12637 ++# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
3.12638 ++# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER
3.12639 ++# is applied to all files.
3.12640 ++
3.12641 ++FILTER_PATTERNS =
3.12642 ++
3.12643 + # If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
3.12644 + # INPUT_FILTER) will be used to filter the input files when producing source
3.12645 + # files to browse (i.e. when SOURCE_BROWSER is set to YES).
3.12646 +@@ -441,7 +677,9 @@
3.12647 + #---------------------------------------------------------------------------
3.12648 +
3.12649 + # If the SOURCE_BROWSER tag is set to YES then a list of source files will
3.12650 +-# be generated. Documented entities will be cross-referenced with these sources.
3.12651 ++# be generated. Documented entities will be cross-referenced with these sources.
3.12652 ++# Note: To get rid of all source code in the generated output, make sure also
3.12653 ++# VERBATIM_HEADERS is set to NO.
3.12654 +
3.12655 + SOURCE_BROWSER = YES
3.12656 +
3.12657 +@@ -456,18 +694,34 @@
3.12658 +
3.12659 + STRIP_CODE_COMMENTS = YES
3.12660 +
3.12661 +-# If the REFERENCED_BY_RELATION tag is set to YES (the default)
3.12662 ++# If the REFERENCED_BY_RELATION tag is set to YES
3.12663 + # then for each documented function all documented
3.12664 + # functions referencing it will be listed.
3.12665 +
3.12666 + REFERENCED_BY_RELATION = YES
3.12667 +
3.12668 +-# If the REFERENCES_RELATION tag is set to YES (the default)
3.12669 ++# If the REFERENCES_RELATION tag is set to YES
3.12670 + # then for each documented function all documented entities
3.12671 + # called/used by that function will be listed.
3.12672 +
3.12673 + REFERENCES_RELATION = YES
3.12674 +
3.12675 ++# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
3.12676 ++# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
3.12677 ++# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
3.12678 ++# link to the source code.
3.12679 ++# Otherwise they will link to the documentation.
3.12680 ++
3.12681 ++REFERENCES_LINK_SOURCE = YES
3.12682 ++
3.12683 ++# If the USE_HTAGS tag is set to YES then the references to source code
3.12684 ++# will point to the HTML generated by the htags(1) tool instead of doxygen
3.12685 ++# built-in source browser. The htags tool is part of GNU's global source
3.12686 ++# tagging system (see http://www.gnu.org/software/global/global.html). You
3.12687 ++# will need version 4.8.6 or higher.
3.12688 ++
3.12689 ++USE_HTAGS = NO
3.12690 ++
3.12691 + # If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
3.12692 + # will generate a verbatim copy of the header file for each class for
3.12693 + # which an include is specified. Set to NO to disable this.
3.12694 +@@ -533,7 +787,9 @@
3.12695 + # The HTML_STYLESHEET tag can be used to specify a user-defined cascading
3.12696 + # style sheet that is used by each HTML page. It can be used to
3.12697 + # fine-tune the look of the HTML output. If the tag is left blank doxygen
3.12698 +-# will generate a default style sheet
3.12699 ++# will generate a default style sheet. Note that doxygen will try to copy
3.12700 ++# the style sheet file to the HTML output directory, so don't put your own
3.12701 ++# stylesheet in the HTML output directory as well, or it will be erased!
3.12702 +
3.12703 + HTML_STYLESHEET = doc/doxygen/style.css
3.12704 +
3.12705 +@@ -543,9 +799,43 @@
3.12706 +
3.12707 + HTML_ALIGN_MEMBERS = YES
3.12708 +
3.12709 ++# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
3.12710 ++# documentation will contain sections that can be hidden and shown after the
3.12711 ++# page has loaded. For this to work a browser that supports
3.12712 ++# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox
3.12713 ++# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
3.12714 ++
3.12715 ++HTML_DYNAMIC_SECTIONS = NO
3.12716 ++
3.12717 ++# If the GENERATE_DOCSET tag is set to YES, additional index files
3.12718 ++# will be generated that can be used as input for Apple's Xcode 3
3.12719 ++# integrated development environment, introduced with OSX 10.5 (Leopard).
3.12720 ++# To create a documentation set, doxygen will generate a Makefile in the
3.12721 ++# HTML output directory. Running make will produce the docset in that
3.12722 ++# directory and running "make install" will install the docset in
3.12723 ++# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
3.12724 ++# it at startup.
3.12725 ++# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information.
3.12726 ++
3.12727 ++GENERATE_DOCSET = NO
3.12728 ++
3.12729 ++# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the
3.12730 ++# feed. A documentation feed provides an umbrella under which multiple
3.12731 ++# documentation sets from a single provider (such as a company or product suite)
3.12732 ++# can be grouped.
3.12733 ++
3.12734 ++DOCSET_FEEDNAME = "Doxygen generated docs"
3.12735 ++
3.12736 ++# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that
3.12737 ++# should uniquely identify the documentation set bundle. This should be a
3.12738 ++# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
3.12739 ++# will append .docset to the name.
3.12740 ++
3.12741 ++DOCSET_BUNDLE_ID = org.doxygen.Project
3.12742 ++
3.12743 + # If the GENERATE_HTMLHELP tag is set to YES, additional index files
3.12744 + # will be generated that can be used as input for tools like the
3.12745 +-# Microsoft HTML help workshop to generate a compressed HTML help file (.chm)
3.12746 ++# Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
3.12747 + # of the generated HTML documentation.
3.12748 +
3.12749 + GENERATE_HTMLHELP = NO
3.12750 +@@ -553,7 +843,7 @@
3.12751 + # If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
3.12752 + # be used to specify the file name of the resulting .chm file. You
3.12753 + # can add a path in front of the file if the result should not be
3.12754 +-# written to the html output dir.
3.12755 ++# written to the html output directory.
3.12756 +
3.12757 + CHM_FILE =
3.12758 +
3.12759 +@@ -570,6 +860,12 @@
3.12760 +
3.12761 + GENERATE_CHI = NO
3.12762 +
3.12763 ++# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING
3.12764 ++# is used to encode HtmlHelp index (hhk), content (hhc) and project file
3.12765 ++# content.
3.12766 ++
3.12767 ++CHM_INDEX_ENCODING =
3.12768 ++
3.12769 + # If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
3.12770 + # controls whether a binary table of contents is generated (YES) or a
3.12771 + # normal table of contents (NO) in the .chm file.
3.12772 +@@ -581,6 +877,55 @@
3.12773 +
3.12774 + TOC_EXPAND = NO
3.12775 +
3.12776 ++# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER
3.12777 ++# are set, an additional index file will be generated that can be used as input for
3.12778 ++# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated
3.12779 ++# HTML documentation.
3.12780 ++
3.12781 ++GENERATE_QHP = NO
3.12782 ++
3.12783 ++# If the QHG_LOCATION tag is specified, the QCH_FILE tag can
3.12784 ++# be used to specify the file name of the resulting .qch file.
3.12785 ++# The path specified is relative to the HTML output folder.
3.12786 ++
3.12787 ++QCH_FILE =
3.12788 ++
3.12789 ++# The QHP_NAMESPACE tag specifies the namespace to use when generating
3.12790 ++# Qt Help Project output. For more information please see
3.12791 ++# http://doc.trolltech.com/qthelpproject.html#namespace
3.12792 ++
3.12793 ++QHP_NAMESPACE =
3.12794 ++
3.12795 ++# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
3.12796 ++# Qt Help Project output. For more information please see
3.12797 ++# http://doc.trolltech.com/qthelpproject.html#virtual-folders
3.12798 ++
3.12799 ++QHP_VIRTUAL_FOLDER = doc
3.12800 ++
3.12801 ++# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to add.
3.12802 ++# For more information please see
3.12803 ++# http://doc.trolltech.com/qthelpproject.html#custom-filters
3.12804 ++
3.12805 ++QHP_CUST_FILTER_NAME =
3.12806 ++
3.12807 ++# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add.For more information please see
3.12808 ++# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">Qt Help Project / Custom Filters</a>.
3.12809 ++
3.12810 ++QHP_CUST_FILTER_ATTRS =
3.12811 ++
3.12812 ++# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's
3.12813 ++# filter section matches.
3.12814 ++# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">Qt Help Project / Filter Attributes</a>.
3.12815 ++
3.12816 ++QHP_SECT_FILTER_ATTRS =
3.12817 ++
3.12818 ++# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can
3.12819 ++# be used to specify the location of Qt's qhelpgenerator.
3.12820 ++# If non-empty doxygen will try to run qhelpgenerator on the generated
3.12821 ++# .qhp file.
3.12822 ++
3.12823 ++QHG_LOCATION =
3.12824 ++
3.12825 + # The DISABLE_INDEX tag can be used to turn on/off the condensed index at
3.12826 + # top of each HTML page. The value NO (the default) enables the index and
3.12827 + # the value YES disables it.
3.12828 +@@ -592,12 +937,20 @@
3.12829 +
3.12830 + ENUM_VALUES_PER_LINE = 4
3.12831 +
3.12832 +-# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
3.12833 +-# generated containing a tree-like index structure (just like the one that
3.12834 ++# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
3.12835 ++# structure should be generated to display hierarchical information.
3.12836 ++# If the tag value is set to FRAME, a side panel will be generated
3.12837 ++# containing a tree-like index structure (just like the one that
3.12838 + # is generated for HTML Help). For this to work a browser that supports
3.12839 + # JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+,
3.12840 + # Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are
3.12841 +-# probably better off using the HTML help feature.
3.12842 ++# probably better off using the HTML help feature. Other possible values
3.12843 ++# for this tag are: HIERARCHIES, which will generate the Groups, Directories,
3.12844 ++# and Class Hierarchy pages using a tree view instead of an ordered list;
3.12845 ++# ALL, which combines the behavior of FRAME and HIERARCHIES; and NONE, which
3.12846 ++# disables this behavior completely. For backwards compatibility with previous
3.12847 ++# releases of Doxygen, the values YES and NO are equivalent to FRAME and NONE
3.12848 ++# respectively.
3.12849 +
3.12850 + GENERATE_TREEVIEW = YES
3.12851 +
3.12852 +@@ -607,6 +960,14 @@
3.12853 +
3.12854 + TREEVIEW_WIDTH = 200
3.12855 +
3.12856 ++# Use this tag to change the font size of Latex formulas included
3.12857 ++# as images in the HTML documentation. The default is 10. Note that
3.12858 ++# when you change the font size after a successful doxygen run you need
3.12859 ++# to manually remove any form_*.png images from the HTML output directory
3.12860 ++# to force them to be regenerated.
3.12861 ++
3.12862 ++FORMULA_FONTSIZE = 10
3.12863 ++
3.12864 + #---------------------------------------------------------------------------
3.12865 + # configuration options related to the LaTeX output
3.12866 + #---------------------------------------------------------------------------
3.12867 +@@ -688,7 +1049,7 @@
3.12868 + #---------------------------------------------------------------------------
3.12869 +
3.12870 + # If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
3.12871 +-# The RTF output is optimised for Word 97 and may not look very pretty with
3.12872 ++# The RTF output is optimized for Word 97 and may not look very pretty with
3.12873 + # other RTF readers or editors.
3.12874 +
3.12875 + GENERATE_RTF = NO
3.12876 +@@ -715,7 +1076,7 @@
3.12877 + RTF_HYPERLINKS = NO
3.12878 +
3.12879 + # Load stylesheet definitions from file. Syntax is similar to doxygen's
3.12880 +-# config file, i.e. a series of assigments. You only have to provide
3.12881 ++# config file, i.e. a series of assignments. You only have to provide
3.12882 + # replacements, missing definitions are set to their default value.
3.12883 +
3.12884 + RTF_STYLESHEET_FILE =
3.12885 +@@ -759,9 +1120,7 @@
3.12886 +
3.12887 + # If the GENERATE_XML tag is set to YES Doxygen will
3.12888 + # generate an XML file that captures the structure of
3.12889 +-# the code including all documentation. Note that this
3.12890 +-# feature is still experimental and incomplete at the
3.12891 +-# moment.
3.12892 ++# the code including all documentation.
3.12893 +
3.12894 + GENERATE_XML = NO
3.12895 +
3.12896 +@@ -783,6 +1142,13 @@
3.12897 +
3.12898 + XML_DTD =
3.12899 +
3.12900 ++# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
3.12901 ++# dump the program listings (including syntax highlighting
3.12902 ++# and cross-referencing information) to the XML output. Note that
3.12903 ++# enabling this will significantly increase the size of the XML output.
3.12904 ++
3.12905 ++XML_PROGRAMLISTING = YES
3.12906 ++
3.12907 + #---------------------------------------------------------------------------
3.12908 + # configuration options for the AutoGen Definitions output
3.12909 + #---------------------------------------------------------------------------
3.12910 +@@ -814,8 +1180,10 @@
3.12911 + PERLMOD_LATEX = NO
3.12912 +
3.12913 + # If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
3.12914 +-# nicely formatted so it can be parsed by a human reader. This is useful
3.12915 +-# if you want to understand what is going on. On the other hand, if this
3.12916 ++# nicely formatted so it can be parsed by a human reader.
3.12917 ++# This is useful
3.12918 ++# if you want to understand what is going on.
3.12919 ++# On the other hand, if this
3.12920 + # tag is set to NO the size of the Perl module output will be much smaller
3.12921 + # and Perl will parse it just the same.
3.12922 +
3.12923 +@@ -847,7 +1215,7 @@
3.12924 +
3.12925 + # If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
3.12926 + # then the macro expansion is limited to the macros specified with the
3.12927 +-# PREDEFINED and EXPAND_AS_PREDEFINED tags.
3.12928 ++# PREDEFINED and EXPAND_AS_DEFINED tags.
3.12929 +
3.12930 + EXPAND_ONLY_PREDEF = YES
3.12931 +
3.12932 +@@ -873,9 +1241,12 @@
3.12933 + # are defined before the preprocessor is started (similar to the -D option of
3.12934 + # gcc). The argument of the tag is a list of macros of the form: name
3.12935 + # or name=definition (no spaces). If the definition and the = are
3.12936 +-# omitted =1 is assumed.
3.12937 ++# omitted =1 is assumed. To prevent a macro definition from being
3.12938 ++# undefined via #undef or recursively expanded use the := operator
3.12939 ++# instead of the = operator.
3.12940 +
3.12941 +-PREDEFINED = "PRINTFLIKE(x, y)=" "DOXYGEN"
3.12942 ++PREDEFINED = "PRINTFLIKE(x, y)=" \
3.12943 ++ "DOXYGEN"
3.12944 +
3.12945 + # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
3.12946 + # this tag can be used to specify a list of macro names that should be expanded.
3.12947 +@@ -887,27 +1258,29 @@
3.12948 + # If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
3.12949 + # doxygen's preprocessor will remove all function-like macros that are alone
3.12950 + # on a line, have an all uppercase name, and do not end with a semicolon. Such
3.12951 +-# function macros are typically used for boiler-plate code, and will confuse the
3.12952 +-# parser if not removed.
3.12953 ++# function macros are typically used for boiler-plate code, and will confuse
3.12954 ++# the parser if not removed.
3.12955 +
3.12956 + SKIP_FUNCTION_MACROS = YES
3.12957 +
3.12958 + #---------------------------------------------------------------------------
3.12959 +-# Configuration::addtions related to external references
3.12960 ++# Configuration::additions related to external references
3.12961 + #---------------------------------------------------------------------------
3.12962 +
3.12963 + # The TAGFILES option can be used to specify one or more tagfiles.
3.12964 + # Optionally an initial location of the external documentation
3.12965 + # can be added for each tagfile. The format of a tag file without
3.12966 + # this location is as follows:
3.12967 +-# TAGFILES = file1 file2 ...
3.12968 ++#
3.12969 ++# TAGFILES = file1 file2 ...
3.12970 + # Adding location for the tag files is done as follows:
3.12971 +-# TAGFILES = file1=loc1 "file2 = loc2" ...
3.12972 ++#
3.12973 ++# TAGFILES = file1=loc1 "file2 = loc2" ...
3.12974 + # where "loc1" and "loc2" can be relative or absolute paths or
3.12975 + # URLs. If a location is present for each tag, the installdox tool
3.12976 +-# does not have to be run to correct the links.
3.12977 +-# Note that each tag file must have a unique name
3.12978 +-# (where the name does NOT include the path)
3.12979 ++# does not have to be run to correct the links.
3.12980 ++# Note that each tag file must have a unique name
3.12981 ++# (where the name does NOT include the path)
3.12982 + # If a tag file is not located in the directory in which doxygen
3.12983 + # is run, you must also specify the path to the tagfile here.
3.12984 +
3.12985 +@@ -940,13 +1313,23 @@
3.12986 + #---------------------------------------------------------------------------
3.12987 +
3.12988 + # If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
3.12989 +-# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base or
3.12990 +-# super classes. Setting the tag to NO turns the diagrams off. Note that this
3.12991 +-# option is superceded by the HAVE_DOT option below. This is only a fallback. It is
3.12992 +-# recommended to install and use dot, since it yields more powerful graphs.
3.12993 ++# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
3.12994 ++# or super classes. Setting the tag to NO turns the diagrams off. Note that
3.12995 ++# this option is superseded by the HAVE_DOT option below. This is only a
3.12996 ++# fallback. It is recommended to install and use dot, since it yields more
3.12997 ++# powerful graphs.
3.12998 +
3.12999 + CLASS_DIAGRAMS = YES
3.13000 +
3.13001 ++# You can define message sequence charts within doxygen comments using the \msc
3.13002 ++# command. Doxygen will then run the mscgen tool (see
3.13003 ++# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the
3.13004 ++# documentation. The MSCGEN_PATH tag allows you to specify the directory where
3.13005 ++# the mscgen tool resides. If left empty the tool is assumed to be found in the
3.13006 ++# default search path.
3.13007 ++
3.13008 ++MSCGEN_PATH =
3.13009 ++
3.13010 + # If set to YES, the inheritance and collaboration graphs will hide
3.13011 + # inheritance and usage relations if the target is undocumented
3.13012 + # or is not a class.
3.13013 +@@ -960,6 +1343,29 @@
3.13014 +
3.13015 + HAVE_DOT = NO
3.13016 +
3.13017 ++# By default doxygen will write a font called FreeSans.ttf to the output
3.13018 ++# directory and reference it in all dot files that doxygen generates. This
3.13019 ++# font does not include all possible unicode characters however, so when you need
3.13020 ++# these (or just want a differently looking font) you can specify the font name
3.13021 ++# using DOT_FONTNAME. You need need to make sure dot is able to find the font,
3.13022 ++# which can be done by putting it in a standard location or by setting the
3.13023 ++# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory
3.13024 ++# containing the font.
3.13025 ++
3.13026 ++DOT_FONTNAME = FreeSans
3.13027 ++
3.13028 ++# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
3.13029 ++# The default size is 10pt.
3.13030 ++
3.13031 ++DOT_FONTSIZE = 10
3.13032 ++
3.13033 ++# By default doxygen will tell dot to use the output directory to look for the
3.13034 ++# FreeSans.ttf font (which doxygen will put there itself). If you specify a
3.13035 ++# different font using DOT_FONTNAME you can set the path where dot
3.13036 ++# can find it using this tag.
3.13037 ++
3.13038 ++DOT_FONTPATH =
3.13039 ++
3.13040 + # If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
3.13041 + # will generate a graph for each documented class showing the direct and
3.13042 + # indirect inheritance relations. Setting this tag to YES will force the
3.13043 +@@ -974,8 +1380,13 @@
3.13044 +
3.13045 + COLLABORATION_GRAPH = YES
3.13046 +
3.13047 ++# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
3.13048 ++# will generate a graph for groups, showing the direct groups dependencies
3.13049 ++
3.13050 ++GROUP_GRAPHS = YES
3.13051 ++
3.13052 + # If the UML_LOOK tag is set to YES doxygen will generate inheritance and
3.13053 +-# collaboration diagrams in a style similiar to the OMG's Unified Modeling
3.13054 ++# collaboration diagrams in a style similar to the OMG's Unified Modeling
3.13055 + # Language.
3.13056 +
3.13057 + UML_LOOK = NO
3.13058 +@@ -999,27 +1410,42 @@
3.13059 +
3.13060 + INCLUDED_BY_GRAPH = YES
3.13061 +
3.13062 +-# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will
3.13063 +-# generate a call dependency graph for every global function or class method.
3.13064 +-# Note that enabling this option will significantly increase the time of a run.
3.13065 +-# So in most cases it will be better to enable call graphs for selected
3.13066 +-# functions only using the \callgraph command.
3.13067 ++# If the CALL_GRAPH and HAVE_DOT options are set to YES then
3.13068 ++# doxygen will generate a call dependency graph for every global function
3.13069 ++# or class method. Note that enabling this option will significantly increase
3.13070 ++# the time of a run. So in most cases it will be better to enable call graphs
3.13071 ++# for selected functions only using the \callgraph command.
3.13072 +
3.13073 + CALL_GRAPH = NO
3.13074 +
3.13075 ++# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then
3.13076 ++# doxygen will generate a caller dependency graph for every global function
3.13077 ++# or class method. Note that enabling this option will significantly increase
3.13078 ++# the time of a run. So in most cases it will be better to enable caller
3.13079 ++# graphs for selected functions only using the \callergraph command.
3.13080 ++
3.13081 ++CALLER_GRAPH = NO
3.13082 ++
3.13083 + # If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
3.13084 + # will graphical hierarchy of all classes instead of a textual one.
3.13085 +
3.13086 + GRAPHICAL_HIERARCHY = YES
3.13087 +
3.13088 ++# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES
3.13089 ++# then doxygen will show the dependencies a directory has on other directories
3.13090 ++# in a graphical way. The dependency relations are determined by the #include
3.13091 ++# relations between the files in the directories.
3.13092 ++
3.13093 ++DIRECTORY_GRAPH = YES
3.13094 ++
3.13095 + # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
3.13096 +-# generated by dot. Possible values are png, jpg, or gif
3.13097 ++# generated by dot. Possible values are png, jpg, or gif
3.13098 + # If left blank png will be used.
3.13099 +
3.13100 + DOT_IMAGE_FORMAT = png
3.13101 +
3.13102 + # The tag DOT_PATH can be used to specify the path where the dot tool can be
3.13103 +-# found. If left blank, it is assumed the dot tool can be found on the path.
3.13104 ++# found. If left blank, it is assumed the dot tool can be found in the path.
3.13105 +
3.13106 + DOT_PATH =
3.13107 +
3.13108 +@@ -1029,33 +1455,41 @@
3.13109 +
3.13110 + DOTFILE_DIRS =
3.13111 +
3.13112 +-# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width
3.13113 +-# (in pixels) of the graphs generated by dot. If a graph becomes larger than
3.13114 +-# this value, doxygen will try to truncate the graph, so that it fits within
3.13115 +-# the specified constraint. Beware that most browsers cannot cope with very
3.13116 +-# large images.
3.13117 ++# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
3.13118 ++# nodes that will be shown in the graph. If the number of nodes in a graph
3.13119 ++# becomes larger than this value, doxygen will truncate the graph, which is
3.13120 ++# visualized by representing a node as a red box. Note that doxygen if the
3.13121 ++# number of direct children of the root node in a graph is already larger than
3.13122 ++# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
3.13123 ++# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
3.13124 +
3.13125 +-MAX_DOT_GRAPH_WIDTH = 1024
3.13126 +-
3.13127 +-# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height
3.13128 +-# (in pixels) of the graphs generated by dot. If a graph becomes larger than
3.13129 +-# this value, doxygen will try to truncate the graph, so that it fits within
3.13130 +-# the specified constraint. Beware that most browsers cannot cope with very
3.13131 +-# large images.
3.13132 +-
3.13133 +-MAX_DOT_GRAPH_HEIGHT = 1024
3.13134 ++DOT_GRAPH_MAX_NODES = 50
3.13135 +
3.13136 + # The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
3.13137 + # graphs generated by dot. A depth value of 3 means that only nodes reachable
3.13138 +-# from the root by following a path via at most 3 edges will be shown. Nodes that
3.13139 +-# lay further from the root node will be omitted. Note that setting this option to
3.13140 +-# 1 or 2 may greatly reduce the computation time needed for large code bases. Also
3.13141 +-# note that a graph may be further truncated if the graph's image dimensions are
3.13142 +-# not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH and MAX_DOT_GRAPH_HEIGHT).
3.13143 +-# If 0 is used for the depth value (the default), the graph is not depth-constrained.
3.13144 ++# from the root by following a path via at most 3 edges will be shown. Nodes
3.13145 ++# that lay further from the root node will be omitted. Note that setting this
3.13146 ++# option to 1 or 2 may greatly reduce the computation time needed for large
3.13147 ++# code bases. Also note that the size of a graph can be further restricted by
3.13148 ++# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
3.13149 +
3.13150 + MAX_DOT_GRAPH_DEPTH = 0
3.13151 +
3.13152 ++# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
3.13153 ++# background. This is disabled by default, because dot on Windows does not
3.13154 ++# seem to support this out of the box. Warning: Depending on the platform used,
3.13155 ++# enabling this option may lead to badly anti-aliased labels on the edges of
3.13156 ++# a graph (i.e. they become hard to read).
3.13157 ++
3.13158 ++DOT_TRANSPARENT = NO
3.13159 ++
3.13160 ++# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
3.13161 ++# files in one run (i.e. multiple -o and -T options on the command line). This
3.13162 ++# makes dot run faster, but since only newer versions of dot (>1.8.10)
3.13163 ++# support this, this feature is disabled by default.
3.13164 ++
3.13165 ++DOT_MULTI_TARGETS = NO
3.13166 ++
3.13167 + # If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
3.13168 + # generate a legend page explaining the meaning of the various boxes and
3.13169 + # arrows in the dot generated graphs.
3.13170 +@@ -1069,7 +1503,7 @@
3.13171 + DOT_CLEANUP = YES
3.13172 +
3.13173 + #---------------------------------------------------------------------------
3.13174 +-# Configuration::addtions related to the search engine
3.13175 ++# Options related to the search engine
3.13176 + #---------------------------------------------------------------------------
3.13177 +
3.13178 + # The SEARCHENGINE tag specifies whether or not a search engine should be
3.13179 +diff -r c6dc6a854b31 -r 7ce2b4528dee ext/xsd/cxx/tree/elements.hxx
3.13180 +--- a/ext/xsd/cxx/tree/elements.hxx Wed Nov 04 21:44:35 2009 -0800
3.13181 ++++ b/ext/xsd/cxx/tree/elements.hxx Wed Nov 04 21:47:13 2009 -0800
3.13182 +@@ -596,7 +596,8 @@
3.13183 + //
3.13184 + assert (size != 0);
3.13185 +
3.13186 +- for ( ;i < size && !a_.isSameNode (nl.item (i)); ++i);
3.13187 ++ for ( ;i < size && !a_.isSameNode (nl.item (i)); ++i)
3.13188 ++ ;
3.13189 +
3.13190 + // a_ should be in the list.
3.13191 + //
3.13192 +diff -r c6dc6a854b31 -r 7ce2b4528dee ext/xsd/cxx/xml/dom/parser.txx
3.13193 +--- a/ext/xsd/cxx/xml/dom/parser.txx Wed Nov 04 21:44:35 2009 -0800
3.13194 ++++ b/ext/xsd/cxx/xml/dom/parser.txx Wed Nov 04 21:47:13 2009 -0800
3.13195 +@@ -57,7 +57,8 @@
3.13196 +
3.13197 + for (; next_element_ != 0 &&
3.13198 + next_element_->getNodeType () != DOMNode::ELEMENT_NODE;
3.13199 +- next_element_ = next_element_->getNextSibling ());
3.13200 ++ next_element_ = next_element_->getNextSibling ())
3.13201 ++ ;
3.13202 + }
3.13203 + }
3.13204 + }
3.13205 +diff -r c6dc6a854b31 -r 7ce2b4528dee io/BufferedIO.cc
3.13206 +--- a/io/BufferedIO.cc Wed Nov 04 21:44:35 2009 -0800
3.13207 ++++ b/io/BufferedIO.cc Wed Nov 04 21:47:13 2009 -0800
3.13208 +@@ -35,7 +35,7 @@
3.13209 + #define DEFAULT_BUFSIZE 1024
3.13210 +
3.13211 + BufferedInput::BufferedInput(IOClient* client, const char* logbase)
3.13212 +- : Logger("BufferedInput", logbase),
3.13213 ++ : Logger("BufferedInput", "%s", logbase),
3.13214 + client_(client),
3.13215 + buf_(DEFAULT_BUFSIZE),
3.13216 + seen_eof_(false)
3.13217 +@@ -221,7 +221,7 @@
3.13218 + bool done;
3.13219 + do {
3.13220 + done = pretty.next_str(&s);
3.13221 +- log_debug(s.c_str());
3.13222 ++ log_debug("%s", s.c_str());
3.13223 + } while(!done);
3.13224 + #else
3.13225 + log_debug("internal_read %zu (timeout %d): cc=%d ret %d",
3.13226 +@@ -266,7 +266,7 @@
3.13227 + **************************************************************************/
3.13228 + BufferedOutput::BufferedOutput(IOClient* client,
3.13229 + const char* logbase)
3.13230 +- : Logger("BufferedOutput", logbase),
3.13231 ++ : Logger("BufferedOutput", "%s", logbase),
3.13232 + client_(client),
3.13233 + buf_(DEFAULT_BUFSIZE),
3.13234 + flush_limit_(DEFAULT_FLUSH_LIMIT)
3.13235 +@@ -367,7 +367,7 @@
3.13236 + bool done;
3.13237 + do {
3.13238 + done = pretty.next_str(&s);
3.13239 +- log_debug(s.c_str());
3.13240 ++ log_debug("%s", s.c_str());
3.13241 + } while(!done);
3.13242 +
3.13243 + #else
3.13244 +diff -r c6dc6a854b31 -r 7ce2b4528dee io/FdIOClient.cc
3.13245 +--- a/io/FdIOClient.cc Wed Nov 04 21:44:35 2009 -0800
3.13246 ++++ b/io/FdIOClient.cc Wed Nov 04 21:47:13 2009 -0800
3.13247 +@@ -26,7 +26,7 @@
3.13248 +
3.13249 + FdIOClient::FdIOClient(int fd, Notifier* intr, const char* logpath)
3.13250 + : IOHandlerBase(intr),
3.13251 +- Logger("FdIOClient", logpath),
3.13252 ++ Logger("FdIOClient", "%s", logpath),
3.13253 + fd_(fd)
3.13254 + {}
3.13255 +
3.13256 +diff -r c6dc6a854b31 -r 7ce2b4528dee io/FileUtils.cc
3.13257 +--- a/io/FileUtils.cc Wed Nov 04 21:44:35 2009 -0800
3.13258 ++++ b/io/FileUtils.cc Wed Nov 04 21:47:13 2009 -0800
3.13259 +@@ -52,7 +52,7 @@
3.13260 + return false;
3.13261 + }
3.13262 +
3.13263 +- if (st.st_mode & S_IRUSR == 0) {
3.13264 ++ if ((st.st_mode & S_IRUSR) == 0) {
3.13265 + logf(log, LOG_DEBUG,
3.13266 + "FileUtils::readable(%s): no readable permissions", path);
3.13267 + return false;
3.13268 +@@ -129,8 +129,18 @@
3.13269 +
3.13270 + std::string ent_name(path);
3.13271 + ent_name = ent_name + "/" + ent->d_name;
3.13272 +-
3.13273 +- if (recursive && ent->d_type == DT_DIR) {
3.13274 ++
3.13275 ++ bool is_dir = false;
3.13276 ++
3.13277 ++#if defined(DT_DIR)
3.13278 ++ is_dir = (ent->d_type == DT_DIR);
3.13279 ++#else
3.13280 ++ struct stat ss;
3.13281 ++ stat(ent->d_name, &ss);
3.13282 ++ is_dir = S_ISDIR(ss.st_mode);
3.13283 ++#endif
3.13284 ++
3.13285 ++ if (recursive && is_dir) {
3.13286 + rm_all_from_dir(ent_name.c_str(), true);
3.13287 + rmdir(ent_name.c_str());
3.13288 + }
3.13289 +diff -r c6dc6a854b31 -r 7ce2b4528dee io/IO.cc
3.13290 +--- a/io/IO.cc Wed Nov 04 21:44:35 2009 -0800
3.13291 ++++ b/io/IO.cc Wed Nov 04 21:47:13 2009 -0800
3.13292 +@@ -22,7 +22,7 @@
3.13293 + #include <stdlib.h>
3.13294 + #include <sys/poll.h>
3.13295 + #include <sys/types.h>
3.13296 +-#include <sys/fcntl.h>
3.13297 ++#include <fcntl.h>
3.13298 + #include <sys/mman.h>
3.13299 +
3.13300 + #include "IO.h"
3.13301 +@@ -34,7 +34,11 @@
3.13302 +
3.13303 + namespace oasys {
3.13304 +
3.13305 ++#if defined(_SC_PAGESIZE)
3.13306 ++static int page_size = sysconf(_SC_PAGESIZE);
3.13307 ++#else
3.13308 + static int page_size = ::getpagesize();
3.13309 ++#endif
3.13310 +
3.13311 + //----------------------------------------------------------------------------
3.13312 + //! Small helper class which is a copy-on-write iovec and also handle
3.13313 +@@ -855,7 +859,7 @@
3.13314 + ASSERT(! ((op == READV || op == WRITEV) &&
3.13315 + (iov == 0 || flags != 0 || args != 0)));
3.13316 + ASSERT(! ((op == RECV || op == SEND) &&
3.13317 +- (iovcnt != 1 | args != 0)));
3.13318 ++ (iovcnt != 1 || args != 0)));
3.13319 + ASSERT(! ((op == RECVFROM || op == SENDTO) &&
3.13320 + (iovcnt != 1 || args == 0)));
3.13321 + ASSERT(! ((op == RECVMSG || op == SENDMSG) &&
3.13322 +diff -r c6dc6a854b31 -r 7ce2b4528dee io/IPSocket.cc
3.13323 +--- a/io/IPSocket.cc Wed Nov 04 21:44:35 2009 -0800
3.13324 ++++ b/io/IPSocket.cc Wed Nov 04 21:47:13 2009 -0800
3.13325 +@@ -39,7 +39,7 @@
3.13326 + namespace oasys {
3.13327 +
3.13328 + IPSocket::IPSocket(int socktype, const char* logbase)
3.13329 +- : Logger("IPSocket", logbase)
3.13330 ++ : Logger("IPSocket", "%s", logbase)
3.13331 + {
3.13332 + state_ = INIT;
3.13333 + local_addr_ = INADDR_ANY;
3.13334 +diff -r c6dc6a854b31 -r 7ce2b4528dee io/MmapFile.cc
3.13335 +--- a/io/MmapFile.cc Wed Nov 04 21:44:35 2009 -0800
3.13336 ++++ b/io/MmapFile.cc Wed Nov 04 21:47:13 2009 -0800
3.13337 +@@ -20,8 +20,8 @@
3.13338 +
3.13339 + #include "MmapFile.h"
3.13340 +
3.13341 ++#include <cerrno>
3.13342 + #include <fcntl.h>
3.13343 +-#include <sys/errno.h>
3.13344 +
3.13345 + #include "FileIOClient.h"
3.13346 + #include "FileUtils.h"
3.13347 +@@ -30,7 +30,7 @@
3.13348 +
3.13349 + //----------------------------------------------------------------------
3.13350 + MmapFile::MmapFile(const char* logpath)
3.13351 +- : Logger("MmapFile", logpath),
3.13352 ++ : Logger("MmapFile", "%s", logpath),
3.13353 + ptr_(NULL),
3.13354 + len_(0)
3.13355 + {
3.13356 +diff -r c6dc6a854b31 -r 7ce2b4528dee io/NetUtils.cc
3.13357 +--- a/io/NetUtils.cc Wed Nov 04 21:44:35 2009 -0800
3.13358 ++++ b/io/NetUtils.cc Wed Nov 04 21:47:13 2009 -0800
3.13359 +@@ -45,11 +45,15 @@
3.13360 + #include "debug/DebugUtils.h"
3.13361 + #include "debug/Log.h"
3.13362 + #include "thread/SpinLock.h"
3.13363 +-#include <stdlib.h>
3.13364 +-#include <string.h>
3.13365 ++#include <cstdlib>
3.13366 ++#include <cstring>
3.13367 + #include <sys/socket.h>
3.13368 + #include <netdb.h>
3.13369 +
3.13370 ++#ifndef INADDR_NONE
3.13371 ++# define INADDR_NONE ((unsigned long int) -1)
3.13372 ++#endif
3.13373 ++
3.13374 + namespace oasys {
3.13375 +
3.13376 + /*
3.13377 +@@ -108,7 +112,7 @@
3.13378 + int h_err;
3.13379 +
3.13380 +
3.13381 +-#if defined(__sun__) // solaris has different args
3.13382 ++#if defined(__sun__) || defined(__QNXNTO__) // Solaris and QNX v6.x have different arguments
3.13383 + if (::gethostbyname_r(name, &h, buf, sizeof(buf), &h_err) < 0) {
3.13384 + logf("/oasys/net", LOG_ERR, "error return from gethostbyname_r(%s): %s",
3.13385 + name, strerror(h_err));
3.13386 +diff -r c6dc6a854b31 -r 7ce2b4528dee io/RateLimitedSocket.cc
3.13387 +--- a/io/RateLimitedSocket.cc Wed Nov 04 21:44:35 2009 -0800
3.13388 ++++ b/io/RateLimitedSocket.cc Wed Nov 04 21:47:13 2009 -0800
3.13389 +@@ -26,7 +26,7 @@
3.13390 + RateLimitedSocket::RateLimitedSocket(const char* logpath,
3.13391 + u_int32_t rate,
3.13392 + IPSocket* socket)
3.13393 +- : Logger("RateLimitedSocket", logpath),
3.13394 ++ : Logger("RateLimitedSocket", "%s", logpath),
3.13395 + bucket_(logpath, rate, 65535 * 8 /* max udp packet */),
3.13396 + socket_(socket)
3.13397 + {
3.13398 +diff -r c6dc6a854b31 -r 7ce2b4528dee io/TTY.cc
3.13399 +--- a/io/TTY.cc Wed Nov 04 21:44:35 2009 -0800
3.13400 ++++ b/io/TTY.cc Wed Nov 04 21:47:13 2009 -0800
3.13401 +@@ -18,6 +18,8 @@
3.13402 + # include <oasys-config.h>
3.13403 + #endif
3.13404 +
3.13405 ++#include "../compat/cfsetspeed.h"
3.13406 ++#include "../compat/cfmakeraw.h"
3.13407 + #include "TTY.h"
3.13408 +
3.13409 + namespace oasys {
3.13410 +diff -r c6dc6a854b31 -r 7ce2b4528dee oasys-config.h.in
3.13411 +--- a/oasys-config.h.in Wed Nov 04 21:44:35 2009 -0800
3.13412 ++++ b/oasys-config.h.in Wed Nov 04 21:47:13 2009 -0800
3.13413 +@@ -15,6 +15,12 @@
3.13414 + /* Define to 1 if you have the <bluetooth/bluetooth.h> header file. */
3.13415 + #undef HAVE_BLUETOOTH_BLUETOOTH_H
3.13416 +
3.13417 ++/* Define to 1 if you have the `cfmakeraw' function. */
3.13418 ++#undef HAVE_CFMAKERAW
3.13419 ++
3.13420 ++/* Define to 1 if you have the `cfsetspeed' function. */
3.13421 ++#undef HAVE_CFSETSPEED
3.13422 ++
3.13423 + /* Define to 1 if you have the <err.h> header file. */
3.13424 + #undef HAVE_ERR_H
3.13425 +
3.13426 +@@ -27,19 +33,19 @@
3.13427 + /* Define to 1 if you have the `getaddrinfo' function. */
3.13428 + #undef HAVE_GETADDRINFO
3.13429 +
3.13430 +-/* Define to 1 if you have the `gethostbyname' function. */
3.13431 ++/* wether gethostbyname exists */
3.13432 + #undef HAVE_GETHOSTBYNAME
3.13433 +
3.13434 +-/* Define to 1 if you have the `gethostbyname_r' function. */
3.13435 ++/* wether gethostbyname_r exists */
3.13436 + #undef HAVE_GETHOSTBYNAME_R
3.13437 +
3.13438 + /* Define to 1 if you have the `getopt_long' function. */
3.13439 + #undef HAVE_GETOPT_LONG
3.13440 +
3.13441 +-/* Define to 1 if you have the `inet_aton' function. */
3.13442 ++/* wether inet_aton exists */
3.13443 + #undef HAVE_INET_ATON
3.13444 +
3.13445 +-/* Define to 1 if you have the `inet_pton' function. */
3.13446 ++/* wether inet_pton exists */
3.13447 + #undef HAVE_INET_PTON
3.13448 +
3.13449 + /* Define to 1 if you have the <inttypes.h> header file. */
3.13450 +@@ -51,13 +57,16 @@
3.13451 + /* whether pthread_setspecific is defined */
3.13452 + #undef HAVE_PTHREAD_SETSPECIFIC
3.13453 +
3.13454 +-/* Define to 1 if you have the `pthread_yield' function. */
3.13455 ++/* wether pthread_yield exists */
3.13456 + #undef HAVE_PTHREAD_YIELD
3.13457 +
3.13458 + /* Define to 1 if the system has the type `ptrdiff_t'. */
3.13459 + #undef HAVE_PTRDIFF_T
3.13460 +
3.13461 +-/* Define to 1 if you have the `sched_yield' function. */
3.13462 ++/* Define to 1 if you have the <readline/readline.h> header file. */
3.13463 ++#undef HAVE_READLINE_READLINE_H
3.13464 ++
3.13465 ++/* wether sched_yield exists */
3.13466 + #undef HAVE_SCHED_YIELD
3.13467 +
3.13468 + /* Define to 1 if you have the <stdint.h> header file. */
3.13469 +diff -r c6dc6a854b31 -r 7ce2b4528dee smtp/SMTP.cc
3.13470 +--- a/smtp/SMTP.cc Wed Nov 04 21:44:35 2009 -0800
3.13471 ++++ b/smtp/SMTP.cc Wed Nov 04 21:47:13 2009 -0800
3.13472 +@@ -32,7 +32,7 @@
3.13473 + oasys::BufferedOutput* out,
3.13474 + const Config& config,
3.13475 + const char* logpath)
3.13476 +- : Logger("SMTP", logpath),
3.13477 ++ : Logger("SMTP", "%s", logpath),
3.13478 + in_(in),
3.13479 + out_(out),
3.13480 + config_(config)
3.13481 +diff -r c6dc6a854b31 -r 7ce2b4528dee storage/BerkeleyDBStore.cc
3.13482 +--- a/storage/BerkeleyDBStore.cc Wed Nov 04 21:44:35 2009 -0800
3.13483 ++++ b/storage/BerkeleyDBStore.cc Wed Nov 04 21:47:13 2009 -0800
3.13484 +@@ -73,7 +73,7 @@
3.13485 +
3.13486 + if (busy)
3.13487 + {
3.13488 +- log_err(err_str.c_str());
3.13489 ++ log_err("%s", err_str.c_str());
3.13490 + }
3.13491 +
3.13492 + if (deadlock_timer_) {
3.13493 +@@ -940,8 +940,8 @@
3.13494 + {
3.13495 + ASSERT(valid_);
3.13496 +
3.13497 +- bzero(&key_, sizeof(key_));
3.13498 +- bzero(&data_, sizeof(data_));
3.13499 ++ memset(&key_, 0, sizeof(key_));
3.13500 ++ memset(&data_, 0, sizeof(data_));
3.13501 +
3.13502 + int err = cur_->c_get(cur_, key_.dbt(), data_.dbt(), DB_NEXT);
3.13503 +
3.13504 +diff -r c6dc6a854b31 -r 7ce2b4528dee storage/BerkeleyDBStore.h
3.13505 +--- a/storage/BerkeleyDBStore.h Wed Nov 04 21:44:35 2009 -0800
3.13506 ++++ b/storage/BerkeleyDBStore.h Wed Nov 04 21:47:13 2009 -0800
3.13507 +@@ -186,7 +186,7 @@
3.13508 + /// Initialize an empty key with the DB_DBT_REALLOC flag
3.13509 + DBTRef()
3.13510 + {
3.13511 +- bzero(&dbt_, sizeof(dbt_));
3.13512 ++ memset(&dbt_, 0, sizeof(dbt_));
3.13513 + dbt_.flags = DB_DBT_REALLOC;
3.13514 + }
3.13515 +
3.13516 +@@ -194,7 +194,7 @@
3.13517 + /// DB_DBT_USERMEM flag
3.13518 + DBTRef(void* data, size_t size)
3.13519 + {
3.13520 +- bzero(&dbt_, sizeof(dbt_));
3.13521 ++ memset(&dbt_, 0, sizeof(dbt_));
3.13522 + dbt_.data = data;
3.13523 + dbt_.size = size;
3.13524 + dbt_.flags = DB_DBT_USERMEM;
3.13525 +diff -r c6dc6a854b31 -r 7ce2b4528dee storage/DurableStore.cc
3.13526 +--- a/storage/DurableStore.cc Wed Nov 04 21:44:35 2009 -0800
3.13527 ++++ b/storage/DurableStore.cc Wed Nov 04 21:47:13 2009 -0800
3.13528 +@@ -18,7 +18,7 @@
3.13529 + # include <oasys-config.h>
3.13530 + #endif
3.13531 +
3.13532 +-#include <sys/errno.h>
3.13533 ++#include <cerrno>
3.13534 + #include <sys/types.h>
3.13535 + #include <sys/stat.h>
3.13536 + #include <fcntl.h>
3.13537 +diff -r c6dc6a854b31 -r 7ce2b4528dee storage/DurableStore.h
3.13538 +--- a/storage/DurableStore.h Wed Nov 04 21:44:35 2009 -0800
3.13539 ++++ b/storage/DurableStore.h Wed Nov 04 21:47:13 2009 -0800
3.13540 +@@ -101,7 +101,7 @@
3.13541 + * must be called before it can be used.
3.13542 + */
3.13543 + DurableStore(const char* logpath)
3.13544 +- : Logger("DurableStore", logpath), impl_(0)
3.13545 ++ : Logger("DurableStore", "%s", logpath), impl_(0)
3.13546 + {
3.13547 + }
3.13548 +
3.13549 +diff -r c6dc6a854b31 -r 7ce2b4528dee storage/DurableStoreImpl.h
3.13550 +--- a/storage/DurableStoreImpl.h Wed Nov 04 21:44:35 2009 -0800
3.13551 ++++ b/storage/DurableStoreImpl.h Wed Nov 04 21:47:13 2009 -0800
3.13552 +@@ -38,7 +38,7 @@
3.13553 + * Constructor (initializes the log path).
3.13554 + */
3.13555 + DurableStoreImpl(const char* classname, const char* logpath)
3.13556 +- : Logger(classname, logpath) {}
3.13557 ++ : Logger(classname, "%s", logpath) {}
3.13558 +
3.13559 + /**
3.13560 + * Destructor
3.13561 +diff -r c6dc6a854b31 -r 7ce2b4528dee storage/FileBackedObject.cc
3.13562 +--- a/storage/FileBackedObject.cc Wed Nov 04 21:44:35 2009 -0800
3.13563 ++++ b/storage/FileBackedObject.cc Wed Nov 04 21:47:13 2009 -0800
3.13564 +@@ -4,11 +4,11 @@
3.13565 +
3.13566 + #include "FileBackedObject.h"
3.13567 +
3.13568 ++#include <cerrno>
3.13569 + #include <sys/types.h>
3.13570 + #include <sys/stat.h>
3.13571 + #include <fcntl.h>
3.13572 + #include <unistd.h>
3.13573 +-#include <sys/errno.h>
3.13574 +
3.13575 + #include "../debug/DebugUtils.h"
3.13576 + #include "../io/FileIOClient.h"
3.13577 +diff -r c6dc6a854b31 -r 7ce2b4528dee storage/InternalKeyDurableTable.tcc
3.13578 +--- a/storage/InternalKeyDurableTable.tcc Wed Nov 04 21:44:35 2009 -0800
3.13579 ++++ b/storage/InternalKeyDurableTable.tcc Wed Nov 04 21:47:13 2009 -0800
3.13580 +@@ -34,7 +34,7 @@
3.13581 + const char* logpath,
3.13582 + const char* datatype,
3.13583 + const char* table_name)
3.13584 +- : Logger(classname, logpath),
3.13585 ++ : Logger(classname, "%s", logpath),
3.13586 + datatype_(datatype), table_name_(table_name)
3.13587 + {
3.13588 + }
3.13589 +diff -r c6dc6a854b31 -r 7ce2b4528dee tclcmd/LogCommand.cc
3.13590 +--- a/tclcmd/LogCommand.cc Wed Nov 04 21:44:35 2009 -0800
3.13591 ++++ b/tclcmd/LogCommand.cc Wed Nov 04 21:47:13 2009 -0800
3.13592 +@@ -87,7 +87,7 @@
3.13593 + return TCL_ERROR;
3.13594 + }
3.13595 +
3.13596 +- logf(argv[1], level, argv[3]);
3.13597 ++ logf(argv[1], level, "%s", argv[3]);
3.13598 +
3.13599 + return TCL_OK;
3.13600 + }
3.13601 +diff -r c6dc6a854b31 -r 7ce2b4528dee tclcmd/TclCommand.cc
3.13602 +--- a/tclcmd/TclCommand.cc Wed Nov 04 21:44:35 2009 -0800
3.13603 ++++ b/tclcmd/TclCommand.cc Wed Nov 04 21:47:13 2009 -0800
3.13604 +@@ -18,6 +18,7 @@
3.13605 + # include <oasys-config.h>
3.13606 + #endif
3.13607 +
3.13608 ++#include <climits>
3.13609 + #include "TclCommand.h"
3.13610 + #include "DebugCommand.h"
3.13611 + #include "GettimeofdayCommand.h"
3.13612 +@@ -47,12 +48,12 @@
3.13613 +
3.13614 + //----------------------------------------------------------------------
3.13615 + TclCommandInterp::TclCommandInterp(const char* logpath)
3.13616 +- : Logger("TclCommandInterp", logpath)
3.13617 ++ : Logger("TclCommandInterp", "%s", logpath)
3.13618 + {}
3.13619 +
3.13620 + //----------------------------------------------------------------------
3.13621 + int
3.13622 +-TclCommandInterp::do_init(char* argv0, bool no_default_cmds)
3.13623 ++TclCommandInterp::do_init(const char* argv0, bool no_default_cmds)
3.13624 + {
3.13625 + interp_ = Tcl_CreateInterp();
3.13626 + lock_ = new SpinLock();
3.13627 +@@ -139,7 +140,7 @@
3.13628 +
3.13629 + //----------------------------------------------------------------------
3.13630 + int
3.13631 +-TclCommandInterp::init(char* argv0,
3.13632 ++TclCommandInterp::init(const char* argv0,
3.13633 + const char* logpath,
3.13634 + bool no_default_cmds)
3.13635 + {
3.13636 +diff -r c6dc6a854b31 -r 7ce2b4528dee tclcmd/TclCommand.h
3.13637 +--- a/tclcmd/TclCommand.h Wed Nov 04 21:44:35 2009 -0800
3.13638 ++++ b/tclcmd/TclCommand.h Wed Nov 04 21:47:13 2009 -0800
3.13639 +@@ -66,7 +66,7 @@
3.13640 + /**
3.13641 + * Initialize the interpreter instance.
3.13642 + */
3.13643 +- static int init(char* objv0,
3.13644 ++ static int init(const char* objv0,
3.13645 + const char* logpath = "/command",
3.13646 + bool no_default_cmds = false);
3.13647 +
3.13648 +@@ -229,7 +229,7 @@
3.13649 + /**
3.13650 + * Do all of the actual initialization.
3.13651 + */
3.13652 +- int do_init(char* objv0, bool no_default_cmds);
3.13653 ++ int do_init(const char* objv0, bool no_default_cmds);
3.13654 +
3.13655 + /**
3.13656 + * Destructor to clean up and finalize.
3.13657 +diff -r c6dc6a854b31 -r 7ce2b4528dee test/durable-store-test.cc
3.13658 +--- a/test/durable-store-test.cc Wed Nov 04 21:44:35 2009 -0800
3.13659 ++++ b/test/durable-store-test.cc Wed Nov 04 21:47:13 2009 -0800
3.13660 +@@ -31,6 +31,7 @@
3.13661 + #include "util/StringBuffer.h"
3.13662 + #include "util/Random.h"
3.13663 + #include "storage/StorageConfig.h"
3.13664 ++#include "storage/DurableStore.h"
3.13665 + #include "serialize/TypeShims.h"
3.13666 +
3.13667 + using namespace oasys;
3.13668 +diff -r c6dc6a854b31 -r 7ce2b4528dee test/spin-lock-test.cc
3.13669 +--- a/test/spin-lock-test.cc Wed Nov 04 21:44:35 2009 -0800
3.13670 ++++ b/test/spin-lock-test.cc Wed Nov 04 21:47:13 2009 -0800
3.13671 +@@ -30,7 +30,7 @@
3.13672 +
3.13673 + using namespace oasys;
3.13674 +
3.13675 +-SpinLock lock;
3.13676 ++SpinLock slock;
3.13677 + SpinLock lock2;
3.13678 + volatile int nspins = 0;
3.13679 + volatile int total = 0;
3.13680 +@@ -123,15 +123,15 @@
3.13681 + }
3.13682 +
3.13683 + DECLARE_TEST(SharedLockQuick) {
3.13684 +- return test("shared", &lock, &lock, 100);
3.13685 ++ return test("shared", &slock, &slock, 100);
3.13686 + }
3.13687 +
3.13688 + DECLARE_TEST(SharedLock) {
3.13689 +- return test("shared", &lock, &lock, 10000000);
3.13690 ++ return test("shared", &slock, &slock, 10000000);
3.13691 + }
3.13692 +
3.13693 + DECLARE_TEST(SeparateLock) {
3.13694 +- return test("shared", &lock, &lock2, 10000000);
3.13695 ++ return test("shared", &slock, &lock2, 10000000);
3.13696 + }
3.13697 +
3.13698 + DECLARE_TEST(NoLock) {
3.13699 +diff -r c6dc6a854b31 -r 7ce2b4528dee thread/Atomic-mutex.h
3.13700 +--- a/thread/Atomic-mutex.h Wed Nov 04 21:44:35 2009 -0800
3.13701 ++++ b/thread/Atomic-mutex.h Wed Nov 04 21:47:13 2009 -0800
3.13702 +@@ -27,6 +27,7 @@
3.13703 + * performance.
3.13704 + */
3.13705 +
3.13706 ++#include "../compat/inttypes.h"
3.13707 + #include "../debug/DebugUtils.h"
3.13708 + #include "../util/Singleton.h"
3.13709 +
3.13710 +diff -r c6dc6a854b31 -r 7ce2b4528dee thread/Notifier.cc
3.13711 +--- a/thread/Notifier.cc Wed Nov 04 21:44:35 2009 -0800
3.13712 ++++ b/thread/Notifier.cc Wed Nov 04 21:47:13 2009 -0800
3.13713 +@@ -28,7 +28,7 @@
3.13714 + namespace oasys {
3.13715 +
3.13716 + Notifier::Notifier(const char* logpath, bool quiet)
3.13717 +- : Logger("Notifier", logpath),
3.13718 ++ : Logger("Notifier", "%s", logpath),
3.13719 + count_(0),
3.13720 + quiet_(quiet),
3.13721 + busy_notifiers_(0)
3.13722 +diff -r c6dc6a854b31 -r 7ce2b4528dee thread/OnOffNotifier.cc
3.13723 +--- a/thread/OnOffNotifier.cc Wed Nov 04 21:44:35 2009 -0800
3.13724 ++++ b/thread/OnOffNotifier.cc Wed Nov 04 21:47:13 2009 -0800
3.13725 +@@ -32,7 +32,7 @@
3.13726 +
3.13727 + //----------------------------------------------------------------------------
3.13728 + OnOffNotifier::OnOffNotifier(const char* logpath, bool quiet)
3.13729 +- : Logger("OnOffNotifier", (logpath == 0) ? "" : logpath),
3.13730 ++ : Logger("OnOffNotifier", "%s", (logpath == 0) ? "" : logpath),
3.13731 + waiter_(false),
3.13732 + quiet_(quiet),
3.13733 + active_(false)
3.13734 +diff -r c6dc6a854b31 -r 7ce2b4528dee thread/Thread.cc
3.13735 +--- a/thread/Thread.cc Wed Nov 04 21:44:35 2009 -0800
3.13736 ++++ b/thread/Thread.cc Wed Nov 04 21:47:13 2009 -0800
3.13737 +@@ -135,7 +135,9 @@
3.13738 + sigemptyset(&Thread::interrupt_sigset_);
3.13739 + sigaddset(&Thread::interrupt_sigset_, Thread::INTERRUPT_SIG);
3.13740 + signal(Thread::INTERRUPT_SIG, Thread::interrupt_signal);
3.13741 ++# if !defined(__QNXNTO__) // QNX v6.x declares but does not define siginterrupt.
3.13742 + siginterrupt(Thread::INTERRUPT_SIG, 1);
3.13743 ++# endif
3.13744 + #endif
3.13745 +
3.13746 + #ifdef OASYS_DEBUG_LOCKING_ENABLED
3.13747 +diff -r c6dc6a854b31 -r 7ce2b4528dee thread/Timer.cc
3.13748 +--- a/thread/Timer.cc Wed Nov 04 21:44:35 2009 -0800
3.13749 ++++ b/thread/Timer.cc Wed Nov 04 21:47:13 2009 -0800
3.13750 +@@ -18,10 +18,11 @@
3.13751 + # include <oasys-config.h>
3.13752 + #endif
3.13753 +
3.13754 +-#include <stdio.h>
3.13755 +-#include <stdlib.h>
3.13756 ++#include <cstdio>
3.13757 ++#include <cstdlib>
3.13758 ++#include <cerrno>
3.13759 ++#include <climits>
3.13760 + #include <unistd.h>
3.13761 +-#include <errno.h>
3.13762 + #include <sys/time.h>
3.13763 + #include <sys/poll.h>
3.13764 +
3.13765 +diff -r c6dc6a854b31 -r 7ce2b4528dee tools/md5chunks.cc
3.13766 +--- a/tools/md5chunks.cc Wed Nov 04 21:44:35 2009 -0800
3.13767 ++++ b/tools/md5chunks.cc Wed Nov 04 21:47:13 2009 -0800
3.13768 +@@ -2,7 +2,7 @@
3.13769 + # include <oasys-config.h>
3.13770 + #endif
3.13771 +
3.13772 +-#include <sys/errno.h>
3.13773 ++#include <cerrno>
3.13774 +
3.13775 + #include "../debug/Log.h"
3.13776 + #include "../io/FileUtils.h"
3.13777 +diff -r c6dc6a854b31 -r 7ce2b4528dee tools/randfile.cc
3.13778 +--- a/tools/randfile.cc Wed Nov 04 21:44:35 2009 -0800
3.13779 ++++ b/tools/randfile.cc Wed Nov 04 21:47:13 2009 -0800
3.13780 +@@ -2,8 +2,8 @@
3.13781 + # include <oasys-config.h>
3.13782 + #endif
3.13783 +
3.13784 ++#include <cerrno>
3.13785 + #include <fcntl.h>
3.13786 +-#include <sys/errno.h>
3.13787 +
3.13788 + #include "../debug/Log.h"
3.13789 + #include "../io/FileUtils.h"
3.13790 +diff -r c6dc6a854b31 -r 7ce2b4528dee tools/zsize.cc
3.13791 +--- a/tools/zsize.cc Wed Nov 04 21:44:35 2009 -0800
3.13792 ++++ b/tools/zsize.cc Wed Nov 04 21:47:13 2009 -0800
3.13793 +@@ -4,7 +4,7 @@
3.13794 +
3.13795 + #if OASYS_ZLIB_ENABLED
3.13796 +
3.13797 +-#include <sys/errno.h>
3.13798 ++#include <cerrno>
3.13799 + #include <zlib.h>
3.13800 +
3.13801 + #include "../debug/Log.h"
3.13802 +@@ -13,6 +13,9 @@
3.13803 + #include "../util/Getopt.h"
3.13804 + #include "../util/MD5.h"
3.13805 +
3.13806 ++#if !defined(MAP_FILE)
3.13807 ++# define MAP_FILE 0
3.13808 ++#endif
3.13809 +
3.13810 + using namespace oasys;
3.13811 +
3.13812 +diff -r c6dc6a854b31 -r 7ce2b4528dee util/App.cc
3.13813 +--- a/util/App.cc Wed Nov 04 21:44:35 2009 -0800
3.13814 ++++ b/util/App.cc Wed Nov 04 21:47:13 2009 -0800
3.13815 +@@ -27,7 +27,7 @@
3.13816 + App::App(const char* classname,
3.13817 + const char* name,
3.13818 + const char* version)
3.13819 +- : Logger(classname, name),
3.13820 ++ : Logger(classname, "%s", name),
3.13821 + name_(name),
3.13822 + version_(version),
3.13823 + extra_usage_(""),
3.13824 +diff -r c6dc6a854b31 -r 7ce2b4528dee util/Cache.h
3.13825 +--- a/util/Cache.h Wed Nov 04 21:44:35 2009 -0800
3.13826 ++++ b/util/Cache.h Wed Nov 04 21:47:13 2009 -0800
3.13827 +@@ -18,8 +18,23 @@
3.13828 + #define __CACHE_H__
3.13829 +
3.13830 + #include <map>
3.13831 ++
3.13832 ++/* Note that these classes are now deprecated, we'll need to rewrite */
3.13833 ++/* the code at some point to use the new standard classes. In the */
3.13834 ++/* meantime, quiet the warnings. */
3.13835 ++/* undefine __DEPRECATED and remember it was set*/
3.13836 ++#ifdef __DEPRECATED
3.13837 ++# define __DEPRECATED_save
3.13838 ++# undef __DEPRECATED
3.13839 ++#endif
3.13840 ++
3.13841 + #include <ext/hash_map>
3.13842 +
3.13843 ++/* re-define __DEPRECATED if it was set */
3.13844 ++#ifdef __DEPRECATED_save
3.13845 ++# define __DEPRECATED
3.13846 ++#endif
3.13847 ++
3.13848 + #include "../debug/InlineFormatter.h"
3.13849 + #include "../debug/Logger.h"
3.13850 + #include "../thread/Atomic.h"
3.13851 +diff -r c6dc6a854b31 -r 7ce2b4528dee util/Daemonizer.cc
3.13852 +--- a/util/Daemonizer.cc Wed Nov 04 21:44:35 2009 -0800
3.13853 ++++ b/util/Daemonizer.cc Wed Nov 04 21:47:13 2009 -0800
3.13854 +@@ -18,11 +18,11 @@
3.13855 + # include <oasys-config.h>
3.13856 + #endif
3.13857 +
3.13858 +-#include <stdio.h>
3.13859 +-#include <stdlib.h>
3.13860 +-#include <string.h>
3.13861 ++#include <cerrno>
3.13862 ++#include <cstdio>
3.13863 ++#include <cstdlib>
3.13864 ++#include <cstring>
3.13865 + #include <unistd.h>
3.13866 +-#include <sys/errno.h>
3.13867 +
3.13868 + #include "Daemonizer.h"
3.13869 +
3.13870 +diff -r c6dc6a854b31 -r 7ce2b4528dee util/Getopt.cc
3.13871 +--- a/util/Getopt.cc Wed Nov 04 21:44:35 2009 -0800
3.13872 ++++ b/util/Getopt.cc Wed Nov 04 21:47:13 2009 -0800
3.13873 +@@ -18,7 +18,9 @@
3.13874 + # include <oasys-config.h>
3.13875 + #endif
3.13876 +
3.13877 +-#include <stdio.h>
3.13878 ++#include <cstdlib>
3.13879 ++#include <cstdio>
3.13880 ++#include <cstring>
3.13881 + #include <unistd.h>
3.13882 +
3.13883 + #ifdef HAVE_GETOPT_LONG
3.13884 +@@ -92,7 +94,7 @@
3.13885 + }
3.13886 +
3.13887 + if (opt->longopt_) {
3.13888 +- long_opts[i].name = opt->longopt_;
3.13889 ++ long_opts[i].name = const_cast<char*>(opt->longopt_);
3.13890 + long_opts[i].has_arg = opt->needval_;
3.13891 + } else {
3.13892 + // ignore this slot
3.13893 +diff -r c6dc6a854b31 -r 7ce2b4528dee util/InitSequencer.cc
3.13894 +--- a/util/InitSequencer.cc Wed Nov 04 21:44:35 2009 -0800
3.13895 ++++ b/util/InitSequencer.cc Wed Nov 04 21:47:13 2009 -0800
3.13896 +@@ -18,6 +18,7 @@
3.13897 + # include <oasys-config.h>
3.13898 + #endif
3.13899 +
3.13900 ++#include <algorithm>
3.13901 + #include <cstdarg>
3.13902 +
3.13903 + #include "InitSequencer.h"
3.13904 +diff -r c6dc6a854b31 -r 7ce2b4528dee util/OptParser.cc
3.13905 +--- a/util/OptParser.cc Wed Nov 04 21:44:35 2009 -0800
3.13906 ++++ b/util/OptParser.cc Wed Nov 04 21:47:13 2009 -0800
3.13907 +@@ -18,6 +18,8 @@
3.13908 + # include <oasys-config.h>
3.13909 + #endif
3.13910 +
3.13911 ++#include <cstring>
3.13912 ++
3.13913 + #include "OptParser.h"
3.13914 +
3.13915 + namespace oasys {
3.13916 +diff -r c6dc6a854b31 -r 7ce2b4528dee util/Options.h
3.13917 +--- a/util/Options.h Wed Nov 04 21:44:35 2009 -0800
3.13918 ++++ b/util/Options.h Wed Nov 04 21:47:13 2009 -0800
3.13919 +@@ -24,6 +24,7 @@
3.13920 + #include <string>
3.13921 + #include <vector>
3.13922 + #include "../compat/inet_aton.h"
3.13923 ++#include "../compat/inttypes.h"
3.13924 +
3.13925 + #ifdef OASYS_BLUETOOTH_ENABLED
3.13926 + #include <bluetooth/bluetooth.h>
3.13927 +diff -r c6dc6a854b31 -r 7ce2b4528dee util/RefCountedObject.cc
3.13928 +--- a/util/RefCountedObject.cc Wed Nov 04 21:44:35 2009 -0800
3.13929 ++++ b/util/RefCountedObject.cc Wed Nov 04 21:47:13 2009 -0800
3.13930 +@@ -25,7 +25,7 @@
3.13931 + //----------------------------------------------------------------------
3.13932 + RefCountedObject::RefCountedObject(const char* logpath)
3.13933 + : refcount_(0),
3.13934 +- logger_("RefCountedObject", logpath)
3.13935 ++ logger_("RefCountedObject", "%s", logpath)
3.13936 + {
3.13937 + }
3.13938 +
3.13939 +diff -r c6dc6a854b31 -r 7ce2b4528dee util/SafeRange.h
3.13940 +--- a/util/SafeRange.h Wed Nov 04 21:44:35 2009 -0800
3.13941 ++++ b/util/SafeRange.h Wed Nov 04 21:47:13 2009 -0800
3.13942 +@@ -17,6 +17,8 @@
3.13943 + #ifndef __SAFERANGE_H__
3.13944 + #define __SAFERANGE_H__
3.13945 +
3.13946 ++#include <cstddef>
3.13947 ++
3.13948 + namespace oasys {
3.13949 +
3.13950 + /*!
3.13951 +diff -r c6dc6a854b31 -r 7ce2b4528dee util/StringBuffer.h
3.13952 +--- a/util/StringBuffer.h Wed Nov 04 21:44:35 2009 -0800
3.13953 ++++ b/util/StringBuffer.h Wed Nov 04 21:47:13 2009 -0800
3.13954 +@@ -18,6 +18,7 @@
3.13955 + #ifndef _OASYS_STRING_BUFFER_H_
3.13956 + #define _OASYS_STRING_BUFFER_H_
3.13957 +
3.13958 ++#include "../compat/inttypes.h"
3.13959 + #include <algorithm>
3.13960 +
3.13961 + #include "../debug/Log.h" // for PRINTFLIKE macro
3.13962 +diff -r c6dc6a854b31 -r 7ce2b4528dee util/StringUtils.h
3.13963 +--- a/util/StringUtils.h Wed Nov 04 21:44:35 2009 -0800
3.13964 ++++ b/util/StringUtils.h Wed Nov 04 21:47:13 2009 -0800
3.13965 +@@ -22,8 +22,9 @@
3.13966 + * Utilities and stl typedefs for basic_string.
3.13967 + */
3.13968 +
3.13969 +-#include <ctype.h>
3.13970 +-#include <string>
3.13971 ++#include <cctype>
3.13972 ++#include <cstring>
3.13973 ++#include <climits>
3.13974 + #include <vector>
3.13975 + #include <set>
3.13976 + #include <map>
3.13977 +@@ -36,8 +37,24 @@
3.13978 + #include <hash_map>
3.13979 + #define _std std
3.13980 + #else
3.13981 ++/* Note that these classes are now deprecated, we'll need to rewrite */
3.13982 ++/* the code at some point to use the new standard classes. In the */
3.13983 ++/* meantime, quiet the warnings. */
3.13984 ++
3.13985 ++/* undefine __DEPRECATED and remember it was set*/
3.13986 ++#ifdef __DEPRECATED
3.13987 ++# define __DEPRECATED_save
3.13988 ++# undef __DEPRECATED
3.13989 ++#endif
3.13990 ++
3.13991 + #include <ext/hash_set>
3.13992 + #include <ext/hash_map>
3.13993 ++
3.13994 ++/* re-define __DEPRECATED if it was set */
3.13995 ++#ifdef __DEPRECATED_save
3.13996 ++# define __DEPRECATED
3.13997 ++#endif
3.13998 ++
3.13999 + #define _std __gnu_cxx
3.14000 + #endif
3.14001 +
3.14002 +diff -r c6dc6a854b31 -r 7ce2b4528dee util/TokenBucket.cc
3.14003 +--- a/util/TokenBucket.cc Wed Nov 04 21:44:35 2009 -0800
3.14004 ++++ b/util/TokenBucket.cc Wed Nov 04 21:47:13 2009 -0800
3.14005 +@@ -26,7 +26,7 @@
3.14006 + TokenBucket::TokenBucket(const char* logpath,
3.14007 + u_int64_t depth, /* in bits */
3.14008 + u_int64_t rate /* in seconds */)
3.14009 +- : Logger("TokenBucket", logpath),
3.14010 ++ : Logger("TokenBucket", "%s", logpath),
3.14011 + depth_(depth),
3.14012 + rate_(rate),
3.14013 + tokens_(depth) // initialize full
3.14014 +diff -r c6dc6a854b31 -r 7ce2b4528dee util/URI.h
3.14015 +--- a/util/URI.h Wed Nov 04 21:44:35 2009 -0800
3.14016 ++++ b/util/URI.h Wed Nov 04 21:47:13 2009 -0800
3.14017 +@@ -23,7 +23,7 @@
3.14018 +
3.14019 + namespace oasys {
3.14020 +
3.14021 +-typedef enum uri_parse_err_t {
3.14022 ++enum uri_parse_err_t {
3.14023 + URI_PARSE_OK, /* valid URI */
3.14024 + URI_PARSE_NO_URI, /* no URI in object */
3.14025 + URI_PARSE_NO_SEP, /* missing seperator char ':' */
4.1 --- a/net/dtn/Makefile Wed Oct 28 12:17:25 2009 -0700
4.2 +++ b/net/dtn/Makefile Fri Nov 06 16:13:56 2009 -0800
4.3 @@ -24,25 +24,23 @@
4.4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
4.5 PKG_SOURCE_URL:=http://downloads.sourceforge.net/project/dtn/DTN2/dtn-$(PKG_VERSION)/dtn-$(PKG_VERSION).tgz?use_mirror=softlayer
4.6 PKG_MD5SUM:=afeb65e1bfaa7ee88023a6663f01339a
4.7 -#PKG_BUILD_DEPENDS:=liboasys-dev
4.8 -
4.9 +PKG_BUILD_DEPENDS:=libncurses uclibcxx libpthread libstdcpp
4.10 PKG_FIXUP:=libtool
4.11
4.12 include $(INCLUDE_DIR)/package.mk
4.13 include $(INCLUDE_DIR)/kernel.mk
4.14 -# Sart make install at build time
4.15 -PKG_INSTALL:=1
4.16
4.17 -define Package/dtn
4.18 +define Package/dtn/Default
4.19 SECTION:=net
4.20 CATEGORY:=Network
4.21 TITLE:=The DTNRG DTN reference code
4.22 + DEPENDS:= +uclibcxx
4.23 URL:=http://dtn.hg.sourceforge.net/hgweb/dtn/DTN2/
4.24 MAINTAINER:=alex.mcmahon@cs.tcd.ie
4.25 - DEPENDS:=+liboasys-dev +libopenssl +libcryptoxx
4.26 + SUBMENU:= DTN2
4.27 endef
4.28
4.29 -define Package/dtn/description
4.30 +define Package/dtn/Default/description
4.31 Delay Tolerant Networking reference implementation
4.32 .
4.33 This package contains the reference implementation of the Delay
4.34 @@ -53,32 +51,92 @@
4.35 Homepage: http://www.dtnrg.org
4.36 endef
4.37
4.38 -define Build/Configure
4.39 -#( cd $(PKG_BUILD_DIR); aclocal; );
4.40 -# ( cd $(PKG_BUILD_DIR););
4.41 - $(call Build/Configure/Default, \
4.42 +define Package/dtn-daemon
4.43 +$(call Package/dtn/Default)
4.44 + TITLE+= DTN2 daemon
4.45 + DEPENDS+= +liboasys-dev +libstdcpp +libpthread +uclibcxx
4.46 +endef
4.47 +
4.48 +define Package/dtn-daemon/description
4.49 +$(call Package/dtn/Default/description)
4.50 + This package contains the dtn daemon.
4.51 +endef
4.52 +
4.53 +define Package/dtn-apps
4.54 +$(call Package/dtn/Default)
4.55 + DEPENDS+= +dtn-daemon
4.56 + TITLE+= DTN2 applications
4.57 +endef
4.58 +
4.59 +define Package/dtn-apps/description
4.60 +$(call Package/dtn/Default/description)
4.61 + This package contains the dtn daemon & appilcations.
4.62 +endef
4.63 +
4.64 +define Package/dtn-test-utils
4.65 +$(call Package/dtn/Default)
4.66 + DEPENDS+= +dtn-daemon +dtn-apps
4.67 + TITLE+= DTN2 test utilities
4.68 +endef
4.69 +
4.70 +define Package/dtn-test-utils/description
4.71 +$(call Package/dtn/Default/description)
4.72 + This package contains the dtn daemon, appilcations & test utilites.
4.73 +endef
4.74 +
4.75 +
4.76 +
4.77 +CONFIGURE_ARGS += \
4.78 --with-oasys="$(STAGING_DIR)/usr" \
4.79 --with-openssl="$(STAGING_DIR)/usr" \
4.80 --disable-ecl \
4.81 --disable-edp \
4.82 - )
4.83 +
4.84 +CONFIGURE_VARS += \
4.85 + CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti -nostdinc++" \
4.86 + CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/uClibc++ -I$(LINUX_DIR)/include" \
4.87 + LDFLAGS="$$$$LDFLAGS" \
4.88 + OASYS_INCDIR="$(STAGING_DIR)/usr/include/oasys" \
4.89 + OASYS_LIBDIR="$(STAGING_DIR)/usr/lib" \
4.90 + OASYS_ETCDIR="$(STAGING_DIR)/usr/share/oasys" \
4.91 +
4.92 +# LIBS="-nodefaultlibs -luClibc++ -lm -lgcc" \
4.93 +# CLIENTCLIBS="-nodefaultlibs -luClibc++ -lm -lgcc" \
4.94 +
4.95 +define Build/Compile
4.96 + $(MAKE) -C $(PKG_BUILD_DIR) \
4.97 + LD="$(TARGET_CXX)" \
4.98 + DESTDIR="$(PKG_BUILD_DIR)" \
4.99 + all
4.100 endef
4.101
4.102 -define Build/Compile
4.103 - $(MAKE) -C $(PKG_BUILD_DIR) \
4.104 - DESTDIR="$(PKG_INSTALL_DIR)" \
4.105 -# all install
4.106 +define Package/dtn-daemon/install
4.107 + $(INSTALL_DIR) $(1)/etc
4.108 + $(INSTALL_CONF) $(PKG_BUILD_DIR)/daemon/dtn.conf $(1)/etc/
4.109 + $(INSTALL_DIR) $(1)/usr/bin/
4.110 + $(INSTALL_BIN) $(PKG_BUILD_DIR)/daemon/dtnd $(1)/usr/bin/
4.111 endef
4.112
4.113 -#define Host/Install
4.114 -# $(MAKE) -C "$(HOST_BUILD_DIR)" install
4.115 -#endef
4.116 +define Package/dtn-apps/install
4.117 + $(INSTALL_DIR) $(1)/usr/bin/
4.118 + $(INSTALL_BIN) $(PKG_BUILD_DIR)/apps/dtncat/dtncat $(1)/usr/bin/
4.119 + $(INSTALL_BIN) $(PKG_BUILD_DIR)/apps/dtncp/dtncp $(1)/usr/bin/
4.120 + $(INSTALL_BIN) $(PKG_BUILD_DIR)/apps/dtncpd/dtncpd $(1)/usr/bin/
4.121 + $(INSTALL_BIN) $(PKG_BUILD_DIR)/apps/dtnhttpproxy/dtnhttpproxy $(1)/usr/bin/
4.122 + $(INSTALL_BIN) $(PKG_BUILD_DIR)/apps/dtnmoteproxy/dtnmoteproxy $(1)/usr/bin/
4.123 + $(INSTALL_BIN) $(PKG_BUILD_DIR)/apps/dtnperf/dtnperf-client $(1)/usr/bin/
4.124 + $(INSTALL_BIN) $(PKG_BUILD_DIR)/apps/dtnperf/dtnperf-server $(1)/usr/bin/
4.125 + $(INSTALL_BIN) $(PKG_BUILD_DIR)/apps/dtnping/dtnping $(1)/usr/bin/
4.126 + $(INSTALL_BIN) $(PKG_BUILD_DIR)/apps/dtnrecv/dtnrecv $(1)/usr/bin/
4.127 + $(INSTALL_BIN) $(PKG_BUILD_DIR)/apps/dtnsend/dtnsend $(1)/usr/bin/
4.128 + $(INSTALL_BIN) $(PKG_BUILD_DIR)/apps/dtntest/dtntest $(1)/usr/bin/
4.129 + $(INSTALL_BIN) $(PKG_BUILD_DIR)/apps/dtntunnel/dtntunnel $(1)/usr/bin/
4.130 + $(INSTALL_BIN) $(PKG_BUILD_DIR)/apps/tca_admin/tca_admin $(1)/usr/bin/
4.131 + $(INSTALL_BIN) $(PKG_BUILD_DIR)/apps/num2sdnv/num2sdnv $(1)/usr/bin/
4.132 + $(INSTALL_BIN) $(PKG_BUILD_DIR)/apps/num2sdnv/sdnv2num $(1)/usr/bin/
4.133 +endef
4.134
4.135 -define Package/dtn/install
4.136 - $(INSTALL_DIR) $(1)/etc
4.137 - $(CP) $(PKG_INSTALL_DIR)/etc/* $(1)/etc/
4.138 - $(INSTALL_DIR) $(1)/usr/bin/
4.139 - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
4.140 +define Package/dtn-test-utils/install
4.141 $(INSTALL_DIR) $(1)/usr/share/dtn
4.142 $(CP) $(PKG_BUILD_DIR)/test $(1)/usr/share/dtn/
4.143 $(CP) $(PKG_BUILD_DIR)/test-utils/ $(1)/usr/share/dtn/
4.144 @@ -86,10 +144,6 @@
4.145 $(CP) $(PKG_BUILD_DIR)/sim/ $(1)/usr/share/dtn/
4.146 endef
4.147
4.148 -define Package/dtn/conffiles
4.149 -/etc/dtn.conf
4.150 -endef
4.151 -
4.152 define Package/dtn/postinst
4.153 #!/bin/sh
4.154
4.155 @@ -98,16 +152,6 @@
4.156 home=/var/run/dtn
4.157 shell=/bin/false
4.158
4.159 -# do not change below
4.160 -echo -n "removing dtn executables: "
4.161 -
4.162 -apps="dtnsend dtnrecv dtnping dtncp dtncpd"
4.163 -for f in dtnd $apps ; do
4.164 - echo -n "$f... "
4.165 - ln -s /usr/bin/$f /usr/bin/dtn/$f
4.166 -done
4.167 -echo ""
4.168 -
4.169 # check if we are on real system
4.170 if [ -z "$${IPKG_INSTROOT}" ]; then
4.171 # create copies of passwd and group, if we use squashfs
4.172 @@ -136,7 +180,7 @@
4.173 endef
4.174
4.175
4.176 -$(eval $(call HostBuild))
4.177 -$(eval $(call BuildPackage,dtn))
4.178 -
4.179 -
4.180 +#$(eval $(call HostBuild))
4.181 +$(eval $(call BuildPackage,dtn-daemon))
4.182 +$(eval $(call BuildPackage,dtn-apps))
4.183 +$(eval $(call BuildPackage,dtn-test-utils))