From 6de89c9ab78a557f98dc02dca97795d27a4112d2 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Sat, 10 Jun 2000 18:02:12 +0000 Subject: [PATCH] Moved the intricacies of the perl interface build into its own makefile that now functions as a wrapper around the MakeMaker stuff. It might even behave sensically when we have separate build dirs. Same for plperl, which of course still doesn't work very well. Made sure that plperl respects the choice of --libdir. Added --with-python to automatically build and install the Python interface. Works similarly to the Perl5 stuff. Moved the burden of the distclean targets lower down into the source tree. Eventually, each make file should have its own. Added automatic remaking of makefiles and configure. Currently only for the top-level because of a bug(?) in Autoconf. Use GNU `missing' to work around missing autoconf and aclocal. Start factoring out macros into their own config/*.m4 files to increase readability and organization. --- GNUmakefile.in | 20 +- Makefile | 48 +- aclocal.m4 | 79 ++ config/missing | 265 +++++++ config/python.m4 | 50 ++ configure | 1077 ++++++++++++++------------ configure.in | 57 +- src/GNUmakefile.in | 60 +- src/Makefile | 16 - src/Makefile.global.in | 15 +- src/bin/psql/Makefile.in | 3 +- src/interfaces/Makefile | 65 -- src/interfaces/Makefile.in | 65 ++ src/interfaces/perl5/GNUmakefile.in | 71 ++ src/interfaces/perl5/Makefile.PL | 16 +- src/interfaces/python/GNUmakefile.in | 74 ++ src/interfaces/python/Setup.in.raw | 3 + src/interfaces/python/pgmodule.c | 2 +- src/pl/Makefile | 30 - src/pl/Makefile.in | 42 + src/pl/plperl/GNUmakefile.in | 40 + src/pl/plperl/Makefile.PL | 24 +- 22 files changed, 1408 insertions(+), 714 deletions(-) create mode 100644 aclocal.m4 create mode 100755 config/missing create mode 100644 config/python.m4 delete mode 100644 src/Makefile delete mode 100644 src/interfaces/Makefile create mode 100644 src/interfaces/Makefile.in create mode 100644 src/interfaces/perl5/GNUmakefile.in create mode 100644 src/interfaces/python/GNUmakefile.in create mode 100644 src/interfaces/python/Setup.in.raw delete mode 100644 src/pl/Makefile create mode 100644 src/pl/Makefile.in create mode 100644 src/pl/plperl/GNUmakefile.in diff --git a/GNUmakefile.in b/GNUmakefile.in index 3f5929d7e4..f3e33fb278 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -1,7 +1,7 @@ # # PostgreSQL top level makefile # -# $Header: /cvsroot/pgsql/GNUmakefile.in,v 1.2 2000/06/07 23:09:18 petere Exp $ +# $Header: /cvsroot/pgsql/GNUmakefile.in,v 1.3 2000/06/10 18:01:34 petere Exp $ # srcdir = @srcdir@ @@ -23,8 +23,24 @@ clean: $(MAKE) -C src clean distclean: - $(MAKE) -C src distclean + -$(MAKE) -C src distclean -rm -f config.cache config.log config.status GNUmakefile .PHONY: all install clean distclean + + +AUTOCONF = @AUTOCONF@ +ACLOCAL = @ACLOCAL@ + +GNUmakefile: GNUmakefile.in $(top_builddir)/config.status + CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status + +$(top_builddir)/config.status: $(top_srcdir)/configure + cd $(top_builddir) && ./config.status --recheck + +$(top_srcdir)/configure: $(top_srcdir)/configure.in $(top_srcdir)/aclocal.m4 + cd $(top_srcdir) && $(AUTOCONF) + +$(top_srcdir)/aclocal.m4: $(wildcard $(top_srcdir)/config/*.m4) + cd $(top_srcdir) && $(ACLOCAL) -I config diff --git a/Makefile b/Makefile index 8fbbcbdac2..3091774d74 100644 --- a/Makefile +++ b/Makefile @@ -1,16 +1,36 @@ -# The Postgres make files exploit features of GNU make that other makes -# do not have. Because it is a common mistake for users to try to build -# Postgres with a different make, we have this make file that does nothing -# but tell the user to use GNU make. +# The PostgreSQL make files exploit features of GNU make that other +# makes do not have. Because it is a common mistake for users to try +# to build Postgres with a different make, we have this make file +# that, as a service, will look for a GNU make and invoke it, or show +# an error message if none could be found. -# If the user were using GNU make now, this file would not get used because -# GNU make uses a make file named "GNUmakefile" in preference to "Makefile" -# if it exists. Postgres is shipped with a "GNUmakefile". +# If the user were using GNU make now, this file would not get used +# because GNU make uses a make file named "GNUmakefile" in preference +# to "Makefile" if it exists. PostgreSQL is shipped with a +# "GNUmakefile". If the user hasn't run the configure script yet, the +# GNUmakefile won't exist yet, so we catch that case as well. -all install clean dep depend distclean: - @echo "You must use GNU make to use Postgres. It may be installed" - @echo "on your system with the name 'gmake'." - @echo - @echo "NOTE: If you are sure that you are using GNU make and you are" - @echo " still getting this message, you may simply need to run" - @echo " the configure program." + +all install clean dep depend distclean maintainer-clean: + @if ! [ -f GNUmakefile ] ; then \ + echo "You need to run the \`configure' program fist. See the file"; \ + echo "\`INSTALL' for installation instructions." ; \ + false ; \ + fi + @IFS=':' ; \ + for dir in $$PATH; do \ + for prog in gmake gnumake make; do \ + if [ -f $$dir/$$prog ] && ( $$dir/$$prog --version | grep GNU >/dev/null 2>&1 ) ; then \ + GMAKE=$$dir/$$prog; \ + break 2; \ + fi; \ + done; \ + done; \ + \ + if [ x"$${GMAKE+set}" = xset ]; then \ + echo "Using GNU make found at $${GMAKE}"; \ + $${GMAKE} ; \ + else \ + echo "You must use GNU make to build PostgreSQL." ; \ + false; \ + fi diff --git a/aclocal.m4 b/aclocal.m4 new file mode 100644 index 0000000000..173b933e01 --- /dev/null +++ b/aclocal.m4 @@ -0,0 +1,79 @@ +dnl aclocal.m4 generated automatically by aclocal 1.4 + +dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +dnl This program is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without +dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A +dnl PARTICULAR PURPOSE. + +# +# Autoconf macros for configuring the build of Python extension modules +# +# $Header: /cvsroot/pgsql/aclocal.m4,v 1.1 2000/06/10 18:01:34 petere Exp $ +# + +# PGAC_PROG_PYTHON +# ---------------- +# Look for Python and set the output variable `PYTHON' +# to `python' if found, empty otherwise. +AC_DEFUN([PGAC_PROG_PYTHON], +[AC_CHECK_PROG(PYTHON, python, python)]) + + +# PGAC_PATH_PYTHONDIR +# ------------------- +# Finds the names of various install dirs and helper files +# necessary to build a Python extension module. +# +# It would be nice if we could check whether the current setup allows +# the build of the shared module. Future project. +AC_DEFUN([PGAC_PATH_PYTHONDIR], +[AC_REQUIRE([PGAC_PROG_PYTHON]) +[if test "${PYTHON+set}" = set ; then + python_version=`${PYTHON} -c "import sys; print sys.version[:3]"` + python_prefix=`${PYTHON} -c "import sys; print sys.prefix"` + python_execprefix=`${PYTHON} -c "import sys; print sys.exec_prefix"` + python_configdir="${python_execprefix}/lib/python${python_version}/config" + python_moduledir="${python_prefix}/lib/python${python_version}" + python_extmakefile="${python_configdir}/Makefile.pre.in"] + + AC_MSG_CHECKING(for Python extension makefile) + if test -f "${python_extmakefile}" ; then + AC_MSG_RESULT(found) + else + AC_MSG_RESULT(no) + AC_MSG_ERROR( +[The Python extension makefile was expected at \`${python_extmakefile}\' +but does not exist. This means the Python module cannot be built automatically.]) + fi + + AC_SUBST(python_version) + AC_SUBST(python_prefix) + AC_SUBST(python_execprefix) + AC_SUBST(python_configdir) + AC_SUBST(python_moduledir) + AC_SUBST(python_extmakefile) +else + AC_MSG_ERROR([Python not found]) +fi])# PGAC_PATH_PYTHONDIR + +dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY) +dnl The program must properly implement --version. +AC_DEFUN(AM_MISSING_PROG, +[AC_MSG_CHECKING(for working $2) +# Run test in a subshell; some versions of sh will print an error if +# an executable is not found, even if stderr is redirected. +# Redirect stdin to placate older versions of autoconf. Sigh. +if ($2 --version) < /dev/null > /dev/null 2>&1; then + $1=$2 + AC_MSG_RESULT(found) +else + $1="$3/missing $2" + AC_MSG_RESULT(missing) +fi +AC_SUBST($1)]) + diff --git a/config/missing b/config/missing new file mode 100755 index 0000000000..4b76d94502 --- /dev/null +++ b/config/missing @@ -0,0 +1,265 @@ +#! /bin/sh +# Common stub for a few missing GNU programs while installing. +# Copyright (C) 1996, 1997, 1999, 2000 Free Software Foundation, Inc. +# Originally by Fran,cois Pinard , 1996. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +if test $# -eq 0; then + echo 1>&2 "Try \`$0 --help' for more information" + exit 1 +fi + +run=: + +case "$1" in +--run) + # Try to run requested program, and just exit if it succeeds. + run= + shift + "$@" && exit 0 + ;; +esac + +# If it does not exist, or fails to run (possibly an outdated version), +# try to emulate it. +case "$1" in + + -h|--h|--he|--hel|--help) + echo "\ +$0 [OPTION]... PROGRAM [ARGUMENT]... + +Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an +error status if there is no known handling for PROGRAM. + +Options: + -h, --help display this help and exit + -v, --version output version information and exit + --run try to run the given command, and emulate it if it fails + +Supported PROGRAM values: + aclocal touch file \`aclocal.m4' + autoconf touch file \`configure' + autoheader touch file \`config.h.in' + automake touch all \`Makefile.in' files + bison create \`y.tab.[ch]', if possible, from existing .[ch] + flex create \`lex.yy.c', if possible, from existing .c + help2man touch the output file + lex create \`lex.yy.c', if possible, from existing .c + makeinfo touch the output file + tar try tar, gnutar, gtar, then tar without non-portable flags + yacc create \`y.tab.[ch]', if possible, from existing .[ch]" + ;; + + -v|--v|--ve|--ver|--vers|--versi|--versio|--version) + echo "missing 0.3 - GNU automake" + ;; + + -*) + echo 1>&2 "$0: Unknown \`$1' option" + echo 1>&2 "Try \`$0 --help' for more information" + exit 1 + ;; + + aclocal) + echo 1>&2 "\ +WARNING: \`$1' is missing on your system. You should only need it if + you modified \`acinclude.m4' or \`configure.in'. You might want + to install the \`Automake' and \`Perl' packages. Grab them from + any GNU archive site." + touch aclocal.m4 + ;; + + autoconf) + echo 1>&2 "\ +WARNING: \`$1' is missing on your system. You should only need it if + you modified \`configure.in'. You might want to install the + \`Autoconf' and \`GNU m4' packages. Grab them from any GNU + archive site." + touch configure + ;; + + autoheader) + echo 1>&2 "\ +WARNING: \`$1' is missing on your system. You should only need it if + you modified \`acconfig.h' or \`configure.in'. You might want + to install the \`Autoconf' and \`GNU m4' packages. Grab them + from any GNU archive site." + files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' configure.in` + test -z "$files" && files="config.h" + touch_files= + for f in $files; do + case "$f" in + *:*) touch_files="$touch_files "`echo "$f" | + sed -e 's/^[^:]*://' -e 's/:.*//'`;; + *) touch_files="$touch_files $f.in";; + esac + done + touch $touch_files + ;; + + automake) + echo 1>&2 "\ +WARNING: \`$1' is missing on your system. You should only need it if + you modified \`Makefile.am', \`acinclude.m4' or \`configure.in'. + You might want to install the \`Automake' and \`Perl' packages. + Grab them from any GNU archive site." + find . -type f -name Makefile.am -print | + sed 's/\.am$/.in/' | + while read f; do touch "$f"; done + ;; + + bison|yacc) + echo 1>&2 "\ +WARNING: \`$1' is missing on your system. You should only need it if + you modified a \`.y' file. You may need the \`Bison' package + in order for those modifications to take effect. You can get + \`Bison' from any GNU archive site." + rm -f y.tab.c y.tab.h + if [ $# -ne 1 ]; then + eval LASTARG="\${$#}" + case "$LASTARG" in + *.y) + SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` + if [ -f "$SRCFILE" ]; then + cp "$SRCFILE" y.tab.c + fi + SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` + if [ -f "$SRCFILE" ]; then + cp "$SRCFILE" y.tab.h + fi + ;; + esac + fi + if [ ! -f y.tab.h ]; then + echo >y.tab.h + fi + if [ ! -f y.tab.c ]; then + echo 'main() { return 0; }' >y.tab.c + fi + ;; + + lex|flex) + echo 1>&2 "\ +WARNING: \`$1' is missing on your system. You should only need it if + you modified a \`.l' file. You may need the \`Flex' package + in order for those modifications to take effect. You can get + \`Flex' from any GNU archive site." + rm -f lex.yy.c + if [ $# -ne 1 ]; then + eval LASTARG="\${$#}" + case "$LASTARG" in + *.l) + SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` + if [ -f "$SRCFILE" ]; then + cp "$SRCFILE" lex.yy.c + fi + ;; + esac + fi + if [ ! -f lex.yy.c ]; then + echo 'main() { return 0; }' >lex.yy.c + fi + ;; + + help2man) + echo 1>&2 "\ +WARNING: \`$1' is missing on your system. You should only need it if + you modified a dependancy of a manual page. You may need the + \`Help2man' package in order for those modifications to take + effect. You can get \`Help2man' from any GNU archive site." + + file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` + if test -z "$file"; then + file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'` + fi + if [ -f "$file" ]; then + touch $file + else + test -z "$file" || exec >$file + echo ".ab help2man is required to generate this page" + exit 1 + fi + ;; + + makeinfo) + echo 1>&2 "\ +WARNING: \`$1' is missing on your system. You should only need it if + you modified a \`.texi' or \`.texinfo' file, or any other file + indirectly affecting the aspect of the manual. The spurious + call might also be the consequence of using a buggy \`make' (AIX, + DU, IRIX). You might want to install the \`Texinfo' package or + the \`GNU make' package. Grab either from any GNU archive site." + file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` + if test -z "$file"; then + file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` + file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file` + fi + touch $file + ;; + + tar) + shift + if test -n "$run"; then + echo 1>&2 "ERROR: \`tar' requires --run" + exit 1 + fi + + # We have already tried tar in the generic part. + # Look for gnutar/gtar before invocation to avoid ugly error + # messages. + if (gnutar --version > /dev/null 2>&1); then + gnutar ${1+"$@"} && exit 0 + fi + if (gtar --version > /dev/null 2>&1); then + gtar ${1+"$@"} && exit 0 + fi + firstarg="$1" + if shift; then + case "$firstarg" in + *o*) + firstarg=`echo "$firstarg" | sed s/o//` + tar "$firstarg" ${1+"$@"} && exit 0 + ;; + esac + case "$firstarg" in + *h*) + firstarg=`echo "$firstarg" | sed s/h//` + tar "$firstarg" ${1+"$@"} && exit 0 + ;; + esac + fi + + echo 1>&2 "\ +WARNING: I can't seem to be able to run \`tar' with the given arguments. + You may want to install GNU tar or Free paxutils, or check the + command line arguments." + exit 1 + ;; + + *) + echo 1>&2 "\ +WARNING: \`$1' is needed, and you do not seem to have it handy on your + system. You might have modified some files without having the + proper tools for further handling them. Check the \`README' file, + it often tells you about the needed prerequirements for installing + this package. You may also peek at any GNU archive site, in case + some other package would contain this missing \`$1' program." + exit 1 + ;; +esac + +exit 0 diff --git a/config/python.m4 b/config/python.m4 new file mode 100644 index 0000000000..f73697d798 --- /dev/null +++ b/config/python.m4 @@ -0,0 +1,50 @@ +# +# Autoconf macros for configuring the build of Python extension modules +# +# $Header: /cvsroot/pgsql/config/python.m4,v 1.1 2000/06/10 18:01:35 petere Exp $ +# + +# PGAC_PROG_PYTHON +# ---------------- +# Look for Python and set the output variable `PYTHON' +# to `python' if found, empty otherwise. +AC_DEFUN([PGAC_PROG_PYTHON], +[AC_CHECK_PROG(PYTHON, python, python)]) + + +# PGAC_PATH_PYTHONDIR +# ------------------- +# Finds the names of various install dirs and helper files +# necessary to build a Python extension module. +# +# It would be nice if we could check whether the current setup allows +# the build of the shared module. Future project. +AC_DEFUN([PGAC_PATH_PYTHONDIR], +[AC_REQUIRE([PGAC_PROG_PYTHON]) +[if test "${PYTHON+set}" = set ; then + python_version=`${PYTHON} -c "import sys; print sys.version[:3]"` + python_prefix=`${PYTHON} -c "import sys; print sys.prefix"` + python_execprefix=`${PYTHON} -c "import sys; print sys.exec_prefix"` + python_configdir="${python_execprefix}/lib/python${python_version}/config" + python_moduledir="${python_prefix}/lib/python${python_version}" + python_extmakefile="${python_configdir}/Makefile.pre.in"] + + AC_MSG_CHECKING(for Python extension makefile) + if test -f "${python_extmakefile}" ; then + AC_MSG_RESULT(found) + else + AC_MSG_RESULT(no) + AC_MSG_ERROR( +[The Python extension makefile was expected at \`${python_extmakefile}\' +but does not exist. This means the Python module cannot be built automatically.]) + fi + + AC_SUBST(python_version) + AC_SUBST(python_prefix) + AC_SUBST(python_execprefix) + AC_SUBST(python_configdir) + AC_SUBST(python_moduledir) + AC_SUBST(python_extmakefile) +else + AC_MSG_ERROR([Python not found]) +fi])# PGAC_PATH_PYTHONDIR diff --git a/configure b/configure index 5a3eabe20a..1a0fdd1cb7 100755 --- a/configure +++ b/configure @@ -41,7 +41,9 @@ ac_help="$ac_help ac_help="$ac_help --with-tkconfig=DIR tkConfig.sh is in DIR" ac_help="$ac_help - --with-perl build Perl interface and plperl " + --with-perl build Perl interface and plperl" +ac_help="$ac_help + --with-python build Python interface module" ac_help="$ac_help --with-odbc build ODBC driver package " ac_help="$ac_help @@ -578,7 +580,7 @@ fi ac_aux_dir= -for ac_dir in config $srcdir/config; do +for ac_dir in `pwd`/config $srcdir/`pwd`/config; do if test -f $ac_dir/install-sh; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install-sh -c" @@ -590,13 +592,16 @@ for ac_dir in config $srcdir/config; do fi done if test -z "$ac_aux_dir"; then - { echo "configure: error: can not find install-sh or install.sh in config $srcdir/config" 1>&2; exit 1; } + { echo "configure: error: can not find install-sh or install.sh in `pwd`/config $srcdir/`pwd`/config" 1>&2; exit 1; } fi ac_config_guess=$ac_aux_dir/config.guess ac_config_sub=$ac_aux_dir/config.sub ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. +mkinstalldirs="\$(SHELL) \$(top_srcdir)/config/mkinstalldirs" + + # Make sure we can run config.sub. if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then : @@ -604,7 +609,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:608: checking host system type" >&5 +echo "configure:613: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -698,7 +703,7 @@ fi echo $ac_n "checking setting template to""... $ac_c" 1>&6 -echo "configure:702: checking setting template to" >&5 +echo "configure:707: checking setting template to" >&5 # Check whether --with-template or --without-template was given. if test "${with_template+set}" = set; then withval="$with_template" @@ -833,7 +838,7 @@ fi echo $ac_n "checking whether to support locale""... $ac_c" 1>&6 -echo "configure:837: checking whether to support locale" >&5 +echo "configure:842: checking whether to support locale" >&5 # Check whether --enable-locale or --disable-locale was given. if test "${enable_locale+set}" = set; then enableval="$enable_locale" @@ -848,7 +853,7 @@ fi echo $ac_n "checking whether to support cyrillic recode""... $ac_c" 1>&6 -echo "configure:852: checking whether to support cyrillic recode" >&5 +echo "configure:857: checking whether to support cyrillic recode" >&5 # Check whether --enable-recode or --disable-recode was given. if test "${enable_recode+set}" = set; then enableval="$enable_recode" @@ -864,7 +869,7 @@ fi echo $ac_n "checking whether to support multibyte""... $ac_c" 1>&6 -echo "configure:868: checking whether to support multibyte" >&5 +echo "configure:873: checking whether to support multibyte" >&5 # Check whether --enable-multibyte or --disable-multibyte was given. if test "${enable_multibyte+set}" = set; then enableval="$enable_multibyte" @@ -903,7 +908,7 @@ fi echo $ac_n "checking setting DEF_PGPORT""... $ac_c" 1>&6 -echo "configure:907: checking setting DEF_PGPORT" >&5 +echo "configure:912: checking setting DEF_PGPORT" >&5 # Check whether --with-pgport or --without-pgport was given. if test "${with_pgport+set}" = set; then withval="$with_pgport" @@ -925,7 +930,7 @@ echo "$ac_t""${default_port}" 1>&6 echo $ac_n "checking setting DEF_MAXBACKENDS""... $ac_c" 1>&6 -echo "configure:929: checking setting DEF_MAXBACKENDS" >&5 +echo "configure:934: checking setting DEF_MAXBACKENDS" >&5 # Check whether --with-maxbackends or --without-maxbackends was given. if test "${with_maxbackends+set}" = set; then withval="$with_maxbackends" @@ -960,7 +965,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:964: checking for $ac_word" >&5 +echo "configure:969: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -990,7 +995,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:994: checking for $ac_word" >&5 +echo "configure:999: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1041,7 +1046,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1045: checking for $ac_word" >&5 +echo "configure:1050: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1073,7 +1078,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1077: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1082: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1084,12 +1089,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1088 "configure" +#line 1093 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1115,12 +1120,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1119: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1124: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1124: checking whether we are using GNU C" >&5 +echo "configure:1129: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1129,7 +1134,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1133: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1138: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1148,7 +1153,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1152: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1157: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1180,7 +1185,7 @@ else fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1184: checking how to run the C preprocessor" >&5 +echo "configure:1189: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1195,13 +1200,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1205: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1210: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1212,13 +1217,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1222: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1227: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1229,13 +1234,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1239: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1244: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1261,13 +1266,13 @@ echo "$ac_t""$CPP" 1>&6 if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:1265: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:1270: checking whether ${CC-cc} needs -traditional" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext < Autoconf TIOCGETP @@ -1285,7 +1290,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -1317,7 +1322,7 @@ fi echo $ac_n "checking setting USE_TCL""... $ac_c" 1>&6 -echo "configure:1321: checking setting USE_TCL" >&5 +echo "configure:1326: checking setting USE_TCL" >&5 # Check whether --with-tcl or --without-tcl was given. if test "${with_tcl+set}" = set; then withval="$with_tcl" @@ -1368,25 +1373,99 @@ if test "${with_tkconfig+set}" = set; then fi -echo $ac_n "checking setting USE_PERL""... $ac_c" 1>&6 -echo "configure:1373: checking setting USE_PERL" >&5 + +echo $ac_n "checking whether to build Perl modules""... $ac_c" 1>&6 +echo "configure:1379: checking whether to build Perl modules" >&5 # Check whether --with-perl or --without-perl was given. if test "${with_perl+set}" = set; then withval="$with_perl" - - case "$withval" in - y | ye | yes) USE_PERL=true; echo "$ac_t""enabled" 1>&6 ;; - *) USE_PERL=false; echo "$ac_t""disabled" 1>&6 ;; - esac - + if test x"${withval}" = x"yes" ; then + echo "$ac_t""yes" 1>&6 else - USE_PERL=false; echo "$ac_t""disabled" 1>&6 + echo "$ac_t""no" 1>&6 +fi +else + echo "$ac_t""no" 1>&6 +fi + + + + +echo $ac_n "checking whether to build Python modules""... $ac_c" 1>&6 +echo "configure:1396: checking whether to build Python modules" >&5 +# Check whether --with-python or --without-python was given. +if test "${with_python+set}" = set; then + withval="$with_python" + if test x"${withval}" = x"yes" ; then + echo "$ac_t""yes" 1>&6 + # Extract the first word of "python", so it can be a program name with args. +set dummy python; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1405: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_PYTHON'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$PYTHON"; then + ac_cv_prog_PYTHON="$PYTHON" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_PYTHON="python" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +PYTHON="$ac_cv_prog_PYTHON" +if test -n "$PYTHON"; then + echo "$ac_t""$PYTHON" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +if test "${PYTHON+set}" = set ; then + python_version=`${PYTHON} -c "import sys; print sys.version[:3]"` + python_prefix=`${PYTHON} -c "import sys; print sys.prefix"` + python_execprefix=`${PYTHON} -c "import sys; print sys.exec_prefix"` + python_configdir="${python_execprefix}/lib/python${python_version}/config" + python_moduledir="${python_prefix}/lib/python${python_version}" + python_extmakefile="${python_configdir}/Makefile.pre.in" + + echo $ac_n "checking for Python extension makefile""... $ac_c" 1>&6 +echo "configure:1441: checking for Python extension makefile" >&5 + if test -f "${python_extmakefile}" ; then + echo "$ac_t""found" 1>&6 + else + echo "$ac_t""no" 1>&6 + { echo "configure: error: The Python extension makefile was expected at \`${python_extmakefile}\' +but does not exist. This means the Python module cannot be built automatically." 1>&2; exit 1; } + fi + + + + + + + +else + { echo "configure: error: Python not found" 1>&2; exit 1; } +fi +else + echo "$ac_t""no" 1>&6 +fi +else + echo "$ac_t""no" 1>&6 fi + echo $ac_n "checking setting USE_ODBC""... $ac_c" 1>&6 -echo "configure:1390: checking setting USE_ODBC" >&5 +echo "configure:1469: checking setting USE_ODBC" >&5 # Check whether --with-odbc or --without-odbc was given. if test "${with_odbc+set}" = set; then withval="$with_odbc" @@ -1412,7 +1491,7 @@ then echo $ac_n "checking setting ODBCINST""... $ac_c" 1>&6 -echo "configure:1416: checking setting ODBCINST" >&5 +echo "configure:1495: checking setting ODBCINST" >&5 # Check whether --with-odbcinst or --without-odbcinst was given. if test "${with_odbcinst+set}" = set; then withval="$with_odbcinst" @@ -1480,17 +1559,17 @@ for ac_hdr in sql.h sqlext.h odbcinst.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1484: checking for $ac_hdr" >&5 +echo "configure:1563: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1494: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1573: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1527,7 +1606,7 @@ save_LIBS="$LIBS" LIBS="$LIBS -L$unixODBC_libs" echo $ac_n "checking for SQLGetPrivateProfileString in -lodbcinst""... $ac_c" 1>&6 -echo "configure:1531: checking for SQLGetPrivateProfileString in -lodbcinst" >&5 +echo "configure:1610: checking for SQLGetPrivateProfileString in -lodbcinst" >&5 ac_lib_var=`echo odbcinst'_'SQLGetPrivateProfileString | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1535,7 +1614,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lodbcinst $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1575,7 +1654,7 @@ fi fi echo $ac_n "checking setting ASSERT CHECKING""... $ac_c" 1>&6 -echo "configure:1579: checking setting ASSERT CHECKING" >&5 +echo "configure:1658: checking setting ASSERT CHECKING" >&5 # Check whether --enable-cassert or --disable-cassert was given. if test "${enable_cassert+set}" = set; then enableval="$enable_cassert" @@ -1596,7 +1675,7 @@ LDFLAGS="$LDFLAGS $PGSQL_LDFLAGS" echo "- setting LDFLAGS=$LDFLAGS" echo $ac_n "checking setting debug compiler flag""... $ac_c" 1>&6 -echo "configure:1600: checking setting debug compiler flag" >&5 +echo "configure:1679: checking setting debug compiler flag" >&5 # Check whether --enable-debug or --disable-debug was given. if test "${enable_debug+set}" = set; then enableval="$enable_debug" @@ -1621,7 +1700,7 @@ fi # Assume system is ELF if it predefines __ELF__ as 1, # otherwise believe "elf" setting from check of host_os above. cat > conftest.$ac_ext <&6 -echo "configure:1697: checking for $ac_word" >&5 +echo "configure:1775: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1725,7 +1803,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1729: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:1807: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1736,12 +1814,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 1740 "configure" +#line 1818 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:1745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1767,12 +1845,12 @@ if test $ac_cv_prog_cxx_works = no; then { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1771: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1849: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1776: checking whether we are using GNU C++" >&5 +echo "configure:1854: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1781,7 +1859,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1785: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1863: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -1800,7 +1878,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}" ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:1804: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:1882: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1840,9 +1918,9 @@ cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking for include in C++""... $ac_c" 1>&6 -echo "configure:1844: checking for include in C++" >&5 +echo "configure:1922: checking for include in C++" >&5 cat > conftest.$ac_ext < #include @@ -1852,7 +1930,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:1856: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1934: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_CXX_STRING_HEADER 1 @@ -1865,9 +1943,9 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for class string in C++""... $ac_c" 1>&6 -echo "configure:1869: checking for class string in C++" >&5 +echo "configure:1947: checking for class string in C++" >&5 cat > conftest.$ac_ext < #include @@ -1877,7 +1955,7 @@ int main() { string foo = "test" ; return 0; } EOF -if { (eval echo configure:1881: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1959: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -1901,9 +1979,9 @@ fi if test "$HAVECXX" = 'true' ; then echo $ac_n "checking for namespace std in C++""... $ac_c" 1>&6 -echo "configure:1905: checking for namespace std in C++" >&5 +echo "configure:1983: checking for namespace std in C++" >&5 cat > conftest.$ac_ext < #include @@ -1916,7 +1994,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:1920: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1998: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_NAMESPACE_STD 1 @@ -1952,7 +2030,7 @@ cross_compiling=$ac_cv_prog_cc_cross # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1956: checking for a BSD compatible install" >&5 +echo "configure:2034: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2021,12 +2099,12 @@ esac -for ac_prog in mawk gawk nawk awk +for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2030: checking for $ac_word" >&5 +echo "configure:2108: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2055,6 +2133,32 @@ fi test -n "$AWK" && break done +echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 +echo "configure:2138: checking for working autoconf" >&5 +# Run test in a subshell; some versions of sh will print an error if +# an executable is not found, even if stderr is redirected. +# Redirect stdin to placate older versions of autoconf. Sigh. +if (autoconf --version) < /dev/null > /dev/null 2>&1; then + AUTOCONF=autoconf + echo "$ac_t""found" 1>&6 +else + AUTOCONF="\${SHELL} \${top_srcdir}/config/missing autoconf" + echo "$ac_t""missing" 1>&6 +fi + +echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 +echo "configure:2151: checking for working aclocal" >&5 +# Run test in a subshell; some versions of sh will print an error if +# an executable is not found, even if stderr is redirected. +# Redirect stdin to placate older versions of autoconf. Sigh. +if (aclocal --version) < /dev/null > /dev/null 2>&1; then + ACLOCAL=aclocal + echo "$ac_t""found" 1>&6 +else + ACLOCAL="\${SHELL} \${top_srcdir}/config/missing aclocal" + echo "$ac_t""missing" 1>&6 +fi + ECHO_N_OUT=`echo -n "" | wc -c` ECHO_C_OUT=`echo "\c" | wc -c` @@ -2075,7 +2179,7 @@ fi # Extract the first word of "flex", so it can be a program name with args. set dummy flex; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2079: checking for $ac_word" >&5 +echo "configure:2183: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2109,7 +2213,7 @@ then *) ac_lib=l ;; esac echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6 -echo "configure:2113: checking for yywrap in -l$ac_lib" >&5 +echo "configure:2217: checking for yywrap in -l$ac_lib" >&5 ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2117,7 +2221,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$ac_lib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2165,7 +2269,7 @@ broken as well.) fi fi echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:2169: checking whether ln -s works" >&5 +echo "configure:2273: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2185,37 +2289,10 @@ else echo "$ac_t""no" 1>&6 fi -echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:2190: checking whether ${MAKE-make} sets \${MAKE}" >&5 -set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftestmake <<\EOF -all: - @echo 'ac_maketemp="${MAKE}"' -EOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. -eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=` -if test -n "$ac_maketemp"; then - eval ac_cv_prog_make_${ac_make}_set=yes -else - eval ac_cv_prog_make_${ac_make}_set=no -fi -rm -f conftestmake -fi -if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$ac_t""yes" 1>&6 - SET_MAKE= -else - echo "$ac_t""no" 1>&6 - SET_MAKE="MAKE=${MAKE-make}" -fi - # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2219: checking for $ac_word" >&5 +echo "configure:2296: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2245,7 +2322,7 @@ fi # Extract the first word of "find", so it can be a program name with args. set dummy find; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2249: checking for $ac_word" >&5 +echo "configure:2326: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_find'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2280,7 +2357,7 @@ fi # Extract the first word of "tar", so it can be a program name with args. set dummy tar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2284: checking for $ac_word" >&5 +echo "configure:2361: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_tar'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2315,7 +2392,7 @@ fi # Extract the first word of "split", so it can be a program name with args. set dummy split; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2319: checking for $ac_word" >&5 +echo "configure:2396: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_split'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2350,7 +2427,7 @@ fi # Extract the first word of "etags", so it can be a program name with args. set dummy etags; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2354: checking for $ac_word" >&5 +echo "configure:2431: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_etags'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2385,7 +2462,7 @@ fi # Extract the first word of "xargs", so it can be a program name with args. set dummy xargs; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2389: checking for $ac_word" >&5 +echo "configure:2466: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_xargs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2422,7 +2499,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2426: checking for $ac_word" >&5 +echo "configure:2503: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GZCAT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2463,7 +2540,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2467: checking for $ac_word" >&5 +echo "configure:2544: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_PERL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2497,7 +2574,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2501: checking for $ac_word" >&5 +echo "configure:2578: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2529,9 +2606,8 @@ test -n "$YACC" || YACC="yacc" - echo $ac_n "checking for main in -lsfio""... $ac_c" 1>&6 -echo "configure:2535: checking for main in -lsfio" >&5 +echo "configure:2611: checking for main in -lsfio" >&5 ac_lib_var=`echo sfio'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2539,14 +2615,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lsfio $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2575,7 +2651,7 @@ fi for curses in ncurses curses ; do echo $ac_n "checking for main in -l${curses}""... $ac_c" 1>&6 -echo "configure:2579: checking for main in -l${curses}" >&5 +echo "configure:2655: checking for main in -l${curses}" >&5 ac_lib_var=`echo ${curses}'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2583,14 +2659,14 @@ else ac_save_LIBS="$LIBS" LIBS="-l${curses} $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2612,7 +2688,7 @@ fi done echo $ac_n "checking for main in -ltermcap""... $ac_c" 1>&6 -echo "configure:2616: checking for main in -ltermcap" >&5 +echo "configure:2692: checking for main in -ltermcap" >&5 ac_lib_var=`echo termcap'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2620,14 +2696,14 @@ else ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2655,7 +2731,7 @@ else fi echo $ac_n "checking for main in -lreadline""... $ac_c" 1>&6 -echo "configure:2659: checking for main in -lreadline" >&5 +echo "configure:2735: checking for main in -lreadline" >&5 ac_lib_var=`echo readline'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2663,14 +2739,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lreadline $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2698,7 +2774,7 @@ else fi echo $ac_n "checking for using_history in -lreadline""... $ac_c" 1>&6 -echo "configure:2702: checking for using_history in -lreadline" >&5 +echo "configure:2778: checking for using_history in -lreadline" >&5 ac_lib_var=`echo readline'_'using_history | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2706,7 +2782,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lreadline $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2739,7 +2815,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for main in -lhistory""... $ac_c" 1>&6 -echo "configure:2743: checking for main in -lhistory" >&5 +echo "configure:2819: checking for main in -lhistory" >&5 ac_lib_var=`echo history'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2747,14 +2823,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lhistory $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2787,7 +2863,7 @@ fi if test "$PORTNAME" != "aix" -a "$PORTNAME" != "alpha" then echo $ac_n "checking for main in -lbsd""... $ac_c" 1>&6 -echo "configure:2791: checking for main in -lbsd" >&5 +echo "configure:2867: checking for main in -lbsd" >&5 ac_lib_var=`echo bsd'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2795,14 +2871,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lbsd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2831,7 +2907,7 @@ fi fi echo $ac_n "checking for main in -lutil""... $ac_c" 1>&6 -echo "configure:2835: checking for main in -lutil" >&5 +echo "configure:2911: checking for main in -lutil" >&5 ac_lib_var=`echo util'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2839,14 +2915,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lutil $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2874,7 +2950,7 @@ else fi echo $ac_n "checking for main in -lm""... $ac_c" 1>&6 -echo "configure:2878: checking for main in -lm" >&5 +echo "configure:2954: checking for main in -lm" >&5 ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2882,14 +2958,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2917,7 +2993,7 @@ else fi echo $ac_n "checking for main in -ldl""... $ac_c" 1>&6 -echo "configure:2921: checking for main in -ldl" >&5 +echo "configure:2997: checking for main in -ldl" >&5 ac_lib_var=`echo dl'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2925,14 +3001,14 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2960,7 +3036,7 @@ else fi echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6 -echo "configure:2964: checking for main in -lsocket" >&5 +echo "configure:3040: checking for main in -lsocket" >&5 ac_lib_var=`echo socket'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2968,14 +3044,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3003,7 +3079,7 @@ else fi echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6 -echo "configure:3007: checking for main in -lnsl" >&5 +echo "configure:3083: checking for main in -lnsl" >&5 ac_lib_var=`echo nsl'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3011,14 +3087,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3046,7 +3122,7 @@ else fi echo $ac_n "checking for main in -lipc""... $ac_c" 1>&6 -echo "configure:3050: checking for main in -lipc" >&5 +echo "configure:3126: checking for main in -lipc" >&5 ac_lib_var=`echo ipc'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3054,14 +3130,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3089,7 +3165,7 @@ else fi echo $ac_n "checking for main in -lIPC""... $ac_c" 1>&6 -echo "configure:3093: checking for main in -lIPC" >&5 +echo "configure:3169: checking for main in -lIPC" >&5 ac_lib_var=`echo IPC'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3097,14 +3173,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lIPC $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3132,7 +3208,7 @@ else fi echo $ac_n "checking for main in -llc""... $ac_c" 1>&6 -echo "configure:3136: checking for main in -llc" >&5 +echo "configure:3212: checking for main in -llc" >&5 ac_lib_var=`echo lc'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3140,14 +3216,14 @@ else ac_save_LIBS="$LIBS" LIBS="-llc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3175,7 +3251,7 @@ else fi echo $ac_n "checking for main in -ldld""... $ac_c" 1>&6 -echo "configure:3179: checking for main in -ldld" >&5 +echo "configure:3255: checking for main in -ldld" >&5 ac_lib_var=`echo dld'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3183,14 +3259,14 @@ else ac_save_LIBS="$LIBS" LIBS="-ldld $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3218,7 +3294,7 @@ else fi echo $ac_n "checking for main in -lln""... $ac_c" 1>&6 -echo "configure:3222: checking for main in -lln" >&5 +echo "configure:3298: checking for main in -lln" >&5 ac_lib_var=`echo ln'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3226,14 +3302,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lln $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3313: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3261,7 +3337,7 @@ else fi echo $ac_n "checking for main in -lld""... $ac_c" 1>&6 -echo "configure:3265: checking for main in -lld" >&5 +echo "configure:3341: checking for main in -lld" >&5 ac_lib_var=`echo ld'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3269,14 +3345,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lld $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3304,7 +3380,7 @@ else fi echo $ac_n "checking for main in -lcompat""... $ac_c" 1>&6 -echo "configure:3308: checking for main in -lcompat" >&5 +echo "configure:3384: checking for main in -lcompat" >&5 ac_lib_var=`echo compat'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3312,14 +3388,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lcompat $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3347,7 +3423,7 @@ else fi echo $ac_n "checking for main in -lBSD""... $ac_c" 1>&6 -echo "configure:3351: checking for main in -lBSD" >&5 +echo "configure:3427: checking for main in -lBSD" >&5 ac_lib_var=`echo BSD'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3355,14 +3431,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lBSD $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3390,7 +3466,7 @@ else fi echo $ac_n "checking for main in -lcrypt""... $ac_c" 1>&6 -echo "configure:3394: checking for main in -lcrypt" >&5 +echo "configure:3470: checking for main in -lcrypt" >&5 ac_lib_var=`echo crypt'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3398,14 +3474,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lcrypt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3433,7 +3509,7 @@ else fi echo $ac_n "checking for main in -lgen""... $ac_c" 1>&6 -echo "configure:3437: checking for main in -lgen" >&5 +echo "configure:3513: checking for main in -lgen" >&5 ac_lib_var=`echo gen'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3441,14 +3517,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lgen $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3528: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3476,7 +3552,7 @@ else fi echo $ac_n "checking for main in -lPW""... $ac_c" 1>&6 -echo "configure:3480: checking for main in -lPW" >&5 +echo "configure:3556: checking for main in -lPW" >&5 ac_lib_var=`echo PW'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3484,14 +3560,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lPW $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3520,12 +3596,12 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:3524: checking for ANSI C header files" >&5 +echo "configure:3600: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3533,7 +3609,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3537: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3613: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3550,7 +3626,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -3568,7 +3644,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -3589,7 +3665,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -3600,7 +3676,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:3604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -3624,12 +3700,12 @@ EOF fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:3628: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:3704: checking for sys/wait.h that is POSIX.1 compatible" >&5 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3645,7 +3721,7 @@ wait (&s); s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:3649: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3725: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -3669,17 +3745,17 @@ for ac_hdr in arpa/inet.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3673: checking for $ac_hdr" >&5 +echo "configure:3749: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3683: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3759: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3709,17 +3785,17 @@ for ac_hdr in crypt.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3713: checking for $ac_hdr" >&5 +echo "configure:3789: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3723: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3799: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3749,17 +3825,17 @@ for ac_hdr in dld.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3753: checking for $ac_hdr" >&5 +echo "configure:3829: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3763: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3839: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3789,17 +3865,17 @@ for ac_hdr in endian.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3793: checking for $ac_hdr" >&5 +echo "configure:3869: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3803: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3879: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3829,17 +3905,17 @@ for ac_hdr in float.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3833: checking for $ac_hdr" >&5 +echo "configure:3909: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3843: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3919: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3869,17 +3945,17 @@ for ac_hdr in fp_class.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3873: checking for $ac_hdr" >&5 +echo "configure:3949: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3883: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3959: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3909,17 +3985,17 @@ for ac_hdr in getopt.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3913: checking for $ac_hdr" >&5 +echo "configure:3989: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3923: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3999: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3949,17 +4025,17 @@ for ac_hdr in history.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3953: checking for $ac_hdr" >&5 +echo "configure:4029: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3963: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4039: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3989,17 +4065,17 @@ for ac_hdr in ieeefp.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3993: checking for $ac_hdr" >&5 +echo "configure:4069: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4003: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4079: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4029,17 +4105,17 @@ for ac_hdr in limits.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4033: checking for $ac_hdr" >&5 +echo "configure:4109: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4043: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4119: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4069,17 +4145,17 @@ for ac_hdr in netdb.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4073: checking for $ac_hdr" >&5 +echo "configure:4149: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4083: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4159: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4109,17 +4185,17 @@ for ac_hdr in netinet/in.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4113: checking for $ac_hdr" >&5 +echo "configure:4189: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4123: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4199: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4149,17 +4225,17 @@ for ac_hdr in readline.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4153: checking for $ac_hdr" >&5 +echo "configure:4229: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4163: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4239: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4189,17 +4265,17 @@ for ac_hdr in readline/history.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4193: checking for $ac_hdr" >&5 +echo "configure:4269: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4203: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4279: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4229,17 +4305,17 @@ for ac_hdr in readline/readline.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4233: checking for $ac_hdr" >&5 +echo "configure:4309: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4243: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4319: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4269,17 +4345,17 @@ for ac_hdr in sys/select.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4273: checking for $ac_hdr" >&5 +echo "configure:4349: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4283: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4359: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4309,17 +4385,17 @@ for ac_hdr in termios.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4313: checking for $ac_hdr" >&5 +echo "configure:4389: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4323: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4399: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4349,17 +4425,17 @@ for ac_hdr in unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4353: checking for $ac_hdr" >&5 +echo "configure:4429: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4363: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4439: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4389,17 +4465,17 @@ for ac_hdr in values.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4393: checking for $ac_hdr" >&5 +echo "configure:4469: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4403: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4479: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4429,17 +4505,17 @@ for ac_hdr in sys/exec.h sys/pstat.h machine/vmparam.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4433: checking for $ac_hdr" >&5 +echo "configure:4509: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4443: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4519: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4469,17 +4545,17 @@ for ac_hdr in sys/param.h pwd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4473: checking for $ac_hdr" >&5 +echo "configure:4549: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4483: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4559: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4507,12 +4583,12 @@ done echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:4511: checking for working const" >&5 +echo "configure:4587: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4641: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -4582,21 +4658,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:4586: checking for inline" >&5 +echo "configure:4662: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4676: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -4624,12 +4700,12 @@ esac echo $ac_n "checking for preprocessor stringizing operator""... $ac_c" 1>&6 -echo "configure:4628: checking for preprocessor stringizing operator" >&5 +echo "configure:4704: checking for preprocessor stringizing operator" >&5 if eval "test \"`echo '$''{'ac_cv_c_stringize'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:4663: checking for uid_t in sys/types.h" >&5 +echo "configure:4739: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -4693,12 +4769,12 @@ EOF fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:4697: checking for mode_t" >&5 +echo "configure:4773: checking for mode_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -4726,12 +4802,12 @@ EOF fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:4730: checking for off_t" >&5 +echo "configure:4806: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -4759,12 +4835,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:4763: checking for size_t" >&5 +echo "configure:4839: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -4792,12 +4868,12 @@ EOF fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:4796: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:4872: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -4806,7 +4882,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:4810: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4886: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -4827,12 +4903,12 @@ EOF fi echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:4831: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:4907: checking whether struct tm is in sys/time.h or time.h" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -4840,7 +4916,7 @@ int main() { struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:4844: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4920: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -4861,12 +4937,12 @@ EOF fi echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6 -echo "configure:4865: checking for tm_zone in struct tm" >&5 +echo "configure:4941: checking for tm_zone in struct tm" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm_zone'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_cv_struct_tm> @@ -4874,7 +4950,7 @@ int main() { struct tm tm; tm.tm_zone; ; return 0; } EOF -if { (eval echo configure:4878: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4954: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm_zone=yes else @@ -4894,12 +4970,12 @@ EOF else echo $ac_n "checking for tzname""... $ac_c" 1>&6 -echo "configure:4898: checking for tzname" >&5 +echo "configure:4974: checking for tzname" >&5 if eval "test \"`echo '$''{'ac_cv_var_tzname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #ifndef tzname /* For SGI. */ @@ -4909,7 +4985,7 @@ int main() { atoi(*tzname); ; return 0; } EOF -if { (eval echo configure:4913: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_var_tzname=yes else @@ -4932,16 +5008,16 @@ fi echo $ac_n "checking for signed types""... $ac_c" 1>&6 -echo "configure:4936: checking for signed types" >&5 +echo "configure:5012: checking for signed types" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5021: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -4956,16 +5032,16 @@ fi rm -f conftest* echo $ac_n "checking for volatile""... $ac_c" 1>&6 -echo "configure:4960: checking for volatile" >&5 +echo "configure:5036: checking for volatile" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5045: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -4980,9 +5056,9 @@ fi rm -f conftest* echo $ac_n "checking for type of last arg to accept""... $ac_c" 1>&6 -echo "configure:4984: checking for type of last arg to accept" >&5 +echo "configure:5060: checking for type of last arg to accept" >&5 cat > conftest.$ac_ext < #include @@ -4992,7 +5068,7 @@ int main() { int a = accept(1, (struct sockaddr *) 0, (size_t *) 0); ; return 0; } EOF -if { (eval echo configure:4996: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5072: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define SOCKET_SIZE_TYPE size_t @@ -5010,16 +5086,16 @@ fi rm -f conftest* echo $ac_n "checking for int timezone""... $ac_c" 1>&6 -echo "configure:5014: checking for int timezone" >&5 +echo "configure:5090: checking for int timezone" >&5 cat > conftest.$ac_ext < int main() { int res = timezone / 60; ; return 0; } EOF -if { (eval echo configure:5023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_INT_TIMEZONE 1 @@ -5034,16 +5110,16 @@ fi rm -f conftest* echo $ac_n "checking for gettimeofday args""... $ac_c" 1>&6 -echo "configure:5038: checking for gettimeofday args" >&5 +echo "configure:5114: checking for gettimeofday args" >&5 cat > conftest.$ac_ext < int main() { struct timeval *tp; struct timezone *tzp; gettimeofday(tp,tzp); ; return 0; } EOF -if { (eval echo configure:5047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_GETTIMEOFDAY_2_ARGS 1 @@ -5058,9 +5134,9 @@ fi rm -f conftest* echo $ac_n "checking for union semun""... $ac_c" 1>&6 -echo "configure:5062: checking for union semun" >&5 +echo "configure:5138: checking for union semun" >&5 cat > conftest.$ac_ext < #include @@ -5069,7 +5145,7 @@ int main() { union semun semun; ; return 0; } EOF -if { (eval echo configure:5073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_UNION_SEMUN 1 @@ -5084,9 +5160,9 @@ fi rm -f conftest* echo $ac_n "checking for fcntl(F_SETLK)""... $ac_c" 1>&6 -echo "configure:5088: checking for fcntl(F_SETLK)" >&5 +echo "configure:5164: checking for fcntl(F_SETLK)" >&5 cat > conftest.$ac_ext < int main() { @@ -5096,7 +5172,7 @@ struct flock lck; fcntl(0, F_SETLK, &lck); ; return 0; } EOF -if { (eval echo configure:5100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_FCNTL_SETLK 1 @@ -5111,7 +5187,7 @@ fi rm -f conftest* echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:5115: checking for 8-bit clean memcmp" >&5 +echo "configure:5191: checking for 8-bit clean memcmp" >&5 if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5119,7 +5195,7 @@ else ac_cv_func_memcmp_clean=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_memcmp_clean=yes else @@ -5147,12 +5223,12 @@ echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6 test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}" echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:5151: checking return type of signal handlers" >&5 +echo "configure:5227: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -5169,7 +5245,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:5173: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5249: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -5188,12 +5264,12 @@ EOF echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:5192: checking for vprintf" >&5 +echo "configure:5268: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -5240,12 +5316,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:5244: checking for _doprnt" >&5 +echo "configure:5320: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -5295,12 +5371,12 @@ fi for ac_func in memmove sysconf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5299: checking for $ac_func" >&5 +echo "configure:5375: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5350,12 +5426,12 @@ done for ac_func in sigprocmask waitpid setsid fcvt do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5354: checking for $ac_func" >&5 +echo "configure:5430: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5405,12 +5481,12 @@ done for ac_func in setproctitle pstat do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5409: checking for $ac_func" >&5 +echo "configure:5485: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5459,9 +5535,9 @@ done echo $ac_n "checking for PS_STRINGS""... $ac_c" 1>&6 -echo "configure:5463: checking for PS_STRINGS" >&5 +echo "configure:5539: checking for PS_STRINGS" >&5 cat > conftest.$ac_ext < @@ -5474,7 +5550,7 @@ PS_STRINGS->ps_nargvstr = 1; PS_STRINGS->ps_argvstr = "foo"; ; return 0; } EOF -if { (eval echo configure:5478: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF #define HAVE_PS_STRINGS 1 @@ -5491,12 +5567,12 @@ rm -f conftest* for ac_func in fpclass fp_class fp_class_d class do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5495: checking for $ac_func" >&5 +echo "configure:5571: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5545,12 +5621,12 @@ done SNPRINTF='' echo $ac_n "checking for snprintf""... $ac_c" 1>&6 -echo "configure:5549: checking for snprintf" >&5 +echo "configure:5625: checking for snprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_snprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_snprintf=yes" else @@ -5597,12 +5673,12 @@ SNPRINTF='snprintf.o' fi echo $ac_n "checking for vsnprintf""... $ac_c" 1>&6 -echo "configure:5601: checking for vsnprintf" >&5 +echo "configure:5677: checking for vsnprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vsnprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vsnprintf=yes" else @@ -5650,7 +5726,7 @@ fi cat > conftest.$ac_ext < EOF @@ -5665,7 +5741,7 @@ fi rm -f conftest* cat > conftest.$ac_ext < EOF @@ -5680,19 +5756,19 @@ fi rm -f conftest* echo $ac_n "checking for isinf""... $ac_c" 1>&6 -echo "configure:5684: checking for isinf" >&5 +echo "configure:5760: checking for isinf" >&5 if eval "test \"`echo '$''{'ac_cv_func_or_macro_isinf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { double x = 0.0; int res = isinf(x); ; return 0; } EOF -if { (eval echo configure:5696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_or_macro_isinf=yes else @@ -5717,12 +5793,12 @@ else fi echo $ac_n "checking for getrusage""... $ac_c" 1>&6 -echo "configure:5721: checking for getrusage" >&5 +echo "configure:5797: checking for getrusage" >&5 if eval "test \"`echo '$''{'ac_cv_func_getrusage'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_getrusage=yes" else @@ -5770,12 +5846,12 @@ fi echo $ac_n "checking for srandom""... $ac_c" 1>&6 -echo "configure:5774: checking for srandom" >&5 +echo "configure:5850: checking for srandom" >&5 if eval "test \"`echo '$''{'ac_cv_func_srandom'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_srandom=yes" else @@ -5823,12 +5899,12 @@ fi echo $ac_n "checking for gethostname""... $ac_c" 1>&6 -echo "configure:5827: checking for gethostname" >&5 +echo "configure:5903: checking for gethostname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostname=yes" else @@ -5876,12 +5952,12 @@ fi echo $ac_n "checking for random""... $ac_c" 1>&6 -echo "configure:5880: checking for random" >&5 +echo "configure:5956: checking for random" >&5 if eval "test \"`echo '$''{'ac_cv_func_random'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_random=yes" else @@ -5929,12 +6005,12 @@ fi echo $ac_n "checking for inet_aton""... $ac_c" 1>&6 -echo "configure:5933: checking for inet_aton" >&5 +echo "configure:6009: checking for inet_aton" >&5 if eval "test \"`echo '$''{'ac_cv_func_inet_aton'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_inet_aton=yes" else @@ -5982,12 +6058,12 @@ fi echo $ac_n "checking for strerror""... $ac_c" 1>&6 -echo "configure:5986: checking for strerror" >&5 +echo "configure:6062: checking for strerror" >&5 if eval "test \"`echo '$''{'ac_cv_func_strerror'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_strerror=yes" else @@ -6036,12 +6112,12 @@ fi echo $ac_n "checking for strdup""... $ac_c" 1>&6 -echo "configure:6040: checking for strdup" >&5 +echo "configure:6116: checking for strdup" >&5 if eval "test \"`echo '$''{'ac_cv_func_strdup'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_strdup=yes" else @@ -6089,12 +6165,12 @@ fi echo $ac_n "checking for strtol""... $ac_c" 1>&6 -echo "configure:6093: checking for strtol" >&5 +echo "configure:6169: checking for strtol" >&5 if eval "test \"`echo '$''{'ac_cv_func_strtol'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_strtol=yes" else @@ -6142,12 +6218,12 @@ fi echo $ac_n "checking for strtoul""... $ac_c" 1>&6 -echo "configure:6146: checking for strtoul" >&5 +echo "configure:6222: checking for strtoul" >&5 if eval "test \"`echo '$''{'ac_cv_func_strtoul'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_strtoul=yes" else @@ -6195,12 +6271,12 @@ fi echo $ac_n "checking for strcasecmp""... $ac_c" 1>&6 -echo "configure:6199: checking for strcasecmp" >&5 +echo "configure:6275: checking for strcasecmp" >&5 if eval "test \"`echo '$''{'ac_cv_func_strcasecmp'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_strcasecmp=yes" else @@ -6248,12 +6324,12 @@ fi echo $ac_n "checking for cbrt""... $ac_c" 1>&6 -echo "configure:6252: checking for cbrt" >&5 +echo "configure:6328: checking for cbrt" >&5 if eval "test \"`echo '$''{'ac_cv_func_cbrt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_cbrt=yes" else @@ -6297,7 +6373,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for cbrt in -lm""... $ac_c" 1>&6 -echo "configure:6301: checking for cbrt in -lm" >&5 +echo "configure:6377: checking for cbrt in -lm" >&5 ac_lib_var=`echo m'_'cbrt | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6305,7 +6381,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6354,12 +6430,12 @@ esac echo $ac_n "checking for rint""... $ac_c" 1>&6 -echo "configure:6358: checking for rint" >&5 +echo "configure:6434: checking for rint" >&5 if eval "test \"`echo '$''{'ac_cv_func_rint'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_rint=yes" else @@ -6403,7 +6479,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for rint in -lm""... $ac_c" 1>&6 -echo "configure:6407: checking for rint in -lm" >&5 +echo "configure:6483: checking for rint in -lm" >&5 ac_lib_var=`echo m'_'rint | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6411,7 +6487,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $HPUXMATHLIB $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6449,7 +6525,7 @@ fi cat > conftest.$ac_ext < EOF @@ -6463,7 +6539,7 @@ EOF else rm -rf conftest* cat > conftest.$ac_ext < EOF @@ -6485,12 +6561,12 @@ rm -f conftest* for ac_func in filename_completion_function do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6489: checking for $ac_func" >&5 +echo "configure:6565: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6532,7 +6608,7 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then #define $ac_tr_func 1 EOF cat > conftest.$ac_ext < EOF @@ -6546,7 +6622,7 @@ EOF else rm -rf conftest* cat > conftest.$ac_ext < EOF @@ -6575,12 +6651,12 @@ done for ac_func in getopt_long do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6579: checking for $ac_func" >&5 +echo "configure:6655: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6629,16 +6705,16 @@ done echo $ac_n "checking for finite""... $ac_c" 1>&6 -echo "configure:6633: checking for finite" >&5 +echo "configure:6709: checking for finite" >&5 cat > conftest.$ac_ext < int main() { int dummy=finite(1.0); ; return 0; } EOF -if { (eval echo configure:6642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_FINITE 1 @@ -6653,16 +6729,16 @@ fi rm -f conftest* echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6 -echo "configure:6657: checking for sigsetjmp" >&5 +echo "configure:6733: checking for sigsetjmp" >&5 cat > conftest.$ac_ext < int main() { sigjmp_buf x; sigsetjmp(x, 1); ; return 0; } EOF -if { (eval echo configure:6666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_SIGSETJMP 1 @@ -6681,12 +6757,12 @@ if test "${enable_syslog+set}" = set; then enableval="$enable_syslog" case $enableval in y|ye|yes) echo $ac_n "checking for syslog""... $ac_c" 1>&6 -echo "configure:6685: checking for syslog" >&5 +echo "configure:6761: checking for syslog" >&5 if eval "test \"`echo '$''{'ac_cv_func_syslog'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6789: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_syslog=yes" else @@ -6741,12 +6817,12 @@ fi HAVE_LONG_INT_64=0 echo $ac_n "checking whether 'long int' is 64 bits""... $ac_c" 1>&6 -echo "configure:6745: checking whether 'long int' is 64 bits" >&5 +echo "configure:6821: checking whether 'long int' is 64 bits" >&5 if test "$cross_compiling" = yes; then echo "$ac_t""assuming not on target machine" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then HAVE_LONG_INT_64=1 cat >> confdefs.h <<\EOF @@ -6795,12 +6871,12 @@ fi HAVE_LONG_LONG_INT_64=0 if [ $HAVE_LONG_INT_64 -eq 0 ] ; then echo $ac_n "checking whether 'long long int' is 64 bits""... $ac_c" 1>&6 -echo "configure:6799: checking whether 'long long int' is 64 bits" >&5 +echo "configure:6875: checking whether 'long long int' is 64 bits" >&5 if test "$cross_compiling" = yes; then echo "$ac_t""assuming not on target machine" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then HAVE_LONG_LONG_INT_64=1 cat >> confdefs.h <<\EOF @@ -6851,7 +6927,7 @@ fi if [ $HAVE_LONG_LONG_INT_64 -eq 1 ] ; then if [ x$SNPRINTF = x ] ; then echo $ac_n "checking whether snprintf handles 'long long int' as %lld""... $ac_c" 1>&6 -echo "configure:6855: checking whether snprintf handles 'long long int' as %lld" >&5 +echo "configure:6931: checking whether snprintf handles 'long long int' as %lld" >&5 if test "$cross_compiling" = yes; then echo "$ac_t""assuming not on target machine" 1>&6 # Force usage of our own snprintf, since we cannot test foreign snprintf @@ -6860,7 +6936,7 @@ echo "configure:6855: checking whether snprintf handles 'long long int' as %lld" else cat > conftest.$ac_ext < typedef long long int int64; @@ -6887,7 +6963,7 @@ main() { exit(! does_int64_snprintf_work()); } EOF -if { (eval echo configure:6891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "$ac_t""yes" 1>&6 INT64_FORMAT='"%lld"' @@ -6898,7 +6974,7 @@ else rm -fr conftest* echo "$ac_t""no" 1>&6 echo $ac_n "checking whether snprintf handles 'long long int' as %qd""... $ac_c" 1>&6 -echo "configure:6902: checking whether snprintf handles 'long long int' as %qd" >&5 +echo "configure:6978: checking whether snprintf handles 'long long int' as %qd" >&5 if test "$cross_compiling" = yes; then echo "$ac_t""assuming not on target machine" 1>&6 # Force usage of our own snprintf, since we cannot test foreign snprintf @@ -6907,7 +6983,7 @@ echo "configure:6902: checking whether snprintf handles 'long long int' as %qd" else cat > conftest.$ac_ext < typedef long long int int64; @@ -6934,7 +7010,7 @@ main() { exit(! does_int64_snprintf_work()); } EOF -if { (eval echo configure:6938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "$ac_t""yes" 1>&6 INT64_FORMAT='"%qd"' @@ -6976,7 +7052,7 @@ EOF echo $ac_n "checking alignment of short""... $ac_c" 1>&6 -echo "configure:6980: checking alignment of short" >&5 +echo "configure:7056: checking alignment of short" >&5 if eval "test \"`echo '$''{'ac_cv_alignof_short'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6984,7 +7060,7 @@ else ac_cv_alignof_short='sizeof(short)' else cat > conftest.$ac_ext < struct { char filler; short field; } mystruct; @@ -6996,7 +7072,7 @@ main() exit(0); } EOF -if { (eval echo configure:7000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_alignof_short=`cat conftestval` else @@ -7016,7 +7092,7 @@ EOF echo $ac_n "checking alignment of int""... $ac_c" 1>&6 -echo "configure:7020: checking alignment of int" >&5 +echo "configure:7096: checking alignment of int" >&5 if eval "test \"`echo '$''{'ac_cv_alignof_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7024,7 +7100,7 @@ else ac_cv_alignof_int='sizeof(int)' else cat > conftest.$ac_ext < struct { char filler; int field; } mystruct; @@ -7036,7 +7112,7 @@ main() exit(0); } EOF -if { (eval echo configure:7040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_alignof_int=`cat conftestval` else @@ -7056,7 +7132,7 @@ EOF echo $ac_n "checking alignment of long""... $ac_c" 1>&6 -echo "configure:7060: checking alignment of long" >&5 +echo "configure:7136: checking alignment of long" >&5 if eval "test \"`echo '$''{'ac_cv_alignof_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7064,7 +7140,7 @@ else ac_cv_alignof_long='sizeof(long)' else cat > conftest.$ac_ext < struct { char filler; long field; } mystruct; @@ -7076,7 +7152,7 @@ main() exit(0); } EOF -if { (eval echo configure:7080: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_alignof_long=`cat conftestval` else @@ -7097,7 +7173,7 @@ EOF if [ $HAVE_LONG_LONG_INT_64 -eq 1 ] ; then echo $ac_n "checking alignment of long long int""... $ac_c" 1>&6 -echo "configure:7101: checking alignment of long long int" >&5 +echo "configure:7177: checking alignment of long long int" >&5 if eval "test \"`echo '$''{'ac_cv_alignof_long_long_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7105,7 +7181,7 @@ else ac_cv_alignof_long_long_int='sizeof(long long int)' else cat > conftest.$ac_ext < struct { char filler; long long int field; } mystruct; @@ -7117,7 +7193,7 @@ main() exit(0); } EOF -if { (eval echo configure:7121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_alignof_long_long_int=`cat conftestval` else @@ -7138,7 +7214,7 @@ EOF fi echo $ac_n "checking alignment of double""... $ac_c" 1>&6 -echo "configure:7142: checking alignment of double" >&5 +echo "configure:7218: checking alignment of double" >&5 if eval "test \"`echo '$''{'ac_cv_alignof_double'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7146,7 +7222,7 @@ else ac_cv_alignof_double='sizeof(double)' else cat > conftest.$ac_ext < struct { char filler; double field; } mystruct; @@ -7158,7 +7234,7 @@ main() exit(0); } EOF -if { (eval echo configure:7162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_alignof_double=`cat conftestval` else @@ -7200,9 +7276,9 @@ EOF echo $ac_n "checking for POSIX signal interface""... $ac_c" 1>&6 -echo "configure:7204: checking for POSIX signal interface" >&5 +echo "configure:7280: checking for POSIX signal interface" >&5 cat > conftest.$ac_ext < int main() { @@ -7212,7 +7288,7 @@ act.sa_flags = SA_RESTART; sigaction(0, &act, &oact); ; return 0; } EOF -if { (eval echo configure:7216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cat >> confdefs.h <<\EOF #define USE_POSIX_SIGNALS 1 @@ -7236,7 +7312,7 @@ then # Extract the first word of "tclsh", so it can be a program name with args. set dummy tclsh; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:7240: checking for $ac_word" >&5 +echo "configure:7316: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_TCLSH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7273,7 +7349,7 @@ fi # Extract the first word of "tcl", so it can be a program name with args. set dummy tcl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:7277: checking for $ac_word" >&5 +echo "configure:7353: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_TCLSH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7316,7 +7392,7 @@ fi if test "$USE_TCL" = true then echo $ac_n "checking for tclConfig.sh""... $ac_c" 1>&6 -echo "configure:7320: checking for tclConfig.sh" >&5 +echo "configure:7396: checking for tclConfig.sh" >&5 TCL_CONFIG_SH= library_dirs= if test -z "$TCL_DIRS" @@ -7345,7 +7421,7 @@ USE_TK=$USE_TCL # If TCL is disabled, disable TK if test "$USE_TK" = true then echo $ac_n "checking for tkConfig.sh""... $ac_c" 1>&6 -echo "configure:7349: checking for tkConfig.sh" >&5 +echo "configure:7425: checking for tkConfig.sh" >&5 TK_CONFIG_SH= # library_dirs are set in the check for TCL for dir in $library_dirs @@ -7367,7 +7443,7 @@ echo "configure:7349: checking for tkConfig.sh" >&5 # Extract the first word of "wish", so it can be a program name with args. set dummy wish; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:7371: checking for $ac_word" >&5 +echo "configure:7447: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_WISH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7417,7 +7493,7 @@ if test "$USE_X" = true; then # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:7421: checking for X" >&5 +echo "configure:7497: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -7479,12 +7555,12 @@ if test "$ac_x_includes" = NO; then # First, try using that file with no special directory specified. cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7488: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7564: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7553,14 +7629,14 @@ if test "$ac_x_libraries" = NO; then ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -7666,17 +7742,17 @@ else case "`(uname -sr) 2>/dev/null`" in "SunOS 5"*) echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 -echo "configure:7670: checking whether -R must be followed by a space" >&5 +echo "configure:7746: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -7692,14 +7768,14 @@ rm -f conftest* else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7779: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -7731,7 +7807,7 @@ rm -f conftest* # libraries were built with DECnet support. And karl@cs.umb.edu says # the Alpha needs dnet_stub (dnet does not exist). echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:7735: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:7811: checking for dnet_ntoa in -ldnet" >&5 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7739,7 +7815,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7772,7 +7848,7 @@ fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:7776: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:7852: checking for dnet_ntoa in -ldnet_stub" >&5 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7780,7 +7856,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7820,12 +7896,12 @@ fi # The nsl library prevents programs from opening the X display # on Irix 5.2, according to dickey@clark.net. echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:7824: checking for gethostbyname" >&5 +echo "configure:7900: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -7869,7 +7945,7 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:7873: checking for gethostbyname in -lnsl" >&5 +echo "configure:7949: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7877,7 +7953,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7918,12 +7994,12 @@ fi # -lsocket must be given before -lnsl if both are needed. # We assume that if connect needs -lnsl, so does gethostbyname. echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:7922: checking for connect" >&5 +echo "configure:7998: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -7967,7 +8043,7 @@ fi if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:7971: checking for connect in -lsocket" >&5 +echo "configure:8047: checking for connect in -lsocket" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7975,7 +8051,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8010,12 +8086,12 @@ fi # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:8014: checking for remove" >&5 +echo "configure:8090: checking for remove" >&5 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -8059,7 +8135,7 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:8063: checking for remove in -lposix" >&5 +echo "configure:8139: checking for remove in -lposix" >&5 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8067,7 +8143,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8102,12 +8178,12 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:8106: checking for shmat" >&5 +echo "configure:8182: checking for shmat" >&5 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8210: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else @@ -8151,7 +8227,7 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:8155: checking for shmat in -lipc" >&5 +echo "configure:8231: checking for shmat in -lipc" >&5 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8159,7 +8235,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8203,7 +8279,7 @@ fi # libraries we check for below, so use a different variable. # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:8207: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:8283: checking for IceConnectionNumber in -lICE" >&5 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8211,7 +8287,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8255,7 +8331,7 @@ fi X11_LIBS="" echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -echo "configure:8259: checking for XOpenDisplay in -lX11" >&5 +echo "configure:8335: checking for XOpenDisplay in -lX11" >&5 ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8263,7 +8339,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lX11 ${X_PRE_LIBS} $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8321,17 +8397,17 @@ then PWD_INCDIR=no ac_safe=`echo "pwd.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for pwd.h""... $ac_c" 1>&6 -echo "configure:8325: checking for pwd.h" >&5 +echo "configure:8401: checking for pwd.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8335: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8411: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8481,17 +8557,22 @@ trap 'rm -fr `echo "GNUmakefile src/bin/pgtclsh/mkMakefile.tkdefs.sh src/bin/psql/Makefile src/include/version.h + src/interfaces/Makefile src/interfaces/libpq/Makefile src/interfaces/ecpg/lib/Makefile src/interfaces/ecpg/preproc/Makefile + src/interfaces/perl5/GNUmakefile src/interfaces/libpq++/Makefile src/interfaces/libpgeasy/Makefile src/interfaces/libpgtcl/Makefile src/interfaces/odbc/GNUmakefile src/interfaces/odbc/Makefile.global + src/interfaces/python/GNUmakefile + src/pl/Makefile src/pl/plpgsql/src/Makefile src/pl/plpgsql/src/mklang.sql src/pl/tcl/mkMakefile.tcldefs.sh + src/pl/plperl/GNUmakefile src/test/regress/GNUmakefile src/include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF @@ -8525,6 +8606,7 @@ s%@includedir@%$includedir%g s%@oldincludedir@%$oldincludedir%g s%@infodir@%$infodir%g s%@mandir@%$mandir%g +s%@mkinstalldirs@%$mkinstalldirs%g s%@host@%$host%g s%@host_alias@%$host_alias%g s%@host_cpu@%$host_cpu%g @@ -8534,6 +8616,15 @@ s%@TAS@%$TAS%g s%@CC@%$CC%g s%@CPP@%$CPP%g s%@CC_VERSION@%$CC_VERSION%g +s%@with_perl@%$with_perl%g +s%@PYTHON@%$PYTHON%g +s%@python_version@%$python_version%g +s%@python_prefix@%$python_prefix%g +s%@python_execprefix@%$python_execprefix%g +s%@python_configdir@%$python_configdir%g +s%@python_moduledir@%$python_moduledir%g +s%@python_extmakefile@%$python_extmakefile%g +s%@with_python@%$with_python%g s%@ODBCINSTDIR@%$ODBCINSTDIR%g s%@ELF_SYS@%$ELF_SYS%g s%@PORTNAME@%$PORTNAME%g @@ -8547,7 +8638,6 @@ s%@DL_LIB@%$DL_LIB%g s%@USE_TCL@%$USE_TCL%g s%@USE_TK@%$USE_TK%g s%@WISH@%$WISH%g -s%@USE_PERL@%$USE_PERL%g s%@USE_ODBC@%$USE_ODBC%g s%@MULTIBYTE@%$MULTIBYTE%g s%@HAVECXX@%$HAVECXX%g @@ -8561,12 +8651,13 @@ s%@INSTL_LIB_OPTS@%$INSTL_LIB_OPTS%g s%@INSTL_SHLIB_OPTS@%$INSTL_SHLIB_OPTS%g s%@INSTL_EXE_OPTS@%$INSTL_EXE_OPTS%g s%@AWK@%$AWK%g +s%@AUTOCONF@%$AUTOCONF%g +s%@ACLOCAL@%$ACLOCAL%g s%@DASH_N@%$DASH_N%g s%@BACKSLASH_C@%$BACKSLASH_C%g s%@LEX@%$LEX%g s%@LEXLIB@%$LEXLIB%g s%@LN_S@%$LN_S%g -s%@SET_MAKE@%$SET_MAKE%g s%@RANLIB@%$RANLIB%g s%@find@%$find%g s%@tar@%$tar%g @@ -8576,7 +8667,6 @@ s%@xargs@%$xargs%g s%@GZCAT@%$GZCAT%g s%@PERL@%$PERL%g s%@YACC@%$YACC%g -s%@YFLAGS@%$YFLAGS%g s%@LIBOBJS@%$LIBOBJS%g s%@SNPRINTF@%$SNPRINTF%g s%@ISINF@%$ISINF%g @@ -8658,17 +8748,22 @@ CONFIG_FILES=\${CONFIG_FILES-"GNUmakefile src/bin/pgtclsh/mkMakefile.tkdefs.sh src/bin/psql/Makefile src/include/version.h + src/interfaces/Makefile src/interfaces/libpq/Makefile src/interfaces/ecpg/lib/Makefile src/interfaces/ecpg/preproc/Makefile + src/interfaces/perl5/GNUmakefile src/interfaces/libpq++/Makefile src/interfaces/libpgeasy/Makefile src/interfaces/libpgtcl/Makefile src/interfaces/odbc/GNUmakefile src/interfaces/odbc/Makefile.global + src/interfaces/python/GNUmakefile + src/pl/Makefile src/pl/plpgsql/src/Makefile src/pl/plpgsql/src/mklang.sql src/pl/tcl/mkMakefile.tcldefs.sh + src/pl/plperl/GNUmakefile src/test/regress/GNUmakefile "} EOF diff --git a/configure.in b/configure.in index b5ce19fa24..bca24add06 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,10 @@ AC_PREFIX_DEFAULT(/usr/local/pgsql) AC_CONFIG_HEADER(src/include/config.h) AC_PREREQ(2.13) -AC_CONFIG_AUX_DIR(config) +AC_CONFIG_AUX_DIR(`pwd`/config) + +mkinstalldirs="\$(SHELL) \$(top_srcdir)/config/mkinstalldirs" +AC_SUBST(mkinstalldirs) AC_CANONICAL_HOST @@ -370,19 +373,35 @@ AC_ARG_WITH(tkconfig, ] ) -dnl We exclude perl support unless we override it with --with-perl -AC_MSG_CHECKING(setting USE_PERL) -AC_ARG_WITH( - perl, - [ --with-perl build Perl interface and plperl ], - [ - case "$withval" in - y | ye | yes) USE_PERL=true; AC_MSG_RESULT(enabled) ;; - *) USE_PERL=false; AC_MSG_RESULT(disabled) ;; - esac - ], - [ USE_PERL=false; AC_MSG_RESULT(disabled) ] -) + +dnl +dnl Optionally build Perl modules (Pg.pm and PL/Perl) +dnl +AC_MSG_CHECKING(whether to build Perl modules) +AC_ARG_WITH(perl, [ --with-perl build Perl interface and plperl], +[if test x"${withval}" = x"yes" ; then + AC_MSG_RESULT(yes) +else + AC_MSG_RESULT(no) +fi], +[AC_MSG_RESULT(no)]) +AC_SUBST(with_perl) + + +dnl +dnl Optionally build Python interface module +dnl +AC_MSG_CHECKING(whether to build Python modules) +AC_ARG_WITH(python, [ --with-python build Python interface module], +[if test x"${withval}" = x"yes" ; then + AC_MSG_RESULT(yes) + PGAC_PROG_PYTHON + PGAC_PATH_PYTHONDIR +else + AC_MSG_RESULT(no) +fi], +[AC_MSG_RESULT(no)]) +AC_SUBST(with_python) dnl We include odbc support unless we disable it with --with-odbc=false AC_MSG_CHECKING(setting USE_ODBC) @@ -543,7 +562,6 @@ AC_SUBST(DL_LIB) AC_SUBST(USE_TCL) AC_SUBST(USE_TK) AC_SUBST(WISH) -AC_SUBST(USE_PERL) AC_SUBST(USE_ODBC) AC_SUBST(MULTIBYTE) @@ -646,6 +664,8 @@ AC_SUBST(INSTL_SHLIB_OPTS) AC_SUBST(INSTL_EXE_OPTS) AC_PROG_AWK +AM_MISSING_PROG(AUTOCONF, autoconf, [\${SHELL} \${top_srcdir}/config]) +AM_MISSING_PROG(ACLOCAL, aclocal, [\${SHELL} \${top_srcdir}/config]) dnl Check the option to echo to inhibit newlines. ECHO_N_OUT=`echo -n "" | wc -c` @@ -680,7 +700,6 @@ broken as well.) fi fi AC_PROG_LN_S -AC_PROG_MAKE_SET AC_PROG_RANLIB AC_PATH_PROG(find, find) AC_PATH_PROG(tar, tar) @@ -690,7 +709,6 @@ AC_PATH_PROG(xargs, xargs) AC_PATH_PROGS(GZCAT, gzcat zcat, gzcat) AC_CHECK_PROGS(PERL, perl,) AC_PROG_YACC -AC_SUBST(YFLAGS) AC_CHECK_LIB(sfio, main) @@ -1403,16 +1421,21 @@ AC_OUTPUT( src/bin/pgtclsh/mkMakefile.tkdefs.sh src/bin/psql/Makefile src/include/version.h + src/interfaces/Makefile src/interfaces/libpq/Makefile src/interfaces/ecpg/lib/Makefile src/interfaces/ecpg/preproc/Makefile + src/interfaces/perl5/GNUmakefile src/interfaces/libpq++/Makefile src/interfaces/libpgeasy/Makefile src/interfaces/libpgtcl/Makefile src/interfaces/odbc/GNUmakefile src/interfaces/odbc/Makefile.global + src/interfaces/python/GNUmakefile + src/pl/Makefile src/pl/plpgsql/src/Makefile src/pl/plpgsql/src/mklang.sql src/pl/tcl/mkMakefile.tcldefs.sh + src/pl/plperl/GNUmakefile src/test/regress/GNUmakefile ) diff --git a/src/GNUmakefile.in b/src/GNUmakefile.in index f00d34efaa..1471a06a23 100644 --- a/src/GNUmakefile.in +++ b/src/GNUmakefile.in @@ -7,7 +7,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/Attic/GNUmakefile.in,v 1.51 2000/06/06 22:00:47 petere Exp $ +# $Header: /cvsroot/pgsql/src/Attic/GNUmakefile.in,v 1.52 2000/06/10 18:01:36 petere Exp $ # #------------------------------------------------------------------------- @@ -49,46 +49,27 @@ clean: $(MAKE) -C test clean $(MAKE) -C ../contrib/spi clean -# Remove files and symlinks created by configure script -distclean: clean - rm -f \ - Makefile.port \ - include/config.h \ - include/dynloader.h \ - include/os.h \ - backend/port/tas.s \ - backend/port/dynloader.c \ +# Not all subdirectories have a make distclean target yet +distclean: + -$(MAKE) -C utils clean + -$(MAKE) -C backend clean + rm -f backend/port/Makefile backend/catalog/genbki.sh \ backend/utils/Gen_fmgrtab.sh \ - interfaces/odbc/port \ - interfaces/odbc/makefiles \ - interfaces/odbc/template \ - interfaces/odbc/config.h \ -\ -\ -\ - GNUmakefile \ + backend/port/tas.s backend/port/dynloader.c + -$(MAKE) -C interfaces distclean + -$(MAKE) -C bin clean + rm -f bin/pg_dump/Makefile bin/pg_version/Makefile \ + bin/psql/Makefile bin/pgtclsh/mkMakefile.tcldefs.sh \ + bin/pgtclsh/mkMakefile.tkdefs.sh + -$(MAKE) -C pl distclean + -$(MAKE) -C test clean + rm -f test/regress/GNUmakefile + -$(MAKE) -C ../contrib/spi clean + rm -f Makefile.port \ + include/config.h include/dynloader.h \ + include/os.h include/version.h \ Makefile.global \ - backend/port/Makefile \ - backend/catalog/genbki.sh \ - backend/utils/Gen_fmgrtab.sh \ - bin/pg_dump/Makefile \ - bin/pg_version/Makefile \ - bin/psql/Makefile \ - bin/pgtclsh/mkMakefile.tcldefs.sh \ - bin/pgtclsh/mkMakefile.tkdefs.sh \ - include/version.h \ - interfaces/libpq/Makefile \ - interfaces/ecpg/lib/Makefile \ - interfaces/ecpg/preproc/Makefile \ - interfaces/libpq++/Makefile \ - interfaces/libpgeasy/Makefile \ - interfaces/libpgtcl/Makefile \ - interfaces/odbc/GNUmakefile \ - interfaces/odbc/Makefile.global \ - pl/plpgsql/src/Makefile \ - pl/plpgsql/src/mklang.sql \ - pl/tcl/mkMakefile.tcldefs.sh \ - test/regress/GNUmakefile + GNUmakefile .DEFAULT: $(MAKE) -C utils $@ @@ -113,4 +94,3 @@ BACKUP: .PHONY: TAGS .PHONY: BACKUP - diff --git a/src/Makefile b/src/Makefile deleted file mode 100644 index 8fbbcbdac2..0000000000 --- a/src/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# The Postgres make files exploit features of GNU make that other makes -# do not have. Because it is a common mistake for users to try to build -# Postgres with a different make, we have this make file that does nothing -# but tell the user to use GNU make. - -# If the user were using GNU make now, this file would not get used because -# GNU make uses a make file named "GNUmakefile" in preference to "Makefile" -# if it exists. Postgres is shipped with a "GNUmakefile". - -all install clean dep depend distclean: - @echo "You must use GNU make to use Postgres. It may be installed" - @echo "on your system with the name 'gmake'." - @echo - @echo "NOTE: If you are sure that you are using GNU make and you are" - @echo " still getting this message, you may simply need to run" - @echo " the configure program." diff --git a/src/Makefile.global.in b/src/Makefile.global.in index db3a323345..82f148462d 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -7,7 +7,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.75 2000/05/29 05:44:32 tgl Exp $ +# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.76 2000/06/10 18:01:36 petere Exp $ # # NOTES # Essentially all Postgres make files include this file and use the @@ -78,11 +78,6 @@ LIBDIR= $(POSTGRESDIR)/lib # TEMPLATEDIR= $(POSTGRESDIR)/lib -# This is the directory where IPC utilities ipcs and ipcrm are located -# -IPCS=@ipcs@ -IPCRM=@ipcrm@ - # Where the man pages (suitable for use with "man") get installed. POSTMANDIR= $(POSTGRESDIR)/man @@ -155,13 +150,6 @@ USE_TCL= @USE_TCL@ USE_TK= @USE_TK@ WISH= @WISH@ -USE_PERL= @USE_PERL@ -PERL= @PERL@ - -# -# enable native odbc driver support -USE_ODBC= @USE_ODBC@ - X_CFLAGS= @X_CFLAGS@ X_LIBS= @X_LIBS@ X11_LIBS= -lX11 @X_EXTRA_LIBS@ @@ -204,7 +192,6 @@ BACKSLASH_C= @BACKSLASH_C@ #------------------------------------------------------------- CC= @CC@ CPP= @CPP@ -YFLAGS= @YFLAGS@ YACC= @YACC@ LEX= @LEX@ AROPT= @AROPT@ diff --git a/src/bin/psql/Makefile.in b/src/bin/psql/Makefile.in index 4fa6a4f137..b1d8ecfd6d 100644 --- a/src/bin/psql/Makefile.in +++ b/src/bin/psql/Makefile.in @@ -7,7 +7,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/bin/psql/Attic/Makefile.in,v 1.24 2000/05/11 17:46:35 momjian Exp $ +# $Header: /cvsroot/pgsql/src/bin/psql/Attic/Makefile.in,v 1.25 2000/06/10 18:01:45 petere Exp $ # #------------------------------------------------------------------------- @@ -15,6 +15,7 @@ SRCDIR= ../.. include $(SRCDIR)/Makefile.global DOCDIR= $(SRCDIR)/../doc/src/sgml/ref +PERL = @PERL@ CFLAGS+= -I$(LIBPQDIR) diff --git a/src/interfaces/Makefile b/src/interfaces/Makefile deleted file mode 100644 index 3283f550db..0000000000 --- a/src/interfaces/Makefile +++ /dev/null @@ -1,65 +0,0 @@ -#------------------------------------------------------------------------- -# -# Makefile.inc-- -# Makefile for src/bin (utility programs) -# -# Copyright (c) 1994, Regents of the University of California -# -# -# IDENTIFICATION -# $Header: /cvsroot/pgsql/src/interfaces/Makefile,v 1.38 2000/04/26 09:03:10 wieck Exp $ -# -#------------------------------------------------------------------------- - -SRCDIR= .. -include $(SRCDIR)/Makefile.global - - -# Note: the klugery for perl5 is to ensure that the perl5 shared lib -# gets built with the correct path to the installed location of libpq -# during "make install", but is built against the local tree during -# ordinary building and testing. During install, we must also guard -# against the likelihood that we don't have permissions to install into -# the Perl module library. - -.DEFAULT all install clean dep depend distclean: - $(MAKE) -C libpq $@ - $(MAKE) -C ecpg $@ -ifeq ($(HAVE_Cplusplus), true) - $(MAKE) -C libpq++ $@ -else - echo $(HAVE_Cplusplus): No C++ -endif - $(MAKE) -C libpgeasy $@ -ifeq ($(USE_TCL), true) - $(MAKE) -C libpgtcl $@ -endif -ifeq ($(USE_PERL), true) - if [ "$@" = "install" ]; then \ - $(MAKE) $(MFLAGS) install-perl5; \ - else \ - $(MAKE) $(MFLAGS) perl5/Makefile; \ - $(MAKE) $(MFLAGS) -C perl5 $@; \ - fi -endif -ifeq ($(USE_ODBC), true) - $(MAKE) -C odbc $@ -endif - -perl5/Makefile: perl5/Makefile.PL - cd perl5 && $(PERL) Makefile.PL POLLUTE=1 - -install-perl5: perl5/Makefile - $(MAKE) -C perl5 clean - cd perl5 && POSTGRES_HOME="$(POSTGRESDIR)" $(PERL) Makefile.PL POLLUTE=1 - $(MAKE) -C perl5 all - -@if [ -w `$(MAKE) --quiet -C perl5 echo-installdir` ]; then \ - $(MAKE) $(MFLAGS) -C perl5 install; \ - rm -f perl5/Makefile; \ - else \ - echo "Skipping install of Perl module for lack of permissions."; \ - echo "To install it, cd into interfaces/perl5, su to become the"; \ - echo "appropriate user, and do '$(MAKE) install'."; \ - fi - -.PHONY: install-perl5 diff --git a/src/interfaces/Makefile.in b/src/interfaces/Makefile.in new file mode 100644 index 0000000000..549eef42b9 --- /dev/null +++ b/src/interfaces/Makefile.in @@ -0,0 +1,65 @@ +#------------------------------------------------------------------------- +# +# Makefile for src/interfaces +# +# Copyright (c) 1994, Regents of the University of California +# +# $Header: /cvsroot/pgsql/src/interfaces/Attic/Makefile.in,v 1.1 2000/06/10 18:01:48 petere Exp $ +# +#------------------------------------------------------------------------- + +srcdir = @srcdir@ +VPATH = @srcdir@ + +top_srcdir = @top_srcdir@ +top_builddir = ../.. + +USE_TCL = @USE_TCL@ +USE_ODBC = @USE_ODBC@ +WITH_CXX = @HAVECXX@ +with_perl = @with_perl@ +with_python = @with_python@ + +all install clean dep depend: + $(MAKE) -C libpq $@ + $(MAKE) -C ecpg $@ +ifeq ($(WITH_CXX), true) + $(MAKE) -C libpq++ $@ +endif + $(MAKE) -C libpgeasy $@ +ifeq ($(USE_TCL), true) + $(MAKE) -C libpgtcl $@ +endif +ifeq ($(with_perl), yes) + $(MAKE) -C perl5 $@ +endif +ifeq ($(with_python), yes) + $(MAKE) -C python $@ +endif +ifeq ($(USE_ODBC), true) + $(MAKE) -C odbc $@ +endif + +distclean maintainer-clean: clean +ifeq ($(with_perl), yes) + -$(MAKE) -C perl5 $@ +endif +ifeq ($(with_python), yes) + -$(MAKE) -C python $@ +endif + rm -f Makefile \ + libpq/Makefile \ + ecpg/lib/Makefile \ + ecpg/preproc/Makefile \ + libpq++/Makefile \ + libpgeasy/Makefile \ + libpgtcl/Makefile \ + odbc/GNUmakefile \ + odbc/Makefile.global \ + odbc/port \ + odbc/makefiles \ + odbc/template \ + odbc/config.h + + +.PHONY: all install dep depend clean distclean maintainer-clean diff --git a/src/interfaces/perl5/GNUmakefile.in b/src/interfaces/perl5/GNUmakefile.in new file mode 100644 index 0000000000..29bd818ee6 --- /dev/null +++ b/src/interfaces/perl5/GNUmakefile.in @@ -0,0 +1,71 @@ +# This file is an interface from the Autoconf world to Perl's +# MakeMaker world, so that the latter behaves (kind of) like the +# former would prefer. Internally, we call Perl to create another +# Makefile according to it's own ideas and then invoke the rules from +# that file. +# +# $Header: /cvsroot/pgsql/src/interfaces/perl5/Attic/GNUmakefile.in,v 1.1 2000/06/10 18:01:56 petere Exp $ + +srcdir = @srcdir@ +VPATH = @srcdir@ + +top_srcdir = @top_srcdir@ +top_builddir = ../../.. + +PERL = @PERL@ + +prefix = @prefix@ +exec_prefix = @exec_prefix@ +libdir = @libdir@ +includedir = @includedir@ + + +all: Makefile libpq-all + $(MAKE) -f $< all + +Makefile: Makefile.PL + $(PERL) $< POLLUTE=1 + +libpq-all: + $(MAKE) -C $(top_builddir)/src/interfaces/libpq all + +# The klugery here is to ensure that the perl5 shared library gets +# built with the correct path to the installed location of libpq +# during `make install', but is built against the local tree during +# ordinary building and testing. +# +# During install, we must also guard against the likelihood that we +# don't have permissions to install into the Perl module library. The +# purer alternative would naturally be the ability to select the +# installation directory somewhere. + +install: Makefile libpq-install + $(MAKE) -f Makefile clean + POSTGRES_LIB="$(libdir)" \ + POSTGRES_INCLUDE="$(includedir)" \ + $(PERL) $(srcdir)/Makefile.PL POLLUTE=1 + $(MAKE) -f Makefile all + -@if [ -w "`$(MAKE) --quiet -f Makefile echo-installdir`" ]; then \ + $(MAKE) -f Makefile install; \ + rm -f Makefile; \ + else \ + echo "*****" ;\ + echo "* Skipping the installation of the Perl module for lack of permissions."; \ + echo "* To install it, change to the directory "`pwd`","; \ + echo "* become the appropriate user, and do \`$(MAKE) install'."; \ + echo "*****"; \ + fi + +libpq-install: + $(MAKE) -C $(top_builddir)/src/interfaces/libpq install + +# Note: Perl's idea of "clean" is a little different, so we use "realclean" + +clean: + -[ -f Makefile ] && $(MAKE) -f Makefile realclean + +distclean maintainer-clean: clean + rm -f GNUmakefile + + +.PHONY: all install clean distclean maintainer-clean libpq-all libpq-install diff --git a/src/interfaces/perl5/Makefile.PL b/src/interfaces/perl5/Makefile.PL index d63c7e7ad5..4d5b1e33f1 100644 --- a/src/interfaces/perl5/Makefile.PL +++ b/src/interfaces/perl5/Makefile.PL @@ -1,6 +1,6 @@ #------------------------------------------------------- # -# $Id: Makefile.PL,v 1.15 2000/04/23 04:26:32 tgl Exp $ +# $Id: Makefile.PL,v 1.16 2000/06/10 18:01:56 petere Exp $ # # Copyright (c) 1997, 1998 Edmund Mergl # @@ -12,14 +12,14 @@ use strict; my %opts; -if (! $ENV{POSTGRES_HOME}) { +if (! $ENV{POSTGRES_LIB} || ! $ENV{POSTGRES_INCLUDE}) { # Check that we actually are inside the Postgres source tree if (! -d "../libpq") { die -"To install Pg separately from the Postgres distribution, -you must set environment variable POSTGRES_HOME to point to -where Postgres is installed (often /usr/local/pgsql).\n"; +"To install Pg separately from the Postgres distribution, you must +set environment variables POSTGRES_LIB and POSTGRES_INCLUDE to point +to where Postgres is installed (often /usr/local/pgsql/{lib,include}).\n"; } # Setup for build/test inside a Postgres source tree @@ -44,9 +44,9 @@ where Postgres is installed (often /usr/local/pgsql).\n"; %opts = ( NAME => 'Pg', VERSION_FROM => 'Pg.pm', - INC => "-I$ENV{POSTGRES_HOME}/include", + INC => "-I$ENV{POSTGRES_INCLUDE}", OBJECT => "Pg\$(OBJ_EXT)", - LIBS => ["-L$ENV{POSTGRES_HOME}/lib -lpq"], + LIBS => ["-L$ENV{POSTGRES_LIB} -lpq"], ); } @@ -57,7 +57,7 @@ WriteMakefile(%opts); sub MY::installbin { q[ -# Create a target that interfaces/Makefile can use to +# Create a target that can be used to # determine the Perl install directory. echo-installdir: @echo $(INSTALLSITELIB) diff --git a/src/interfaces/python/GNUmakefile.in b/src/interfaces/python/GNUmakefile.in new file mode 100644 index 0000000000..2dd40954e3 --- /dev/null +++ b/src/interfaces/python/GNUmakefile.in @@ -0,0 +1,74 @@ +#------------------------------------------------------------------- +# +# Makefile for src/interfaces/python, a.k.a. "PyGreSQL" +# +# Written by Peter Eisentraut +# +# $Header: /cvsroot/pgsql/src/interfaces/python/Attic/GNUmakefile.in,v 1.1 2000/06/10 18:02:00 petere Exp $ +# +#------------------------------------------------------------------- + +srcdir = @srcdir@ +VPATH = @srcdir@ + +top_srcdir = @top_srcdir@ +top_builddir = ../../.. + + +prefix = @prefix@ +exec_prefix = @exec_prefix@ +libdir = @libdir@ +includedir = @includedir@ + +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ + +LIBS = @LIBS@ + +PYTHON = @PYTHON@ +python_extmakefile = @python_extmakefile@ +python_moduledir = @python_moduledir@ + + +all: Makefile pgmodule.c libpq-all + $(MAKE) -f Makefile + +libpq-all: + $(MAKE) -C $(top_builddir)/src/interfaces/libpq all + +Makefile: Setup.in Makefile.pre.in + $(MAKE) -f Makefile.pre.in boot srcdir=$(srcdir) VPATH=$(srcdir) + +Makefile.pre.in: $(python_extmakefile) + cp $< $@ + +Setup.in: Setup.in.raw + sed -e "s%__LIBPQ__%${top_srcdir}/src/interfaces/libpq%g" \ + -e "s%__EXTRA_LIBS__%${LIBS}%g" \ + -e "s%__INCLUDES__%${top_srcdir}/src/include%g" \ + < $< > $@ + +install: all + @echo "Installing Python module" + @if ! ( $(INSTALL_DATA) pg.py $(python_moduledir) && \ + $(MAKE) -f Makefile install ); then \ + echo "*****" ;\ + echo "* Skipping the installation of the Python interface module for lack"; \ + echo "* of permissions. To install it, change to the directory"; \ + echo "* "`pwd`", become the appropriate"; \ + echo "* user, and do \`$(MAKE) install'."; \ + echo "*****"; \ + fi + + +# Python sometimes has a different idea what exactly "clean" is. + +clean: + -[ -f Makefile ] && $(MAKE) -f Makefile clobber + rm -f Makefile.pre.in Makefile Setup Setup.in + +distclean maintainer-clean: clean + rm -f GNUmakefile + + +.PHONY: all libpq-all install clean distclean maintainer-clean diff --git a/src/interfaces/python/Setup.in.raw b/src/interfaces/python/Setup.in.raw new file mode 100644 index 0000000000..dddb558810 --- /dev/null +++ b/src/interfaces/python/Setup.in.raw @@ -0,0 +1,3 @@ +*shared* + +_pg pgmodule.c -I__LIBPQ__ -I__INCLUDES__ -L__LIBPQ__ -lpq __EXTRA_LIBS__ diff --git a/src/interfaces/python/pgmodule.c b/src/interfaces/python/pgmodule.c index 03424b805c..967ac53600 100644 --- a/src/interfaces/python/pgmodule.c +++ b/src/interfaces/python/pgmodule.c @@ -680,7 +680,7 @@ static char connect__doc__[] = static PyObject * pgconnect(pgobject * self, PyObject * args, PyObject * dict) { - static const char *kwlist[] = {"dbname", "host", "port", "opt", + static char *kwlist[] = {"dbname", "host", "port", "opt", "tty", "user", "passwd", NULL}; char *pghost, *pgopt, diff --git a/src/pl/Makefile b/src/pl/Makefile deleted file mode 100644 index 1ddf4c4967..0000000000 --- a/src/pl/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -#------------------------------------------------------------------------- -# -# Makefile -# Makefile for src/pl (procedural languages) -# -# Copyright (c) 1994, Regents of the University of California -# -# -# IDENTIFICATION -# $Header: /cvsroot/pgsql/src/pl/Makefile,v 1.7 2000/04/11 17:42:28 momjian Exp $ -# -#------------------------------------------------------------------------- - -SRCDIR= .. -include $(SRCDIR)/Makefile.global - - -.DEFAULT all install clean dep depend distclean: - $(MAKE) -C plpgsql $@ -ifeq ($(USE_TCL), true) - $(MAKE) -C tcl $@ -endif -# does't work bjm 2000-04-11 -#ifeq ($(USE_PERL), true) -# -$(MAKE) $(MFLAGS) plperl/Makefile -# -$(MAKE) $(MFLAGS) -C plperl $@ -#endif - -plperl/Makefile: plperl/Makefile.PL - cd plperl && $(PERL) Makefile.PL POLLUTE=1 diff --git a/src/pl/Makefile.in b/src/pl/Makefile.in new file mode 100644 index 0000000000..74b87dcf1b --- /dev/null +++ b/src/pl/Makefile.in @@ -0,0 +1,42 @@ +#------------------------------------------------------------------------- +# +# Makefile for src/pl (procedural languages) +# +# Copyright (c) 1994, Regents of the University of California +# +# $Header: /cvsroot/pgsql/src/pl/Attic/Makefile.in,v 1.1 2000/06/10 18:02:09 petere Exp $ +# +#------------------------------------------------------------------------- + +srcdir = @srcdir@ +VPATH = @srcdir@ + +top_srcdir = @top_srcdir@ +top_builddir = ../.. + +with_perl = @with_perl@ +USE_TCL = @USE_TCL@ + +all install clean: + $(MAKE) -C plpgsql $@ +ifeq ($(USE_TCL), true) + $(MAKE) -C tcl $@ +endif +# Disabled because it doesn't work +#ifeq ($(with_perl), yes) +# $(MAKE) -C plperl $@ +#endif + + +distclean maintainer-clean: + -$(MAKE) -C plpgsql clean + rm -f plpgsql/src/Makefile plpgsql/src/mklang.sql +ifeq ($(USE_TCL), true) + $(MAKE) -C tcl clean +endif + rm -f tcl/mkMakefile.tcldefs.sh + -$(MAKE) -C plperl $@ + rm -f Makefile + + +.PHONY: all install clean distclean maintainer-clean diff --git a/src/pl/plperl/GNUmakefile.in b/src/pl/plperl/GNUmakefile.in new file mode 100644 index 0000000000..a040b87cb3 --- /dev/null +++ b/src/pl/plperl/GNUmakefile.in @@ -0,0 +1,40 @@ +# $Header: /cvsroot/pgsql/src/pl/plperl/Attic/GNUmakefile.in,v 1.1 2000/06/10 18:02:11 petere Exp $ + +srcdir = @srcdir@ +VPATH = @srcdir@ + +top_srcdir = @top_srcdir@ +top_builddir = ../../.. + +prefix = @prefix@ +exec_prefix = @exec_prefix@ +libdir = @libdir@ + +plperl_installdir = $(libdir) + +mkinstalldirs = @mkinstalldirs@ +PERL = @PERL@ +PGSQL_INCLUDES = @PGSQL_INCLUDES@ + +all: Makefile + $(MAKE) -f $< all + +Makefile: Makefile.PL + @plperl_installdir='$(plperl_installdir)' \ + EXTRA_INCLUDES='-I$(top_srcdir)/src/include $(PGSQL_INCLUDES)' \ + $(PERL) $< POLLUTE=1 + +install: Makefile installdirs + $(MAKE) -f $< install + +installdirs: + $(mkinstalldirs) $(plperl_installdir) + +clean: + -[ -f Makefile ] && $(MAKE) -f Makefile realclean + +distclean maintainer-clean: clean + rm -f GNUmakefile + + +.PHONY: all install installdirs clean distclean maintainer-clean diff --git a/src/pl/plperl/Makefile.PL b/src/pl/plperl/Makefile.PL index a5b6066b08..a01084bc38 100644 --- a/src/pl/plperl/Makefile.PL +++ b/src/pl/plperl/Makefile.PL @@ -15,12 +15,14 @@ if ($Config{'useshrplib'} ne 'true') { # Dummy Makefile for use when we can't build plperl all install: - @echo "Cannot build plperl because libperl is not a shared library; skipping it." + @echo "*****"; \ + echo "* Cannot build PL/Perl because libperl is not a shared library." ; \ + echo "* Skipped."; \ + echo "*****" -clean distclean: - rm -f Makefile -.DEFAULT dep depend: +clean realclean: + rm -f Makefile EndOfMakefile close(OUT); @@ -54,19 +56,11 @@ my $perllib = "-L$Config{archlibexp}/CORE -lperl"; WriteMakefile( 'NAME' => 'plperl', dynamic_lib => { 'OTHERLDFLAGS' => "$opcode $perllib" } , - INC => '-I$(SRCDIR)/include $(PGSQL_INCLUDES)', + INC => "$ENV{EXTRA_INCLUDES}", XS => { 'SPI.xs' => 'SPI.c' }, OBJECT => 'plperl.o eloglvl.o SPI.o', ); -sub MY::post_initialize { - -q[ -SRCDIR=../../../src -include $(SRCDIR)/Makefile.global -]; - -} sub MY::cflags { package MY; # so that "SUPER" works right @@ -88,9 +82,9 @@ sub MY::cflags { sub MY::install { -q[ +qq[ install :: all - cp $(INST_DYNAMIC) $(LIBDIR) + cp \$(INST_DYNAMIC) $ENV{plperl_installdir} ]; } -- 2.40.0