From c18bb990d3172b9e11671633975d2505b49aa661 Mon Sep 17 00:00:00 2001 From: Peter Mount Date: Mon, 5 Mar 2001 09:40:02 +0000 Subject: [PATCH] Ok, I've split todays commit into three, the first two already done had some bits in JDBC & the first set of tools into contrib. This is the third, and deals with enabling JDBC to be compiled with the main source. What it does is add a new option to configure: --with-java This option tells configure to look for ant (our build tool of choice) and if found, it then compiles both the JDBC driver and the new tools as part of the normal make. Also, when the postgresql install is done, all the .jar files are also installed into the ${PGLIB}/java directory (thought best to keep then separate) Now I had some conflicts when this applied so could someone please double check that everything is ok? Peter --- aclocal.m4 | 3 +- build.xml | 3 +- configure | 967 ++++++++++++++++++++-------------- configure.in | 22 + src/Makefile.global.in | 4 +- src/interfaces/Makefile | 8 +- src/interfaces/jdbc/CHANGELOG | 10 + src/interfaces/jdbc/Makefile | 450 +--------------- src/interfaces/jdbc/build.xml | 5 +- src/interfaces/jdbc/jdbc.jpx | 2 +- 10 files changed, 642 insertions(+), 832 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 7708287781..f5523dd86a 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,10 +1,11 @@ -dnl $Header: /cvsroot/pgsql/aclocal.m4,v 1.11 2000/11/05 21:04:05 petere Exp $ +dnl $Header: /cvsroot/pgsql/aclocal.m4,v 1.12 2001/03/05 09:38:54 peter Exp $ builtin([include], [config/ac_func_accept_argtypes.m4]) builtin([include], [config/c-compiler.m4]) builtin([include], [config/c-library.m4]) builtin([include], [config/cxx.m4]) builtin([include], [config/docbook.m4]) builtin([include], [config/general.m4]) +builtin([include], [config/java.m4]) builtin([include], [config/libtool.m4]) builtin([include], [config/programs.m4]) builtin([include], [config/python.m4]) diff --git a/build.xml b/build.xml index c359e97ee4..c7f153018d 100644 --- a/build.xml +++ b/build.xml @@ -12,7 +12,7 @@ detect the presence of both the JDK and ANT, and if both are found to build the jdbc driver and utils with the rest of postgresql. - $Id: build.xml,v 1.1 2001/01/18 14:50:14 peter Exp $ + $Id: build.xml,v 1.2 2001/03/05 09:38:54 peter Exp $ --> @@ -90,5 +90,6 @@ e.g. + diff --git a/configure b/configure index fd51ec89a1..95e1f18945 100755 --- a/configure +++ b/configure @@ -1,5 +1,107 @@ #! /bin/sh + +#AC_DEFUN([PGAC_PROG_ANT],[AC_CHECK_PROG(ANT, ant, ant) +#]) + + +## libtool.m4 - Configure libtool for the host system. -*-Shell-script-*- +## Copyright (C) 1996-1999,2000 Free Software Foundation, Inc. +## Originally by Gordon Matzigkeit , 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 of the License, or +## (at your option) any later version. +## +## This program is distributed in the hope that it will be useful, but +## WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +## General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with this program; if not, write to the Free Software +## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## As a special exception to the GNU General Public License, if you +## distribute this file as part of a program that contains a +## configuration script generated by Autoconf, you may include it under +## the same distribution terms that you use for the rest of that program. + +# No, PostgreSQL doesn't use libtool (yet), we just borrow stuff from it. +# This file was taken on 2000-10-20 from the multi-language branch (since +# that is the branch that PostgreSQL would most likely adopt anyway). +# --petere + +# ... bunch of stuff removed here ... + +# AC_PROG_LD - find the path to the GNU or non-GNU linker + + + + +# ... more stuff removed ... + +# $Header: /cvsroot/pgsql/configure,v 1.112 2001/03/05 09:38:55 peter Exp $ + + +# PGAC_PATH_FLEX +# -------------- +# Look for Flex, set the output variable FLEX to its path if found. +# Avoid the buggy version 2.5.3. Also find Flex if its installed +# under `lex', but do not accept other Lex programs. + +# PGAC_PATH_FLEX + + + +# PGAC_CHECK_READLINE +# ------------------- +# Check for the readline library and dependent libraries, either +# termcap or curses. Also try libedit, since NetBSD's is compatible. +# Add the required flags to LIBS, define HAVE_LIBREADLINE. + +# PGAC_CHECK_READLINE + +# +# Autoconf macros for configuring the build of Python extension modules +# +# $Header: /cvsroot/pgsql/configure,v 1.112 2001/03/05 09:38:55 peter Exp $ +# + +# PGAC_PROG_PYTHON +# ---------------- +# Look for Python and set the output variable `PYTHON' +# to `python' if found, empty otherwise. + + + +# 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. +# PGAC_PATH_PYTHONDIR + +# $Header: /cvsroot/pgsql/configure,v 1.112 2001/03/05 09:38:55 peter Exp $ + +# Autoconf macros to check for Tcl related things + + + + + +# PGAC_PATH_TCLCONFIGSH([SEARCH-PATH]) +# ------------------------------------ +# PGAC_PATH_TCLCONFIGSH + + +# PGAC_PATH_TKCONFIGSH([SEARCH-PATH]) +# ------------------------------------ +# PGAC_PATH_TKCONFIGSH + # Guess values for system-dependent variables and create Makefiles. # Generated automatically using autoconf version 2.13 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. @@ -52,6 +154,8 @@ ac_help="$ac_help --with-perl build Perl interface and PL/Perl" ac_help="$ac_help --with-python build Python interface module" +ac_help="$ac_help + --with-java build JDBC interface & Java tools" ac_help="$ac_help --with-krb4[=DIR] build with Kerberos 4 support [/usr/athena]" ac_help="$ac_help @@ -623,7 +727,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:627: checking host system type" >&5 +echo "configure:731: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -649,7 +753,7 @@ echo "$ac_t""$host" 1>&6 template= echo $ac_n "checking which template to use""... $ac_c" 1>&6 -echo "configure:653: checking which template to use" >&5 +echo "configure:757: checking which template to use" >&5 # Check whether --with-template was given if test x"${with_template+set}" = xset; then @@ -812,7 +916,7 @@ fi # Locale (--enable-locale) # echo $ac_n "checking whether to build with locale support""... $ac_c" 1>&6 -echo "configure:816: checking whether to build with locale support" >&5 +echo "configure:920: checking whether to build with locale support" >&5 # Check whether --enable-locale was given if test x"${enable_locale+set}" = xset; then case $enable_locale in @@ -841,7 +945,7 @@ echo "$ac_t""$enable_locale" 1>&6 # Character set recode (--enable-recode) # echo $ac_n "checking whether to build with recode support""... $ac_c" 1>&6 -echo "configure:845: checking whether to build with recode support" >&5 +echo "configure:949: checking whether to build with recode support" >&5 # Check whether --enable-recode was given if test x"${enable_recode+set}" = xset; then case $enable_recode in @@ -871,7 +975,7 @@ echo "$ac_t""$enable_recode" 1>&6 # MULTIBYTE= echo $ac_n "checking whether to build with multibyte character support""... $ac_c" 1>&6 -echo "configure:875: checking whether to build with multibyte character support" >&5 +echo "configure:979: checking whether to build with multibyte character support" >&5 # Check whether --enable-multibyte was given if test x"${enable_multibyte+set}" = xset; then @@ -923,7 +1027,7 @@ fi # Unicode conversion (--enable-unicode-conversion) # echo $ac_n "checking whether to build with Unicode conversion support""... $ac_c" 1>&6 -echo "configure:927: checking whether to build with Unicode conversion support" >&5 +echo "configure:1031: checking whether to build with Unicode conversion support" >&5 # Check whether --enable-unicode-conversion was given if test x"${enable_unicode_conversion+set}" = xset; then case $enable_unicode_conversion in @@ -954,7 +1058,7 @@ echo "$ac_t""$enable_unicode_conversion" 1>&6 # Default port number (--with-pgport), default 5432 # echo $ac_n "checking for default port number""... $ac_c" 1>&6 -echo "configure:958: checking for default port number" >&5 +echo "configure:1062: checking for default port number" >&5 # Check whether --with-pgport was given if test x"${with_pgport+set}" = xset; then case $with_pgport in @@ -988,7 +1092,7 @@ EOF # Maximum number of allowed connections (--with-maxbackends), default 32 # echo $ac_n "checking for default soft limit on number of connections""... $ac_c" 1>&6 -echo "configure:992: checking for default soft limit on number of connections" >&5 +echo "configure:1096: checking for default soft limit on number of connections" >&5 # Check whether --with-maxbackends was given if test x"${with_maxbackends+set}" = xset; then case $with_maxbackends in @@ -1112,7 +1216,7 @@ save_CFLAGS=$CFLAGS # 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:1116: checking for $ac_word" >&5 +echo "configure:1220: 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 @@ -1142,7 +1246,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:1146: checking for $ac_word" >&5 +echo "configure:1250: 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 @@ -1193,7 +1297,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:1197: checking for $ac_word" >&5 +echo "configure:1301: 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 @@ -1225,7 +1329,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1229: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1333: 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. @@ -1236,12 +1340,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1240 "configure" +#line 1344 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1349: \"$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 @@ -1267,12 +1371,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:1271: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1375: 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:1276: checking whether we are using GNU C" >&5 +echo "configure:1380: 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 @@ -1281,7 +1385,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1285: \"$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:1389: \"$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 @@ -1300,7 +1404,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:1304: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1408: 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 @@ -1343,7 +1447,7 @@ fi echo "using CFLAGS=$CFLAGS" # Check if the compiler still works with the template settings echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1347: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1451: 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. @@ -1354,12 +1458,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1358 "configure" +#line 1462 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1467: \"$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 @@ -1385,17 +1489,17 @@ 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:1389: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1493: 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 for Cygwin environment""... $ac_c" 1>&6 -echo "configure:1394: checking for Cygwin environment" >&5 +echo "configure:1498: checking for Cygwin environment" >&5 if eval "test \"`echo '$''{'ac_cv_cygwin'+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:1514: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -1423,19 +1527,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6 CYGWIN= test "$ac_cv_cygwin" = yes && CYGWIN=yes echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:1427: checking for mingw32 environment" >&5 +echo "configure:1531: checking for mingw32 environment" >&5 if eval "test \"`echo '$''{'ac_cv_mingw32'+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:1543: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -1454,7 +1558,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=yes echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1458: checking for executable suffix" >&5 +echo "configure:1562: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1464,7 +1568,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -1485,7 +1589,7 @@ echo "$ac_t""${ac_cv_exeext}" 1>&6 ac_exeext=$EXEEXT echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1489: checking how to run the C preprocessor" >&5 +echo "configure:1593: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1500,13 +1604,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:1510: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1614: \"$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 : @@ -1517,13 +1621,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:1527: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1631: \"$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 : @@ -1534,13 +1638,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:1544: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1648: \"$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 : @@ -1566,13 +1670,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:1570: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:1674: 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 @@ -1590,7 +1694,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -1712,7 +1816,7 @@ IFS=$ac_save_IFS # Tcl/Tk # echo $ac_n "checking whether to build with Tcl""... $ac_c" 1>&6 -echo "configure:1716: checking whether to build with Tcl" >&5 +echo "configure:1820: checking whether to build with Tcl" >&5 # Check whether --with-tcl was given if test x"${with_tcl+set}" = xset; then case $with_tcl in @@ -1736,7 +1840,7 @@ echo "$ac_t""$with_tcl" 1>&6 # If Tcl is enabled (above) then Tk is also, unless the user disables it using --without-tk echo $ac_n "checking whether to build with Tk""... $ac_c" 1>&6 -echo "configure:1740: checking whether to build with Tk" >&5 +echo "configure:1844: checking whether to build with Tk" >&5 if test "$with_tcl" = yes; then # Check whether --with-tk was given if test x"${with_tk+set}" = xset; then @@ -1798,7 +1902,7 @@ fi # Optionally build Perl modules (Pg.pm and PL/Perl) # echo $ac_n "checking whether to build Perl modules""... $ac_c" 1>&6 -echo "configure:1802: checking whether to build Perl modules" >&5 +echo "configure:1906: checking whether to build Perl modules" >&5 # Check whether --with-perl was given if test x"${with_perl+set}" = xset; then case $with_perl in @@ -1825,7 +1929,7 @@ echo "$ac_t""$with_perl" 1>&6 # Optionally build Python interface module # echo $ac_n "checking whether to build Python modules""... $ac_c" 1>&6 -echo "configure:1829: checking whether to build Python modules" >&5 +echo "configure:1933: checking whether to build Python modules" >&5 # Check whether --with-python was given if test x"${with_python+set}" = xset; then case $with_python in @@ -1834,7 +1938,7 @@ if test x"${with_python+set}" = xset; then # 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:1838: checking for $ac_word" >&5 +echo "configure:1942: 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 @@ -1870,7 +1974,7 @@ if test "${PYTHON+set}" = set ; then python_extmakefile="${python_configdir}/Makefile.pre.in" echo $ac_n "checking for Python extension makefile""... $ac_c" 1>&6 -echo "configure:1874: checking for Python extension makefile" >&5 +echo "configure:1978: checking for Python extension makefile" >&5 if test -f "${python_extmakefile}" ; then echo "$ac_t""found" 1>&6 else @@ -1903,6 +2007,70 @@ echo "$ac_t""no" 1>&6 fi +# +# Optionally build the Java/JDBC tools +# +echo $ac_n "checking whether to build Java/JDBC tools""... $ac_c" 1>&6 +echo "configure:2015: checking whether to build Java/JDBC tools" >&5 +# Check whether --with-java was given +if test x"${with_java+set}" = xset; then + case $with_java in + yes) + echo "$ac_t""yes" 1>&6 +for ac_prog in ant ant.sh ant.bat +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:2026: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_ANT'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + case "$ANT" in + /*) + ac_cv_path_ANT="$ANT" # Let the user override the test with a path. + ;; + ?:/*) + ac_cv_path_ANT="$ANT" # Let the user override the test with a dos path. + ;; + *) + 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_path_ANT="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + ;; +esac +fi +ANT="$ac_cv_path_ANT" +if test -n "$ANT"; then + echo "$ac_t""$ANT" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$ANT" && break +done + + ;; + no) + echo "$ac_t""no" 1>&6 + ;; + *) + withval=$with_java + { echo "configure: error: no argument expected for --with-java option" 1>&2; exit 1; } + ;; + esac # $with_java +else + with_java=no +echo "$ac_t""no" 1>&6 +fi + # @@ -2080,7 +2248,7 @@ if test "${with_odbc+set}" = set && test "${enable_odbc+set}" != set; then fi echo $ac_n "checking whether to build the ODBC driver""... $ac_c" 1>&6 -echo "configure:2084: checking whether to build the ODBC driver" >&5 +echo "configure:2252: checking whether to build the ODBC driver" >&5 # Check whether --enable-odbc was given if test x"${enable_odbc+set}" = xset; then case $enable_odbc in @@ -2133,7 +2301,7 @@ case $host_os in esac cat > conftest.$ac_ext <&6 -echo "configure:2166: checking whether to build C++ modules" >&5 +echo "configure:2334: checking whether to build C++ modules" >&5 # Check whether --with-CXX was given if test x"${with_CXX+set}" = xset; then case $with_CXX in @@ -2195,7 +2363,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:2199: checking for $ac_word" >&5 +echo "configure:2367: 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 @@ -2227,7 +2395,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:2231: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:2399: 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. @@ -2238,12 +2406,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 2242 "configure" +#line 2410 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:2247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2415: \"$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 @@ -2269,12 +2437,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:2273: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:2441: 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:2278: checking whether we are using GNU C++" >&5 +echo "configure:2446: 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 @@ -2283,7 +2451,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2287: \"$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:2455: \"$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 @@ -2302,7 +2470,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:2306: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:2474: 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 @@ -2350,7 +2518,7 @@ fi echo "using CXXFLAGS=$CXXFLAGS" echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:2354: checking how to run the C++ preprocessor" >&5 +echo "configure:2522: checking how to run the C++ preprocessor" >&5 if test -z "$CXXCPP"; then if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2363,12 +2531,12 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2372: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2540: \"$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 : @@ -2403,17 +2571,17 @@ cross_compiling=$ac_cv_prog_cxx_cross ac_safe=`echo "string" | sed 'y%./+-%__p_%'` echo $ac_n "checking for string""... $ac_c" 1>&6 -echo "configure:2407: checking for string" >&5 +echo "configure:2575: checking for string" >&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:2417: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2585: \"$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* @@ -2440,12 +2608,12 @@ fi if test x"$ac_cv_header_string" != xyes ; then echo $ac_n "checking for class string in ""... $ac_c" 1>&6 -echo "configure:2444: checking for class string in " >&5 +echo "configure:2612: checking for class string in " >&5 if eval "test \"`echo '$''{'pgac_cv_class_string_in_string_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2455,7 +2623,7 @@ int main() { string foo = "test" ; return 0; } EOF -if { (eval echo configure:2459: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2627: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* pgac_cv_class_string_in_string_h=yes else @@ -2482,7 +2650,7 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking for namespace std in C++""... $ac_c" 1>&6 -echo "configure:2486: checking for namespace std in C++" >&5 +echo "configure:2654: checking for namespace std in C++" >&5 if eval "test \"`echo '$''{'pgac_cv_cxx_namespace_std'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2496,7 +2664,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext < #include @@ -2509,7 +2677,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2513: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2681: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* pgac_cv_cxx_namespace_std=yes else @@ -2564,7 +2732,7 @@ echo "using LDFLAGS=$LDFLAGS" # 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:2568: checking for a BSD compatible install" >&5 +echo "configure:2736: 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 @@ -2642,7 +2810,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:2646: checking for $ac_word" >&5 +echo "configure:2814: 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 @@ -2672,7 +2840,7 @@ test -n "$AWK" && break done echo $ac_n "checking for flex""... $ac_c" 1>&6 -echo "configure:2676: checking for flex" >&5 +echo "configure:2844: checking for flex" >&5 if eval "test \"`echo '$''{'pgac_cv_path_flex'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2737,7 +2905,7 @@ fi echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:2741: checking whether ln -s works" >&5 +echo "configure:2909: 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 @@ -2769,7 +2937,7 @@ ac_prog=ld if test "$ac_cv_prog_gcc" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:2773: checking for ld used by GCC" >&5 +echo "configure:2941: checking for ld used by GCC" >&5 case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -2799,10 +2967,10 @@ echo "configure:2773: checking for ld used by GCC" >&5 esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:2803: checking for GNU ld" >&5 +echo "configure:2971: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:2806: checking for non-GNU ld" >&5 +echo "configure:2974: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2837,7 +3005,7 @@ else fi test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:2841: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:3009: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2857,21 +3025,21 @@ with_gnu_ld=$ac_cv_prog_gnu_ld case $host_os in sysv5uw*) echo $ac_n "checking whether ld -R works""... $ac_c" 1>&6 -echo "configure:2861: checking whether ld -R works" >&5 +echo "configure:3029: checking whether ld -R works" >&5 if eval "test \"`echo '$''{'pgac_cv_prog_ld_R'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else pgac_save_LDFLAGS=$LDFLAGS; LDFLAGS="$LDFLAGS -Wl,-R/usr/lib" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* pgac_cv_prog_ld_R=yes else @@ -2892,7 +3060,7 @@ esac # 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:2896: checking for $ac_word" >&5 +echo "configure:3064: 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 @@ -2924,7 +3092,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:2928: checking for $ac_word" >&5 +echo "configure:3096: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LORDER'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2956,7 +3124,7 @@ done # 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:2960: checking for $ac_word" >&5 +echo "configure:3128: 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 @@ -2993,7 +3161,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:2997: checking for $ac_word" >&5 +echo "configure:3165: 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 @@ -3028,7 +3196,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:3032: checking for $ac_word" >&5 +echo "configure:3200: 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 @@ -3073,7 +3241,7 @@ if test "$with_tk" = yes; then # 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:3077: checking for $ac_word" >&5 +echo "configure:3245: 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 @@ -3114,7 +3282,7 @@ fi ## echo $ac_n "checking for main in -lsfio""... $ac_c" 1>&6 -echo "configure:3118: checking for main in -lsfio" >&5 +echo "configure:3286: 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 @@ -3122,14 +3290,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:3301: \"$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 @@ -3157,7 +3325,7 @@ else fi echo $ac_n "checking for readline""... $ac_c" 1>&6 -echo "configure:3161: checking for readline" >&5 +echo "configure:3329: checking for readline" >&5 if eval "test \"`echo '$''{'pgac_cv_check_readline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3168,7 +3336,7 @@ for pgac_lib in "" " -ltermcap" " -lncurses" " -lcurses" ; do pgac_save_LIBS=$LIBS LIBS="${pgac_rllib}${pgac_lib} $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* pgac_cv_check_readline="${pgac_rllib}${pgac_lib}"; break 2 else @@ -3206,14 +3374,14 @@ else fi echo $ac_n "checking for library containing using_history""... $ac_c" 1>&6 -echo "configure:3210: checking for library containing using_history" >&5 +echo "configure:3378: checking for library containing using_history" >&5 if eval "test \"`echo '$''{'ac_cv_search_using_history'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_func_search_save_LIBS="$LIBS" ac_cv_search_using_history="no" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_using_history="none required" else @@ -3235,7 +3403,7 @@ rm -f conftest* test "$ac_cv_search_using_history" = "no" && for i in history; do LIBS="-l$i $ac_func_search_save_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3418: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_using_history="-l$i" break @@ -3273,7 +3441,7 @@ fi if test "$PORTNAME" != "aix" -a "$PORTNAME" != "alpha" then echo $ac_n "checking for main in -lbsd""... $ac_c" 1>&6 -echo "configure:3277: checking for main in -lbsd" >&5 +echo "configure:3445: 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 @@ -3281,14 +3449,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:3460: \"$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 @@ -3317,7 +3485,7 @@ fi fi echo $ac_n "checking for setproctitle in -lutil""... $ac_c" 1>&6 -echo "configure:3321: checking for setproctitle in -lutil" >&5 +echo "configure:3489: checking for setproctitle in -lutil" >&5 ac_lib_var=`echo util'_'setproctitle | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3325,7 +3493,7 @@ 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:3508: \"$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 @@ -3364,7 +3532,7 @@ else fi echo $ac_n "checking for main in -lm""... $ac_c" 1>&6 -echo "configure:3368: checking for main in -lm" >&5 +echo "configure:3536: 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 @@ -3372,14 +3540,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:3551: \"$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 @@ -3407,7 +3575,7 @@ else fi echo $ac_n "checking for main in -ldl""... $ac_c" 1>&6 -echo "configure:3411: checking for main in -ldl" >&5 +echo "configure:3579: 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 @@ -3415,14 +3583,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:3594: \"$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 @@ -3450,7 +3618,7 @@ else fi echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6 -echo "configure:3454: checking for main in -lsocket" >&5 +echo "configure:3622: 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 @@ -3458,14 +3626,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:3637: \"$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 @@ -3493,7 +3661,7 @@ else fi echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6 -echo "configure:3497: checking for main in -lnsl" >&5 +echo "configure:3665: 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 @@ -3501,14 +3669,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:3680: \"$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 @@ -3536,7 +3704,7 @@ else fi echo $ac_n "checking for main in -lipc""... $ac_c" 1>&6 -echo "configure:3540: checking for main in -lipc" >&5 +echo "configure:3708: 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 @@ -3544,14 +3712,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:3723: \"$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 @@ -3579,7 +3747,7 @@ else fi echo $ac_n "checking for main in -lIPC""... $ac_c" 1>&6 -echo "configure:3583: checking for main in -lIPC" >&5 +echo "configure:3751: 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 @@ -3587,14 +3755,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:3766: \"$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 @@ -3622,7 +3790,7 @@ else fi echo $ac_n "checking for main in -llc""... $ac_c" 1>&6 -echo "configure:3626: checking for main in -llc" >&5 +echo "configure:3794: 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 @@ -3630,14 +3798,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:3809: \"$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 @@ -3665,7 +3833,7 @@ else fi echo $ac_n "checking for main in -ldld""... $ac_c" 1>&6 -echo "configure:3669: checking for main in -ldld" >&5 +echo "configure:3837: 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 @@ -3673,14 +3841,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:3852: \"$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 @@ -3708,7 +3876,7 @@ else fi echo $ac_n "checking for main in -lld""... $ac_c" 1>&6 -echo "configure:3712: checking for main in -lld" >&5 +echo "configure:3880: 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 @@ -3716,14 +3884,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:3895: \"$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 @@ -3751,7 +3919,7 @@ else fi echo $ac_n "checking for main in -lcompat""... $ac_c" 1>&6 -echo "configure:3755: checking for main in -lcompat" >&5 +echo "configure:3923: 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 @@ -3759,14 +3927,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:3938: \"$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 @@ -3794,7 +3962,7 @@ else fi echo $ac_n "checking for main in -lBSD""... $ac_c" 1>&6 -echo "configure:3798: checking for main in -lBSD" >&5 +echo "configure:3966: 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 @@ -3802,14 +3970,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:3981: \"$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 @@ -3837,7 +4005,7 @@ else fi echo $ac_n "checking for main in -lgen""... $ac_c" 1>&6 -echo "configure:3841: checking for main in -lgen" >&5 +echo "configure:4009: 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 @@ -3845,14 +4013,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:4024: \"$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 @@ -3880,7 +4048,7 @@ else fi echo $ac_n "checking for main in -lPW""... $ac_c" 1>&6 -echo "configure:3884: checking for main in -lPW" >&5 +echo "configure:4052: 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 @@ -3888,14 +4056,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:4067: \"$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 @@ -3923,7 +4091,7 @@ else fi echo $ac_n "checking for main in -lresolv""... $ac_c" 1>&6 -echo "configure:3927: checking for main in -lresolv" >&5 +echo "configure:4095: checking for main in -lresolv" >&5 ac_lib_var=`echo resolv'_'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 @@ -3931,14 +4099,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4110: \"$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 @@ -3966,7 +4134,7 @@ else fi echo $ac_n "checking for main in -lunix""... $ac_c" 1>&6 -echo "configure:3970: checking for main in -lunix" >&5 +echo "configure:4138: checking for main in -lunix" >&5 ac_lib_var=`echo unix'_'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 @@ -3974,14 +4142,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lunix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4153: \"$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 @@ -4010,14 +4178,14 @@ fi echo $ac_n "checking for library containing crypt""... $ac_c" 1>&6 -echo "configure:4014: checking for library containing crypt" >&5 +echo "configure:4182: checking for library containing crypt" >&5 if eval "test \"`echo '$''{'ac_cv_search_crypt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_func_search_save_LIBS="$LIBS" ac_cv_search_crypt="no" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_crypt="none required" else @@ -4039,7 +4207,7 @@ rm -f conftest* test "$ac_cv_search_crypt" = "no" && for i in crypt; do LIBS="-l$i $ac_func_search_save_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_crypt="-l$i" break @@ -4071,7 +4239,7 @@ else : fi echo $ac_n "checking for __inet_ntoa in -lbind""... $ac_c" 1>&6 -echo "configure:4075: checking for __inet_ntoa in -lbind" >&5 +echo "configure:4243: checking for __inet_ntoa in -lbind" >&5 ac_lib_var=`echo bind'_'__inet_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 @@ -4079,7 +4247,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lbind $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4262: \"$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 @@ -4119,17 +4287,17 @@ fi ac_safe=`echo "zlib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for zlib.h""... $ac_c" 1>&6 -echo "configure:4123: checking for zlib.h" >&5 +echo "configure:4291: checking for zlib.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:4133: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4301: \"$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* @@ -4147,7 +4315,7 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for inflate in -lz""... $ac_c" 1>&6 -echo "configure:4151: checking for inflate in -lz" >&5 +echo "configure:4319: checking for inflate in -lz" >&5 ac_lib_var=`echo z'_'inflate | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4155,7 +4323,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4338: \"$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 @@ -4202,7 +4370,7 @@ fi if test "$with_krb4" = yes ; then echo $ac_n "checking for des_encrypt in -ldes""... $ac_c" 1>&6 -echo "configure:4206: checking for des_encrypt in -ldes" >&5 +echo "configure:4374: checking for des_encrypt in -ldes" >&5 ac_lib_var=`echo des'_'des_encrypt | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4210,7 +4378,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldes $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4393: \"$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 @@ -4250,7 +4418,7 @@ else fi echo $ac_n "checking for krb_sendauth in -lkrb""... $ac_c" 1>&6 -echo "configure:4254: checking for krb_sendauth in -lkrb" >&5 +echo "configure:4422: checking for krb_sendauth in -lkrb" >&5 ac_lib_var=`echo krb'_'krb_sendauth | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4258,7 +4426,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lkrb $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4441: \"$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 @@ -4301,7 +4469,7 @@ fi if test "$with_krb5" = yes ; then echo $ac_n "checking for com_err in -lcom_err""... $ac_c" 1>&6 -echo "configure:4305: checking for com_err in -lcom_err" >&5 +echo "configure:4473: checking for com_err in -lcom_err" >&5 ac_lib_var=`echo com_err'_'com_err | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4309,7 +4477,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcom_err $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4492: \"$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 @@ -4349,7 +4517,7 @@ else fi echo $ac_n "checking for krb5_encrypt in -lcrypto""... $ac_c" 1>&6 -echo "configure:4353: checking for krb5_encrypt in -lcrypto" >&5 +echo "configure:4521: checking for krb5_encrypt in -lcrypto" >&5 ac_lib_var=`echo crypto'_'krb5_encrypt | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4357,7 +4525,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcrypto $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4540: \"$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 @@ -4394,7 +4562,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for krb5_encrypt in -lk5crypto""... $ac_c" 1>&6 -echo "configure:4398: checking for krb5_encrypt in -lk5crypto" >&5 +echo "configure:4566: checking for krb5_encrypt in -lk5crypto" >&5 ac_lib_var=`echo k5crypto'_'krb5_encrypt | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4402,7 +4570,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lk5crypto $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4585: \"$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 @@ -4444,7 +4612,7 @@ fi fi echo $ac_n "checking for krb5_sendauth in -lkrb5""... $ac_c" 1>&6 -echo "configure:4448: checking for krb5_sendauth in -lkrb5" >&5 +echo "configure:4616: checking for krb5_sendauth in -lkrb5" >&5 ac_lib_var=`echo krb5'_'krb5_sendauth | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4452,7 +4620,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lkrb5 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4635: \"$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 @@ -4495,7 +4663,7 @@ fi if test "$with_openssl" = yes ; then echo $ac_n "checking for CRYPTO_new_ex_data in -lcrypto""... $ac_c" 1>&6 -echo "configure:4499: checking for CRYPTO_new_ex_data in -lcrypto" >&5 +echo "configure:4667: checking for CRYPTO_new_ex_data in -lcrypto" >&5 ac_lib_var=`echo crypto'_'CRYPTO_new_ex_data | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4503,7 +4671,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcrypto $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4686: \"$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 @@ -4543,7 +4711,7 @@ else fi echo $ac_n "checking for SSL_library_init in -lssl""... $ac_c" 1>&6 -echo "configure:4547: checking for SSL_library_init in -lssl" >&5 +echo "configure:4715: checking for SSL_library_init in -lssl" >&5 ac_lib_var=`echo ssl'_'SSL_library_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4551,7 +4719,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lssl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4734: \"$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 @@ -4600,17 +4768,17 @@ for ac_hdr in crypt.h dld.h endian.h fp_class.h getopt.h ieeefp.h pwd.h sys/ipc. do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4604: checking for $ac_hdr" >&5 +echo "configure:4772: 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:4614: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4782: \"$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* @@ -4641,17 +4809,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:4645: checking for $ac_hdr" >&5 +echo "configure:4813: 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:4655: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4823: \"$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* @@ -4678,9 +4846,9 @@ fi done echo $ac_n "checking for netinet/tcp.h""... $ac_c" 1>&6 -echo "configure:4682: checking for netinet/tcp.h" >&5 +echo "configure:4850: checking for netinet/tcp.h" >&5 cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4862: \"$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* @@ -4708,24 +4876,24 @@ fi rm -f conftest* echo $ac_n "checking whether string.h and strings.h may both be included""... $ac_c" 1>&6 -echo "configure:4712: checking whether string.h and strings.h may both be included" >&5 +echo "configure:4880: checking whether string.h and strings.h may both be included" >&5 if eval "test \"`echo '$''{'pgac_cv_header_strings_both'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4724: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4892: \"$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* cat > conftest.$ac_ext < #include @@ -4734,7 +4902,7 @@ int main() { int n = strcasecmp("a", "b"); ; return 0; } EOF -if { (eval echo configure:4738: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4906: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* pgac_cv_header_strings_both=yes else @@ -4766,17 +4934,17 @@ for ac_hdr in readline/readline.h readline.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4770: checking for $ac_hdr" >&5 +echo "configure:4938: 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:4780: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4948: \"$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* @@ -4806,17 +4974,17 @@ for ac_hdr in readline/history.h history.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4810: checking for $ac_hdr" >&5 +echo "configure:4978: 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:4820: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4988: \"$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* @@ -4846,17 +5014,17 @@ done if test "$with_krb4" = yes ; then ac_safe=`echo "krb.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for krb.h""... $ac_c" 1>&6 -echo "configure:4850: checking for krb.h" >&5 +echo "configure:5018: checking for krb.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:4860: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5028: \"$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* @@ -4883,17 +5051,17 @@ fi if test "$with_krb5" = yes ; then ac_safe=`echo "krb5.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for krb5.h""... $ac_c" 1>&6 -echo "configure:4887: checking for krb5.h" >&5 +echo "configure:5055: checking for krb5.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:4897: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5065: \"$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* @@ -4917,17 +5085,17 @@ fi ac_safe=`echo "com_err.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for com_err.h""... $ac_c" 1>&6 -echo "configure:4921: checking for com_err.h" >&5 +echo "configure:5089: checking for com_err.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:4931: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5099: \"$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* @@ -4954,17 +5122,17 @@ fi if test "$with_openssl" = yes ; then ac_safe=`echo "openssl/ssl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for openssl/ssl.h""... $ac_c" 1>&6 -echo "configure:4958: checking for openssl/ssl.h" >&5 +echo "configure:5126: checking for openssl/ssl.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:4968: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5136: \"$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* @@ -4988,17 +5156,17 @@ fi ac_safe=`echo "openssl/err.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for openssl/err.h""... $ac_c" 1>&6 -echo "configure:4992: checking for openssl/err.h" >&5 +echo "configure:5160: checking for openssl/err.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:5002: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5170: \"$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* @@ -5027,12 +5195,12 @@ fi ## Types, structures, compiler characteristics ## echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:5031: checking for working const" >&5 +echo "configure:5199: 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:5253: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -5102,21 +5270,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:5106: checking for inline" >&5 +echo "configure:5274: 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:5288: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -5144,12 +5312,12 @@ esac echo $ac_n "checking for preprocessor stringizing operator""... $ac_c" 1>&6 -echo "configure:5148: checking for preprocessor stringizing operator" >&5 +echo "configure:5316: 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 signed types""... $ac_c" 1>&6 -echo "configure:5183: checking for signed types" >&5 +echo "configure:5351: checking for signed types" >&5 if eval "test \"`echo '$''{'pgac_cv_c_signed'+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:5363: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* pgac_cv_c_signed=yes else @@ -5211,19 +5379,19 @@ EOF fi echo $ac_n "checking for volatile""... $ac_c" 1>&6 -echo "configure:5215: checking for volatile" >&5 +echo "configure:5383: checking for volatile" >&5 if eval "test \"`echo '$''{'pgac_cv_c_volatile'+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:5395: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* pgac_cv_c_volatile=yes else @@ -5243,12 +5411,12 @@ EOF fi echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:5247: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:5415: 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 @@ -5256,7 +5424,7 @@ int main() { struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:5260: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5428: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -5277,12 +5445,12 @@ EOF fi echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6 -echo "configure:5281: checking for tm_zone in struct tm" >&5 +echo "configure:5449: 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> @@ -5290,7 +5458,7 @@ int main() { struct tm tm; tm.tm_zone; ; return 0; } EOF -if { (eval echo configure:5294: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5462: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm_zone=yes else @@ -5310,12 +5478,12 @@ EOF else echo $ac_n "checking for tzname""... $ac_c" 1>&6 -echo "configure:5314: checking for tzname" >&5 +echo "configure:5482: 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. */ @@ -5325,7 +5493,7 @@ int main() { atoi(*tzname); ; return 0; } EOF -if { (eval echo configure:5329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_var_tzname=yes else @@ -5347,12 +5515,12 @@ EOF fi echo $ac_n "checking for union semun""... $ac_c" 1>&6 -echo "configure:5351: checking for union semun" >&5 +echo "configure:5519: checking for union semun" >&5 if eval "test \"`echo '$''{'pgac_cv_union_semun'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -5361,7 +5529,7 @@ int main() { union semun semun; ; return 0; } EOF -if { (eval echo configure:5365: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5533: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* pgac_cv_union_semun=yes else @@ -5381,12 +5549,12 @@ EOF fi echo $ac_n "checking for struct sockaddr_un""... $ac_c" 1>&6 -echo "configure:5385: checking for struct sockaddr_un" >&5 +echo "configure:5553: checking for struct sockaddr_un" >&5 if eval "test \"`echo '$''{'pgac_cv_struct_sockaddr_un'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #ifdef HAVE_SYS_UN_H @@ -5396,7 +5564,7 @@ int main() { struct sockaddr_un un; ; return 0; } EOF -if { (eval echo configure:5400: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* pgac_cv_struct_sockaddr_un=yes else @@ -5420,12 +5588,12 @@ fi ## Functions, global variables ## echo $ac_n "checking for int timezone""... $ac_c" 1>&6 -echo "configure:5424: checking for int timezone" >&5 +echo "configure:5592: checking for int timezone" >&5 if eval "test \"`echo '$''{'pgac_cv_var_int_timezone'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int res; @@ -5433,7 +5601,7 @@ int main() { res = timezone / 60; ; return 0; } EOF -if { (eval echo configure:5437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* pgac_cv_var_int_timezone=yes else @@ -5453,7 +5621,7 @@ EOF fi echo $ac_n "checking types of arguments for accept()""... $ac_c" 1>&6 -echo "configure:5457: checking types of arguments for accept()" >&5 +echo "configure:5625: checking types of arguments for accept()" >&5 if eval "test \"`echo '$''{'ac_cv_func_accept_arg1'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5467,7 +5635,7 @@ else for ac_cv_func_accept_arg2 in 'struct sockaddr *' 'const struct sockaddr *' 'void *'; do for ac_cv_func_accept_arg3 in 'int' 'size_t' 'socklen_t' 'unsigned int' 'void'; do cat > conftest.$ac_ext < @@ -5480,7 +5648,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:5484: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5652: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_not_found=no; break 3 else @@ -5520,12 +5688,12 @@ EOF echo $ac_n "checking whether gettimeofday takes only one argument""... $ac_c" 1>&6 -echo "configure:5524: checking whether gettimeofday takes only one argument" >&5 +echo "configure:5692: checking whether gettimeofday takes only one argument" >&5 if eval "test \"`echo '$''{'pgac_cv_func_gettimeofday_1arg'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -5534,7 +5702,7 @@ struct timezone *tzp; gettimeofday(tp,tzp); ; return 0; } EOF -if { (eval echo configure:5538: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5706: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* pgac_cv_func_gettimeofday_1arg=no else @@ -5557,12 +5725,12 @@ fi for ac_func in fcvt getopt_long memmove pstat setproctitle setsid sigprocmask sysconf waitpid dlopen fdatasync do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5561: checking for $ac_func" >&5 +echo "configure:5729: 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:5757: \"$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 @@ -5611,7 +5779,7 @@ done cat > conftest.$ac_ext < EOF @@ -5627,12 +5795,12 @@ rm -f conftest* echo $ac_n "checking for PS_STRINGS""... $ac_c" 1>&6 -echo "configure:5631: checking for PS_STRINGS" >&5 +echo "configure:5799: checking for PS_STRINGS" >&5 if eval "test \"`echo '$''{'pgac_cv_var_PS_STRINGS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -5642,7 +5810,7 @@ PS_STRINGS->ps_nargvstr = 1; PS_STRINGS->ps_argvstr = "foo"; ; return 0; } EOF -if { (eval echo configure:5646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* pgac_cv_var_PS_STRINGS=yes else @@ -5664,12 +5832,12 @@ fi SNPRINTF='' echo $ac_n "checking for snprintf""... $ac_c" 1>&6 -echo "configure:5668: checking for snprintf" >&5 +echo "configure:5836: 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:5864: \"$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 @@ -5716,12 +5884,12 @@ SNPRINTF='snprintf.o' fi echo $ac_n "checking for vsnprintf""... $ac_c" 1>&6 -echo "configure:5720: checking for vsnprintf" >&5 +echo "configure:5888: 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:5916: \"$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 @@ -5769,7 +5937,7 @@ fi cat > conftest.$ac_ext < EOF @@ -5784,7 +5952,7 @@ fi rm -f conftest* cat > conftest.$ac_ext < EOF @@ -5801,12 +5969,12 @@ rm -f conftest* # do this one the hard way in case isinf() is a macro echo $ac_n "checking for isinf""... $ac_c" 1>&6 -echo "configure:5805: checking for isinf" >&5 +echo "configure:5973: checking for isinf" >&5 if eval "test \"`echo '$''{'ac_cv_func_isinf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -5814,7 +5982,7 @@ int main() { double x = 0.0; int res = isinf(x); ; return 0; } EOF -if { (eval echo configure:5818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_isinf=yes else @@ -5840,12 +6008,12 @@ else 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:5844: checking for $ac_func" >&5 +echo "configure:6012: 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:6040: \"$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 @@ -5896,12 +6064,12 @@ fi echo $ac_n "checking for getrusage""... $ac_c" 1>&6 -echo "configure:5900: checking for getrusage" >&5 +echo "configure:6068: 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:6096: \"$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 @@ -5949,12 +6117,12 @@ fi echo $ac_n "checking for srandom""... $ac_c" 1>&6 -echo "configure:5953: checking for srandom" >&5 +echo "configure:6121: 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:6149: \"$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 @@ -6002,12 +6170,12 @@ fi echo $ac_n "checking for gethostname""... $ac_c" 1>&6 -echo "configure:6006: checking for gethostname" >&5 +echo "configure:6174: 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:6202: \"$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 @@ -6055,12 +6223,12 @@ fi echo $ac_n "checking for random""... $ac_c" 1>&6 -echo "configure:6059: checking for random" >&5 +echo "configure:6227: 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:6255: \"$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 @@ -6108,12 +6276,12 @@ fi echo $ac_n "checking for inet_aton""... $ac_c" 1>&6 -echo "configure:6112: checking for inet_aton" >&5 +echo "configure:6280: 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:6308: \"$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 @@ -6161,12 +6329,12 @@ fi echo $ac_n "checking for strerror""... $ac_c" 1>&6 -echo "configure:6165: checking for strerror" >&5 +echo "configure:6333: 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:6361: \"$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 @@ -6214,12 +6382,12 @@ fi echo $ac_n "checking for strdup""... $ac_c" 1>&6 -echo "configure:6218: checking for strdup" >&5 +echo "configure:6386: 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:6414: \"$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 @@ -6267,12 +6435,12 @@ fi echo $ac_n "checking for strtol""... $ac_c" 1>&6 -echo "configure:6271: checking for strtol" >&5 +echo "configure:6439: 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:6467: \"$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 @@ -6320,12 +6488,12 @@ fi echo $ac_n "checking for strtoul""... $ac_c" 1>&6 -echo "configure:6324: checking for strtoul" >&5 +echo "configure:6492: 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:6520: \"$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 @@ -6373,12 +6541,12 @@ fi echo $ac_n "checking for strcasecmp""... $ac_c" 1>&6 -echo "configure:6377: checking for strcasecmp" >&5 +echo "configure:6545: 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:6573: \"$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 @@ -6426,12 +6594,12 @@ fi echo $ac_n "checking for cbrt""... $ac_c" 1>&6 -echo "configure:6430: checking for cbrt" >&5 +echo "configure:6598: 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:6626: \"$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 @@ -6475,7 +6643,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for cbrt in -lm""... $ac_c" 1>&6 -echo "configure:6479: checking for cbrt in -lm" >&5 +echo "configure:6647: 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 @@ -6483,7 +6651,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:6666: \"$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 @@ -6532,12 +6700,12 @@ esac echo $ac_n "checking for rint""... $ac_c" 1>&6 -echo "configure:6536: checking for rint" >&5 +echo "configure:6704: 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:6732: \"$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 @@ -6581,7 +6749,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for rint in -lm""... $ac_c" 1>&6 -echo "configure:6585: checking for rint in -lm" >&5 +echo "configure:6753: 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 @@ -6589,7 +6757,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:6772: \"$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 @@ -6629,9 +6797,9 @@ fi # Readline versions < 2.1 don't have rl_completion_append_character echo $ac_n "checking for rl_completion_append_character""... $ac_c" 1>&6 -echo "configure:6633: checking for rl_completion_append_character" >&5 +echo "configure:6801: checking for rl_completion_append_character" >&5 cat > conftest.$ac_ext < #ifdef HAVE_READLINE_H @@ -6644,7 +6812,7 @@ int main() { rl_completion_append_character = 'x'; ; return 0; } EOF -if { (eval echo configure:6648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6816: \"$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 @@ -6665,7 +6833,7 @@ rm -f conftest* # with earlier Cygwins don't have this declared, although it's in the # library. echo $ac_n "checking whether filename_completion_function is declared""... $ac_c" 1>&6 -echo "configure:6669: checking whether filename_completion_function is declared" >&5 +echo "configure:6837: checking whether filename_completion_function is declared" >&5 if test "$ac_cv_header_readline_h" = yes; then _readline_header='readline.h' elif test "$ac_cv_header_readline_readline_h" = yes; then @@ -6674,7 +6842,7 @@ else _readline_header='xxx' fi cat > conftest.$ac_ext < EOF @@ -6696,16 +6864,16 @@ rm -f conftest* echo $ac_n "checking for finite""... $ac_c" 1>&6 -echo "configure:6700: checking for finite" >&5 +echo "configure:6868: checking for finite" >&5 cat > conftest.$ac_ext < int main() { int dummy=finite(1.0); ; return 0; } EOF -if { (eval echo configure:6709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6877: \"$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 @@ -6720,16 +6888,16 @@ fi rm -f conftest* echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6 -echo "configure:6724: checking for sigsetjmp" >&5 +echo "configure:6892: checking for sigsetjmp" >&5 cat > conftest.$ac_ext < int main() { sigjmp_buf x; sigsetjmp(x, 1); ; return 0; } EOF -if { (eval echo configure:6733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6901: \"$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 @@ -6749,12 +6917,12 @@ if test x"${enable_syslog+set}" = xset; then case $enable_syslog in yes) echo $ac_n "checking for syslog""... $ac_c" 1>&6 -echo "configure:6753: checking for syslog" >&5 +echo "configure:6921: 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:6949: \"$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 @@ -6816,19 +6984,19 @@ fi echo $ac_n "checking for optreset""... $ac_c" 1>&6 -echo "configure:6820: checking for optreset" >&5 +echo "configure:6988: checking for optreset" >&5 if eval "test \"`echo '$''{'pgac_cv_var_int_optreset'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { extern int optreset; optreset = 1; ; return 0; } EOF -if { (eval echo configure:6832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* pgac_cv_var_int_optreset=yes else @@ -6850,7 +7018,7 @@ fi echo $ac_n "checking whether long int is 64 bits""... $ac_c" 1>&6 -echo "configure:6854: checking whether long int is 64 bits" >&5 +echo "configure:7022: checking whether long int is 64 bits" >&5 if eval "test \"`echo '$''{'pgac_cv_type_long_int_64'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6859,7 +7027,7 @@ else echo "configure: warning: 64 bit arithmetic disabled when cross-compiling" 1>&2 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:7060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then pgac_cv_type_long_int_64=yes else @@ -6915,7 +7083,7 @@ fi if test x"$HAVE_LONG_INT_64" = x"no" ; then echo $ac_n "checking whether long long int is 64 bits""... $ac_c" 1>&6 -echo "configure:6919: checking whether long long int is 64 bits" >&5 +echo "configure:7087: checking whether long long int is 64 bits" >&5 if eval "test \"`echo '$''{'pgac_cv_type_long_long_int_64'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6924,7 +7092,7 @@ else echo "configure: warning: 64 bit arithmetic disabled when cross-compiling" 1>&2 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:7125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then pgac_cv_type_long_long_int_64=yes else @@ -6984,7 +7152,7 @@ fi if [ x"$HAVE_LONG_LONG_INT_64" = xyes ] ; then if [ x$SNPRINTF = x ] ; then echo $ac_n "checking whether snprintf handles 'long long int' as %lld""... $ac_c" 1>&6 -echo "configure:6988: checking whether snprintf handles 'long long int' as %lld" >&5 +echo "configure:7156: 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 @@ -6993,7 +7161,7 @@ echo "configure:6988: checking whether snprintf handles 'long long int' as %lld" else cat > conftest.$ac_ext < typedef long long int int64; @@ -7020,7 +7188,7 @@ main() { exit(! does_int64_snprintf_work()); } EOF -if { (eval echo configure:7024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7192: \"$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"' @@ -7031,7 +7199,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:7035: checking whether snprintf handles 'long long int' as %qd" >&5 +echo "configure:7203: 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 @@ -7040,7 +7208,7 @@ echo "configure:7035: checking whether snprintf handles 'long long int' as %qd" else cat > conftest.$ac_ext < typedef long long int int64; @@ -7067,7 +7235,7 @@ main() { exit(! does_int64_snprintf_work()); } EOF -if { (eval echo configure:7071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7239: \"$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"' @@ -7107,12 +7275,12 @@ EOF for ac_func in strtoll strtoq do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7111: checking for $ac_func" >&5 +echo "configure:7279: 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:7307: \"$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 @@ -7162,12 +7330,12 @@ done for ac_func in strtoull strtouq do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7166: checking for $ac_func" >&5 +echo "configure:7334: 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:7362: \"$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 @@ -7216,12 +7384,12 @@ done echo $ac_n "checking for atexit""... $ac_c" 1>&6 -echo "configure:7220: checking for atexit" >&5 +echo "configure:7388: checking for atexit" >&5 if eval "test \"`echo '$''{'ac_cv_func_atexit'+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:7416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_atexit=yes" else @@ -7267,12 +7435,12 @@ else for ac_func in on_exit do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7271: checking for $ac_func" >&5 +echo "configure:7439: 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:7467: \"$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 @@ -7328,7 +7496,7 @@ fi echo $ac_n "checking size of unsigned long""... $ac_c" 1>&6 -echo "configure:7332: checking size of unsigned long" >&5 +echo "configure:7500: checking size of unsigned long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7336,7 +7504,7 @@ else ac_cv_sizeof_unsigned_long=4 else cat > conftest.$ac_ext < main() @@ -7347,7 +7515,7 @@ main() exit(0); } EOF -if { (eval echo configure:7351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_unsigned_long=`cat conftestval` else @@ -7373,7 +7541,7 @@ EOF echo $ac_n "checking alignment of short""... $ac_c" 1>&6 -echo "configure:7377: checking alignment of short" >&5 +echo "configure:7545: checking alignment of short" >&5 if eval "test \"`echo '$''{'pgac_cv_alignof_short'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7381,7 +7549,7 @@ else pgac_cv_alignof_short='sizeof(short)' else cat > conftest.$ac_ext < struct { char filler; short field; } mystruct; @@ -7393,7 +7561,7 @@ main() exit(0); } EOF -if { (eval echo configure:7397: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then pgac_cv_alignof_short=`cat conftestval` else @@ -7413,7 +7581,7 @@ EOF echo $ac_n "checking alignment of int""... $ac_c" 1>&6 -echo "configure:7417: checking alignment of int" >&5 +echo "configure:7585: checking alignment of int" >&5 if eval "test \"`echo '$''{'pgac_cv_alignof_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7421,7 +7589,7 @@ else pgac_cv_alignof_int='sizeof(int)' else cat > conftest.$ac_ext < struct { char filler; int field; } mystruct; @@ -7433,7 +7601,7 @@ main() exit(0); } EOF -if { (eval echo configure:7437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then pgac_cv_alignof_int=`cat conftestval` else @@ -7453,7 +7621,7 @@ EOF echo $ac_n "checking alignment of long""... $ac_c" 1>&6 -echo "configure:7457: checking alignment of long" >&5 +echo "configure:7625: checking alignment of long" >&5 if eval "test \"`echo '$''{'pgac_cv_alignof_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7461,7 +7629,7 @@ else pgac_cv_alignof_long='sizeof(long)' else cat > conftest.$ac_ext < struct { char filler; long field; } mystruct; @@ -7473,7 +7641,7 @@ main() exit(0); } EOF -if { (eval echo configure:7477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7645: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then pgac_cv_alignof_long=`cat conftestval` else @@ -7494,7 +7662,7 @@ EOF if [ x"$HAVE_LONG_LONG_INT_64" = xyes ] ; then echo $ac_n "checking alignment of long long int""... $ac_c" 1>&6 -echo "configure:7498: checking alignment of long long int" >&5 +echo "configure:7666: checking alignment of long long int" >&5 if eval "test \"`echo '$''{'pgac_cv_alignof_long_long_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7502,7 +7670,7 @@ else pgac_cv_alignof_long_long_int='sizeof(long long int)' else cat > conftest.$ac_ext < struct { char filler; long long int field; } mystruct; @@ -7514,7 +7682,7 @@ main() exit(0); } EOF -if { (eval echo configure:7518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then pgac_cv_alignof_long_long_int=`cat conftestval` else @@ -7535,7 +7703,7 @@ EOF fi echo $ac_n "checking alignment of double""... $ac_c" 1>&6 -echo "configure:7539: checking alignment of double" >&5 +echo "configure:7707: checking alignment of double" >&5 if eval "test \"`echo '$''{'pgac_cv_alignof_double'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7543,7 +7711,7 @@ else pgac_cv_alignof_double='sizeof(double)' else cat > conftest.$ac_ext < struct { char filler; double field; } mystruct; @@ -7555,7 +7723,7 @@ main() exit(0); } EOF -if { (eval echo configure:7559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then pgac_cv_alignof_double=`cat conftestval` else @@ -7593,12 +7761,12 @@ EOF echo $ac_n "checking for POSIX signal interface""... $ac_c" 1>&6 -echo "configure:7597: checking for POSIX signal interface" >&5 +echo "configure:7765: checking for POSIX signal interface" >&5 if eval "test \"`echo '$''{'pgac_cv_func_posix_signals'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -7609,7 +7777,7 @@ act.sa_flags = SA_RESTART; sigaction(0, &act, &oact); ; return 0; } EOF -if { (eval echo configure:7613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* pgac_cv_func_posix_signals=yes else @@ -7639,7 +7807,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:7643: checking for $ac_word" >&5 +echo "configure:7811: 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 @@ -7675,7 +7843,7 @@ test -n "$TCLSH" && break done echo $ac_n "checking for tclConfig.sh""... $ac_c" 1>&6 -echo "configure:7679: checking for tclConfig.sh" >&5 +echo "configure:7847: checking for tclConfig.sh" >&5 # Let user override test if test -z "$TCL_CONFIG_SH"; then pgac_test_dirs="$with_tclconfig" @@ -7708,7 +7876,7 @@ fi # Check for Tk configuration script tkConfig.sh if test "$with_tk" = yes; then echo $ac_n "checking for tkConfig.sh""... $ac_c" 1>&6 -echo "configure:7712: checking for tkConfig.sh" >&5 +echo "configure:7880: checking for tkConfig.sh" >&5 # Let user override test if test -z "$TK_CONFIG_SH"; then pgac_test_dirs="$with_tkconfig $with_tclconfig" @@ -7747,7 +7915,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:7751: checking for $ac_word" >&5 +echo "configure:7919: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_NSGMLS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7783,7 +7951,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:7787: checking for $ac_word" >&5 +echo "configure:7955: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_JADE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7814,7 +7982,7 @@ done echo $ac_n "checking for DocBook V3.1""... $ac_c" 1>&6 -echo "configure:7818: checking for DocBook V3.1" >&5 +echo "configure:7986: checking for DocBook V3.1" >&5 if eval "test \"`echo '$''{'pgac_cv_check_docbook'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7847,7 +8015,7 @@ have_docbook=$pgac_cv_check_docbook echo $ac_n "checking for DocBook stylesheets""... $ac_c" 1>&6 -echo "configure:7851: checking for DocBook stylesheets" >&5 +echo "configure:8019: checking for DocBook stylesheets" >&5 if eval "test \"`echo '$''{'pgac_cv_path_stylesheets'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7886,7 +8054,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:7890: checking for $ac_word" >&5 +echo "configure:8058: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_SGMLSPL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7917,6 +8085,10 @@ done fi +<<<<<<< configure.in + +# Finally ready to produce output files ... +======= # check whether 'test -ef' works if (test "$srcdir" -ef "$srcdir") >/dev/null 2>&1 ; then @@ -7924,7 +8096,15 @@ if (test "$srcdir" -ef "$srcdir") >/dev/null 2>&1 ; then else test_ef_works=no fi +>>>>>>> 1.104 +<<<<<<< configure.in +if test x"$abs_top_srcdir" != x"$abs_top_builddir"; then + echo $ac_n "preparing build tree... $ac_c" 1>&6 + /bin/sh "$srcdir/config/prep_buildtree" "$abs_top_srcdir" "$abs_top_builddir" \ + || { echo "configure: error: failed" 1>&2; exit 1; } + echo "$ac_t""done" 1>&6 +======= abs_top_srcdir= @@ -7937,6 +8117,7 @@ if test "$test_ef_works" = yes ; then || { echo "configure: error: failed" 1>&2; exit 1; } echo "$ac_t""done" 1>&6 fi +>>>>>>> 1.104 fi trap '' 1 2 15 @@ -8054,6 +8235,7 @@ sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g; s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF $ac_vpsub $extrasub +s%@ANT@%$ANT%g s%@SHELL@%$SHELL%g s%@CFLAGS@%$CFLAGS%g s%@CPPFLAGS@%$CPPFLAGS%g @@ -8106,6 +8288,7 @@ 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%@with_java@%$with_java%g s%@with_krb4@%$with_krb4%g s%@with_krb5@%$with_krb5%g s%@krb_srvtab@%$krb_srvtab%g diff --git a/configure.in b/configure.in index d9511ffdc2..e57571957d 100644 --- a/configure.in +++ b/configure.in @@ -401,6 +401,15 @@ PGAC_PATH_PYTHONDIR], [AC_MSG_RESULT(no)]) AC_SUBST(with_python) +# +# Optionally build the Java/JDBC tools +# +AC_MSG_CHECKING([whether to build Java/JDBC tools]) +PGAC_ARG_BOOL(with, java, no, [ --with-java build JDBC interface & Java tools], +[AC_MSG_RESULT(yes) +PGAC_PROG_ANT], +[AC_MSG_RESULT(no)]) +AC_SUBST(with_java) dnl A note on the Kerberos and OpenSSL options: dnl @@ -1136,6 +1145,10 @@ if test -n "$NSGMLS"; then AC_CHECK_PROGS(SGMLSPL, sgmlspl) fi +<<<<<<< configure.in + +# Finally ready to produce output files ... +======= # check whether 'test -ef' works if (test "$srcdir" -ef "$srcdir") >/dev/null 2>&1 ; then @@ -1143,7 +1156,15 @@ if (test "$srcdir" -ef "$srcdir") >/dev/null 2>&1 ; then else test_ef_works=no fi +>>>>>>> 1.104 +<<<<<<< configure.in +if test x"$abs_top_srcdir" != x"$abs_top_builddir"; then + echo $ac_n "preparing build tree... $ac_c" 1>&6 + /bin/sh "$srcdir/config/prep_buildtree" "$abs_top_srcdir" "$abs_top_builddir" \ + || AC_MSG_ERROR(failed) + AC_MSG_RESULT(done) +======= abs_top_srcdir= AC_SUBST(abs_top_srcdir) @@ -1156,6 +1177,7 @@ if test "$test_ef_works" = yes ; then || AC_MSG_ERROR(failed) AC_MSG_RESULT(done) fi +>>>>>>> 1.104 fi AC_OUTPUT( diff --git a/src/Makefile.global.in b/src/Makefile.global.in index ef488cbd40..955348fbc2 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -1,5 +1,5 @@ # -*-makefile-*- -# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.121 2001/03/03 15:53:41 petere Exp $ +# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.122 2001/03/05 09:39:51 peter Exp $ #------------------------------------------------------------------------------ # All PostgreSQL makefiles include this file and use the variables it sets, @@ -107,6 +107,7 @@ odbcinst_ini_dir = @odbcinst_ini_dir@ # Records the choice of the various --enable-xxx and --with-xxx options. with_CXX = @with_CXX@ +with_java = @with_java@ with_perl = @with_perl@ with_python = @with_python@ with_tcl = @with_tcl@ @@ -174,6 +175,7 @@ X = @EXEEXT@ # Miscellaneous +ANT = @ANT@ AWK = @AWK@ LN_S = @LN_S@ PERL = @PERL@ diff --git a/src/interfaces/Makefile b/src/interfaces/Makefile index ee9fed3851..348d15b1a4 100644 --- a/src/interfaces/Makefile +++ b/src/interfaces/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 1994, Regents of the University of California # -# $Header: /cvsroot/pgsql/src/interfaces/Makefile,v 1.43 2000/09/25 22:23:00 petere Exp $ +# $Header: /cvsroot/pgsql/src/interfaces/Makefile,v 1.44 2001/03/05 09:39:52 peter Exp $ # #------------------------------------------------------------------------- @@ -14,7 +14,7 @@ include $(top_builddir)/src/Makefile.global DIRS := libpq ecpg libpgeasy -ALLDIRS := $(DIRS) odbc libpq++ libpgtcl perl5 python +ALLDIRS := $(DIRS) odbc libpq++ libpgtcl perl5 python jdbc ifeq ($(enable_odbc), yes) DIRS += odbc @@ -36,6 +36,10 @@ ifeq ($(with_python), yes) DIRS += python endif +ifeq ($(with_java), yes) +DIRS += jdbc +endif + all install installdirs uninstall dep depend distprep: @for dir in $(DIRS); do $(MAKE) -C $$dir $@ || exit; done diff --git a/src/interfaces/jdbc/CHANGELOG b/src/interfaces/jdbc/CHANGELOG index e9208eb606..3614bd511b 100644 --- a/src/interfaces/jdbc/CHANGELOG +++ b/src/interfaces/jdbc/CHANGELOG @@ -1,3 +1,13 @@ +Fri Mar 02 10:00:00 GMT 2001 peter@retep.org.uk + - Fixed build.xml so that PGclob is not built in the JDBC1.2 driver + + +Fri Feb 17 18:25:00 GMT 2001 peter@retep.org.uk + - Removed the last deprecation warnings from the Java2 driver. Now only + the old examples give deprecation warnings. + - Added a new class into core that (JDK1.3+) ensures all connections are + closed when the VM terminates. + Fri Feb 17 15:11:00 GMT 2001 peter@retep.org.uk - Reduced the object overhead in PreparedStatement by reusing the same StringBuffer object throughout. Similarly SimpleDateStamp's are alse diff --git a/src/interfaces/jdbc/Makefile b/src/interfaces/jdbc/Makefile index abe0d375c5..c88ad68339 100644 --- a/src/interfaces/jdbc/Makefile +++ b/src/interfaces/jdbc/Makefile @@ -1,444 +1,28 @@ #------------------------------------------------------------------------- # -# Makefile -# Makefile for Java JDBC interface +# Makefile for src/interfaces # -# IDENTIFICATION -# $Id: Makefile,v 1.26 2001/01/18 14:50:14 peter Exp $ +# Copyright (c) 1994, Regents of the University of California +# +# $Header: /cvsroot/pgsql/src/interfaces/jdbc/Attic/Makefile,v 1.27 2001/03/05 09:39:53 peter Exp $ # #------------------------------------------------------------------------- -subdir = src/interfaces -top_builddir = ../../.. -include $(top_builddir)/src/Makefile.global +subdir = src/interfaces/jdbc +top_builddir = ../../.. +include $(top_builddir)/src/Makefile.global -CP = cp -FIND = find -IDL2JAVA = idltojava -fno-cpp -fno-tie -JAR = jar -JAVA = java -JAVAC = javac -g -JAVADOC = javadoc -RM = rm -f -TOUCH = touch +all distprep: + @$(ANT) -buildfile $(top_builddir)/build.xml -BUILDDRIVER = sh utils/buildDriver -CHANGELOG = perl utils/changelog.pl +install: + @$(ANT) -Dinstall.directory=$(DESTDIR)$(libdir)/java \ + -buildfile $(top_builddir)/build.xml \ + install -# This defines how to compile a java class -.java.class: - $(JAVAC) $< +installdirs uninstall dep depend: + @echo Nothing for JDBC -.SUFFIXES: .class .java -.PHONY: all clean doc examples msg +clean distclean maintainer-clean: + @$(ANT) -buildfile $(top_builddir)/build.xml clean -# This is the base directory of the driver. In 7.0, this changed from -# postgresql to org/postgresql -PGBASE = org/postgresql - -# New for 7.1: The jar filename -JARFILE = postgresql.jar - -all: - @echo ------------------------------------------------------------ - @echo The use of Make to build the driver is now depreciated in - @echo version 7.1 and later. To build the driver you now need to - @echo use ANT. This is the build tool of the Jakarta project, and - @echo you can obtain this from http://jakarta.apache.org/ant/ - @echo - @echo Once you have this installed, change directory to the root - @echo directory of the postgresql source and type ant. - @echo - @echo ie: if you are currently in the pgsql/src/interfaces/jdbc - @echo directory then cd into the pgsql one \(cd ../../.. should - @echo do\). - @echo - @echo The file Implementation contains more info on this, as does - @echo the homepage http://jdbc.postgresql.org/ - @echo ------------------------------------------------------------ - -# Yet another attempt to check the version. In theory, any JVM that fails -# this is breaking the versioning specifications released by Javasoft. -# -# In 7.1 this is renamed oldall so that the depreciated message is shown. -# -oldall: utils/CheckVersion.class - @$(MAKE) `$(JAVA) utils.CheckVersion` - -# For 6.5.3 and 7.0+, we need to select the correct JDBC API, so prompt -# for the version. -huho: - @echo ------------------------------------------------------------ - @echo Due to problems with some JVMs that dont return a meaningful - @echo version number, we have had to make the choice of what jdbc - @echo version is built as a compile time option. - @echo - @echo If you are using JDK1.1.x, you will need the JDBC1.2 driver. - @echo To compile, type: - @echo " make jdbc1" - @echo - @echo "If you are using JDK1.2 (aka Java2) you need the JDBC2." - @echo To compile, type: - @echo " make jdbc2" - @echo - @echo "If you are using the Java2 Enterprise Edition, you can use" - @echo "either the standard driver above, or compile the standard" - @echo "extensions version of the driver. Type:" - @echo " make enterprise" - @echo - @echo Once you have done this, a postgresql.jar file will be - @echo produced. This file will only work with that particular - @echo version of virtual machine. - @echo - @echo ------------------------------------------------------------ - -# In 7.1 replaced msg so that the depreciated message is shown. -msg: all - -oldmsg: - @echo ------------------------------------------------------------ - @echo The JDBC driver has now been built. To make it available to - @echo other applications, copy the postgresql.jar file to a public - @echo "place (under unix this could be /usr/local/lib) and add it" - @echo to the class path. - @echo - @echo Then either add -Djdbc.drivers=org.postgresql.Driver to the - @echo commandline when running your application, or edit the - @echo "properties file for your application (~/.hotjava/properties" - @echo "under unix for HotJava), and add a line containing" - @echo jdbc.drivers=org.postgresql.Driver - @echo - @echo More details are in the README file and in the main postgresql - @echo documentation. - @echo - @echo ------------------------------------------------------------ - @echo To build the examples, type: - @echo "JDBC1: make examples" - @echo "JDBC2: make examples2" - @echo - @echo "To build the CORBA example (requires Java2):" - @echo " make corba" - @echo - @echo "To make the tests, type:" - @echo " make tests" - @echo - @echo "To build the GUI Shell, type:" - @echo " make retepsql" - @echo - @echo ------------------------------------------------------------ - @echo - -dep depend: - -# This rule builds the javadoc documentation -doc: - export CLASSPATH=.;\ - $(JAVADOC) -public \ - org.postgresql \ - org.postgresql.fastpath \ - org.postgresql.largeobject - -# These classes form the driver. These, and only these are placed into -# the jar file. -OBJ_COMMON= $(PGBASE)/Connection.class \ - $(PGBASE)/Driver.class \ - $(PGBASE)/Field.class \ - $(PGBASE)/PG_Stream.class \ - $(PGBASE)/ResultSet.class \ - $(PGBASE)/errors.properties \ - $(PGBASE)/errors_fr.properties \ - $(PGBASE)/fastpath/Fastpath.class \ - $(PGBASE)/fastpath/FastpathArg.class \ - $(PGBASE)/geometric/PGbox.class \ - $(PGBASE)/geometric/PGcircle.class \ - $(PGBASE)/geometric/PGline.class \ - $(PGBASE)/geometric/PGlseg.class \ - $(PGBASE)/geometric/PGpath.class \ - $(PGBASE)/geometric/PGpoint.class \ - $(PGBASE)/geometric/PGpolygon.class \ - $(PGBASE)/largeobject/LargeObject.class \ - $(PGBASE)/largeobject/LargeObjectManager.class \ - $(PGBASE)/util/PGmoney.class \ - $(PGBASE)/util/PGobject.class \ - $(PGBASE)/util/PGtokenizer.class \ - $(PGBASE)/util/PSQLException.class \ - $(PGBASE)/util/Serialize.class \ - $(PGBASE)/util/UnixCrypt.class - -# These files are unique to the JDBC 1 (JDK 1.1) driver -OBJ_JDBC1= $(PGBASE)/jdbc1/CallableStatement.class \ - $(PGBASE)/jdbc1/Connection.class \ - $(PGBASE)/jdbc1/DatabaseMetaData.class \ - $(PGBASE)/jdbc1/PreparedStatement.class \ - $(PGBASE)/jdbc1/ResultSet.class \ - $(PGBASE)/jdbc1/ResultSetMetaData.class \ - $(PGBASE)/jdbc1/Statement.class - -# These files are unique to the JDBC 2 (JDK 2 nee 1.2) driver -OBJ_JDBC2= $(PGBASE)/jdbc2/ResultSet.class \ - $(PGBASE)/jdbc2/PreparedStatement.class \ - $(PGBASE)/jdbc2/CallableStatement.class \ - $(PGBASE)/jdbc2/Connection.class \ - $(PGBASE)/jdbc2/DatabaseMetaData.class \ - $(PGBASE)/jdbc2/ResultSetMetaData.class \ - $(PGBASE)/jdbc2/Statement.class \ - $(PGBASE)/largeobject/PGblob.class - -# These files are unique to the JDBC2 Enterprise driver -OBJ_ENTER= $(OBJ_JDBC2) \ - $(PGBASE)/PostgresqlDataSource.class \ - $(PGBASE)/xa/ClientConnection.class \ - $(PGBASE)/xa/TwoPhaseConnection.class \ - $(PGBASE)/xa/TxConnection.class \ - $(PGBASE)/xa/XAConnectionImpl.class \ - $(PGBASE)/xa/XADataSourceImpl.class - -# This rule builds the JDBC1 compliant driver -jdbc1: - $(BUILDDRIVER) $(VERSION) org.postgresql.jdbc1.Connection JDBC1.1 $(PGBASE)/Driver.java - -$(RM) postgresql.jar - @$(MAKE) jdbc1real - -# This rule does the real work for JDBC1.2, however do not call it directly. -# This is because the JDBC driver relies on the org.postgresql.DriverClass -# class to determine the driver version. -jdbc1real: $(OBJ_COMMON) $(OBJ_JDBC1) $(JARFILE) msg - -# This rule builds the JDBC2 compliant driver -jdbc2: - @$(MAKE) jdbc2internal msg - -# This allows us to build the jdbc2 driver without displaying the msg -# refer to the retepsql rule to see why. -jdbc2internal: - $(BUILDDRIVER) $(VERSION) org.postgresql.jdbc2.Connection Java2 $(PGBASE)/Driver.java - -$(RM) postgresql.jar - @$(MAKE) jdbc2real - -# This rule does the real work for JDBC2, however do not call it directly. -# This is because the JDBC driver relies on the org.postgresql.DriverClass -# class to determine the driver version. -jdbc2real: $(OBJ_COMMON) $(OBJ_JDBC2) $(JARFILE) - -# This rule builds the enterprise edition of the driver -enterprise: - $(BUILDDRIVER) $(VERSION) org.postgresql.jdbc2.Connection Enterprise $(PGBASE)/Driver.java - -$(RM) postgresql.jar - @$(MAKE) enterprisereal - -# This rule does the real work for JDBC2 Enterprise Edition, however do not -# call it directly. This is because the JDBC driver relies on the -# org.postgresql.DriverClass class to determine the driver version. -enterprisereal: $(OBJ_COMMON) $(OBJ_ENTER) $(JARFILE) - -# We use the old `cmd` notation here as some older shells (mainly sh under -# Solaris) don't recognise the newer $(cmd) syntax. -# -$(JARFILE): $(OBJ) $(OBJ_COMMON) - $(JAR) -c0f $@ `$(FIND) $(PGBASE) -name "*.class" -print` \ - $(wildcard $(PGBASE)/*.properties) - -# This rule removes any temporary and compiled files from the source tree. -# -clean: - $(FIND) . -name "*~" -exec $(RM) {} \; - $(FIND) . -name "*.class" -exec $(RM) {} \; - -$(RM) -rf stock example/corba/stock.built - -$(RM) postgresql.jar org/postgresql/Driver.java - -$(RM) -rf Package-postgresql *output - -$(RM) retepsql.jar manifest - -# New for 7.1 -install: $(JARFILE) - $(CP) $(JARFILE) $(libdir) - -# This converts CHANGELOG into an html format - used by peter@retep.org.uk -# to produce an online version -changelog: changelog.html -changelog.html: CHANGELOG - $(CHANGELOG) $< >$@ - -####################################################################### -# This helps make workout what classes are from what source files -# -# Java is unlike C in that one source file can generate several -# _Different_ file names -# -$(PGBASE)/Connection.class: $(PGBASE)/Connection.java -$(PGBASE)/DatabaseMetaData.class: $(PGBASE)/DatabaseMetaData.java -$(PGBASE)/Driver.class: $(PGBASE)/Driver.java -$(PGBASE)/Field.class: $(PGBASE)/Field.java -$(PGBASE)/PG_Stream.class: $(PGBASE)/PG_Stream.java -$(PGBASE)/PreparedStatement.class: $(PGBASE)/PreparedStatement.java -$(PGBASE)/ResultSet.class: $(PGBASE)/ResultSet.java -$(PGBASE)/ResultSetMetaData.class: $(PGBASE)/ResultSetMetaData.java -$(PGBASE)/Statement.class: $(PGBASE)/Statement.java -$(PGBASE)/fastpath/Fastpath.class: $(PGBASE)/fastpath/Fastpath.java -$(PGBASE)/fastpath/FastpathArg.class: $(PGBASE)/fastpath/FastpathArg.java -$(PGBASE)/geometric/PGbox.class: $(PGBASE)/geometric/PGbox.java -$(PGBASE)/geometric/PGcircle.class: $(PGBASE)/geometric/PGcircle.java -$(PGBASE)/geometric/PGlseg.class: $(PGBASE)/geometric/PGlseg.java -$(PGBASE)/geometric/PGpath.class: $(PGBASE)/geometric/PGpath.java -$(PGBASE)/geometric/PGpoint.class: $(PGBASE)/geometric/PGpoint.java -$(PGBASE)/geometric/PGpolygon.class: $(PGBASE)/geometric/PGpolygon.java -$(PGBASE)/largeobject/LargeObject.class: $(PGBASE)/largeobject/LargeObject.java -$(PGBASE)/largeobject/LargeObjectManager.class: $(PGBASE)/largeobject/LargeObjectManager.java -$(PGBASE)/util/PGmoney.class: $(PGBASE)/util/PGmoney.java -$(PGBASE)/util/PGobject.class: $(PGBASE)/util/PGobject.java -$(PGBASE)/util/PGtokenizer.class: $(PGBASE)/util/PGtokenizer.java -$(PGBASE)/util/Serialize.class: $(PGBASE)/util/Serialize.java -$(PGBASE)/util/UnixCrypt.class: $(PGBASE)/util/UnixCrypt.java - -####################################################################### -# These classes are in the example directory, and form the examples -EX= example/basic.class \ - example/psql.class \ - example/ImageViewer.class - -# These are only valid for JDBC2 -EX2= example/blobtest.class - -# These are really test classes not true examples -TESTS= example/metadata.class \ - example/threadsafe.class \ - example/Unicode.class - -# Non functional/obsolete examples -# example/datestyle.class \ -# example/Objects.class - -# This rule builds the examples -examples: postgresql.jar $(EX) - @echo ------------------------------------------------------------ - @echo The examples have been built. - @echo - @echo For instructions on how to use them, simply run them. For example: - @echo - @echo " java example.basic" - @echo - @echo This would display instructions on how to run the example. - @echo ------------------------------------------------------------ - @echo Available examples: - @echo - @echo " example.basic Basic JDBC useage" - @echo " example.datestyle Shows how datestyles are handled" - @echo " example.ImageViewer Example application storing images" - @echo " example.psql Simple java implementation of psql" - @echo " " - @echo ------------------------------------------------------------ - @echo - -examples2: $(EX2) examples - @echo "The following JDBC2 only examples have also been built:" - @echo - @echo " example.blobtest Binary Large Object tests" - @echo - @echo ------------------------------------------------------------ - @echo - -tests: $(TESTS) - @echo ------------------------------------------------------------ - @echo The following tests have been built: - @echo " example.metadata Tests various metadata methods" - @echo " example.threadsafe Tests the driver's thread safety" - @echo " example.Unicode Tests unicode charset support" - @echo ------------------------------------------------------------ - @echo - -example/basic.class: example/basic.java -example/blobtest.class: example/blobtest.java -example/datestyle.class: example/datestyle.java -example/psql.class: example/psql.java -example/ImageViewer.class: example/ImageViewer.java -example/threadsafe.class: example/threadsafe.java -example/metadata.class: example/metadata.java -example/Unicode.class: example/Unicode.java - -####################################################################### -# -# CORBA This extensive example shows how to integrate PostgreSQL -# JDBC & CORBA. - -CORBASRC = $(wildcard example/corba/*.java) -CORBAOBJ = $(subst .java,.class,$(CORBASRC)) - -corba: jdbc2 example/corba/stock.built $(CORBAOBJ) - @echo ------------------------------------------------------- - @echo The corba example has been built. Before running, you - @echo will need to read the example/corba/readme file on how - @echo to run the example. - @echo - -# -# This compiles our idl file and the stubs -# -# Note: The idl file is in example/corba, but it builds a directory under -# the current one. For safety, we delete that directory before running -# idltojava -# -example/corba/stock.built: example/corba/stock.idl - -rm -rf stock - $(IDL2JAVA) $< - $(JAVAC) stock/*.java - $(TOUCH) $@ - -# tip: we cant use $(wildcard stock/*.java) in the above rule as a race -# condition occurs, where javac is passed no arguments -####################################################################### -# -# JPGSql This isn't really an example, but an entire frontend -# for PostgreSQL via Java & JDBC. -# -# Requirements: Java2 platform (JDK1.2.x or 1.3) -# -retepsql: jdbc2internal postgresql.jar - -$(RM) retepsql.jar - @$(MAKE) retepsql.jar - @echo - @echo "The retepsql application has now been built. To run, simply" - @echo "type:" - @echo - @echo " java -jar retepsql.jar" - @echo - @echo "Note: Some operating systems recognise .jar as an executable," - @echo " so on those (and Windows is one of them), you can simply" - @echo " double click the jar file to start it." - -# All my classes have this prefix -RETEP= uk/org/retep - -# These classes form part of my personal swing library. I have placed these -# into the public domain, so there are no license issues... enjoy... -RETEPUTILS= $(RETEP)/swing/SwingApplication.class \ - $(RETEP)/swing/SwingApplication.class \ - -# This is my postgresql frontend. As it's never been released before, I've -# decided not only to publish it under the same licence as the JDBC driver, -# but also to put it along side the driver. To me it makes sense as it's the -# best example I have on showing how to use the driver ;-) -RETEPSQL= $(RETEP)/sql/DBConnection.class \ - $(RETEP)/sql/RetepSQL.class \ - -# Some ancilary files which are included in the jar file -RETEPSQLAUX= $(RETEP)/icons/ \ - -# The big rule, this builds the jpgsql.jar file which contains the entire -# application. DONT call this rule directly, but use the retepsql one, as -# it ensures that jdbc is also compiled first. -# -# Note: We include the postgresql.jar contents in this as well. Also the -# manifest entry MUST be immediately after $@ (note the -m option to jar). -# -retepsql.jar: $(RETEPUTILS) \ - $(RETEPSQL) - (echo "Manifest-Version: 1.0"; \ - echo "Created-By: 1.2 (Sun Microsystems Inc.)"; \ - echo "Main-Class: uk.org.retep.sql.RetepSQL"; \ - ) >manifest - $(JAR) -c0fm $@ manifest \ - `$(FIND) $(PGBASE) -name "*.class" -print` \ - $(wildcard $(PGBASE)/*.properties) \ - `$(FIND) $(RETEP) -name "*.class" -print` \ - $(RETEPSQLAUX) - -####################################################################### diff --git a/src/interfaces/jdbc/build.xml b/src/interfaces/jdbc/build.xml index 5f09ed887b..ef2c45ceb1 100644 --- a/src/interfaces/jdbc/build.xml +++ b/src/interfaces/jdbc/build.xml @@ -3,7 +3,7 @@ build file to allow ant (http://jakarta.apache.org/ant/) to be used to build the PostgreSQL JDBC Driver. - $Id: build.xml,v 1.6 2001/02/14 17:45:13 peter Exp $ + $Id: build.xml,v 1.7 2001/03/05 09:40:01 peter Exp $ --> @@ -63,6 +63,7 @@ + @@ -98,9 +99,11 @@ + + diff --git a/src/interfaces/jdbc/jdbc.jpx b/src/interfaces/jdbc/jdbc.jpx index 2fff9537a6..851c013e7b 100644 --- a/src/interfaces/jdbc/jdbc.jpx +++ b/src/interfaces/jdbc/jdbc.jpx @@ -9,7 +9,7 @@ - +