From 353371874f3050bafa1a9f4d7ad7253d70165d81 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Thu, 21 Sep 2000 20:17:43 +0000 Subject: [PATCH] Replace brain-dead Autoconf macros AC_ARG_{ENABLE,WITH} with something that's actually useful, robust, consistent. Better plan to generate aclocal.m4 as well: use m4 include directives, rather than cat. --- GNUmakefile.in | 21 +- aclocal.m4 | 461 +----------- config/general.m4 | 138 ++++ configure | 1583 ++++++++++++++++++++++------------------ configure.in | 449 ++++-------- src/Makefile.global.in | 5 +- 6 files changed, 1180 insertions(+), 1477 deletions(-) create mode 100644 config/general.m4 diff --git a/GNUmakefile.in b/GNUmakefile.in index f290564611..d981ccbdd4 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -1,7 +1,7 @@ # # PostgreSQL top level makefile # -# $Header: /cvsroot/pgsql/GNUmakefile.in,v 1.11 2000/08/31 16:08:58 petere Exp $ +# $Header: /cvsroot/pgsql/GNUmakefile.in,v 1.12 2000/09/21 20:17:41 petere Exp $ # subdir = @@ -34,25 +34,6 @@ GNUmakefile: GNUmakefile.in $(top_builddir)/config.status CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status -# These dependencies are risky because both the target and the sources -# are in CVS and CVS doesn't preserve timestamps, thus leading to -# unnecessary reruns of these rules. - -AUTOCONF = autoconf - -# Only use this rule if you actually said `make configure'. -ifeq ($(MAKECMDGOALS),configure) -$(top_srcdir)/configure: $(top_srcdir)/configure.in $(top_srcdir)/aclocal.m4 - cd $(top_srcdir) && $(AUTOCONF) -endif - -# This one we can leave unprotected because by default nothing depends -# on aclocal.m4. This rule is only invoked if you say `make -# aclocal.m4' or `make configure'. -$(top_srcdir)/aclocal.m4: $(wildcard $(top_srcdir)/config/*.m4) - cat $^ > $@ - - ########################################################################## distdir := postgresql-$(VERSION) diff --git a/aclocal.m4 b/aclocal.m4 index 1e9170805f..e03245ad21 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,453 +1,8 @@ -# $Header: /cvsroot/pgsql/aclocal.m4,v 1.7 2000/08/29 09:36:37 petere Exp $ -# This comes from the official Autoconf macro archive at -# -# (I removed the $ before the Id CVS keyword below.) - - -dnl @synopsis AC_FUNC_ACCEPT_ARGTYPES -dnl -dnl Checks the data types of the three arguments to accept(). Results are -dnl placed into the symbols ACCEPT_TYPE_ARG[123], consistent with the -dnl following example: -dnl -dnl #define ACCEPT_TYPE_ARG1 int -dnl #define ACCEPT_TYPE_ARG2 struct sockaddr * -dnl #define ACCEPT_TYPE_ARG3 socklen_t -dnl -dnl This macro requires AC_CHECK_HEADERS to have already verified the -dnl presence or absence of sys/types.h and sys/socket.h. -dnl -dnl NOTE: This is just a modified version of the AC_FUNC_SELECT_ARGTYPES -dnl macro. Credit for that one goes to David MacKenzie et. al. -dnl -dnl @version Id: ac_func_accept_argtypes.m4,v 1.1 1999/12/03 11:29:29 simons Exp $ -dnl @author Daniel Richard G. -dnl - -# PostgreSQL local changes: In the original version ACCEPT_TYPE_ARG3 -# is a pointer type. That's kind of useless because then you can't -# use the macro to define a corresponding variable. We also make the -# reasonable(?) assumption that you can use arg3 for getsocktype etc. -# as well (i.e., anywhere POSIX.2 has socklen_t). -# -# arg2 can also be `const' (e.g., RH 4.2). Change the order of tests -# for arg3 so that `int' is first, in case there is no prototype at all. - -AC_DEFUN(AC_FUNC_ACCEPT_ARGTYPES, -[AC_MSG_CHECKING([types of arguments for accept()]) - AC_CACHE_VAL(ac_cv_func_accept_arg1,dnl - [AC_CACHE_VAL(ac_cv_func_accept_arg2,dnl - [AC_CACHE_VAL(ac_cv_func_accept_arg3,dnl - [for ac_cv_func_accept_arg1 in 'int' 'unsigned int'; do - 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'; do - AC_TRY_COMPILE( -[#ifdef HAVE_SYS_TYPES_H -#include -#endif -#ifdef HAVE_SYS_SOCKET_H -#include -#endif -extern accept ($ac_cv_func_accept_arg1, $ac_cv_func_accept_arg2, $ac_cv_func_accept_arg3 *);], - [], [ac_not_found=no; break 3], [ac_not_found=yes]) - done - done - done - if test "$ac_not_found" = yes; then - AC_MSG_ERROR([could not determine argument types]) - fi - ])dnl AC_CACHE_VAL - ])dnl AC_CACHE_VAL - ])dnl AC_CACHE_VAL - AC_MSG_RESULT([$ac_cv_func_accept_arg1, $ac_cv_func_accept_arg2, $ac_cv_func_accept_arg3 *]) - AC_DEFINE_UNQUOTED(ACCEPT_TYPE_ARG1,$ac_cv_func_accept_arg1) - AC_DEFINE_UNQUOTED(ACCEPT_TYPE_ARG2,$ac_cv_func_accept_arg2) - AC_DEFINE_UNQUOTED(ACCEPT_TYPE_ARG3,$ac_cv_func_accept_arg3) -]) -# Macros to detect C compiler features -# $Header: /cvsroot/pgsql/aclocal.m4,v 1.7 2000/08/29 09:36:37 petere Exp $ - - -# PGAC_C_SIGNED -# ------------- -# Check if the C compiler understands signed types. -AC_DEFUN([PGAC_C_SIGNED], -[AC_CACHE_CHECK(for signed types, pgac_cv_c_signed, -[AC_TRY_COMPILE([], -[signed char c; signed short s; signed int i;], -[pgac_cv_c_signed=yes], -[pgac_cv_c_signed=no])]) -if test x"$pgac_cv_c_signed" = xno ; then - AC_DEFINE(signed,, [Define empty if the C compiler does not understand signed types]) -fi])# PGAC_C_SIGNED - - - -# PGAC_C_VOLATILE -# --------------- -# Check if the C compiler understands `volatile'. Note that if it doesn't -# then this will potentially break the program semantics. -AC_DEFUN([PGAC_C_VOLATILE], -[AC_CACHE_CHECK(for volatile, pgac_cv_c_volatile, -[AC_TRY_COMPILE([], -[extern volatile int i;], -[pgac_cv_c_volatile=yes], -[pgac_cv_c_volatile=no])]) -if test x"$pgac_cv_c_volatile" = xno ; then - AC_DEFINE(volatile,, [Define empty if the C compiler does not understand `volatile']) -fi])# PGAC_C_VOLATILE - - - -# PGAC_TYPE_64BIT_INT(TYPE) -# ------------------------- -# Check if TYPE is a working 64 bit integer type. Set HAVE_TYPE_64 to -# yes or no respectively, and define HAVE_TYPE_64 if yes. -AC_DEFUN([PGAC_TYPE_64BIT_INT], -[define([Ac_define], [translit([have_$1_64], [a-z *], [A-Z_P])])dnl -define([Ac_cachevar], [translit([pgac_cv_type_$1_64], [ *], [_p])])dnl -AC_CACHE_CHECK([whether $1 is 64 bits], [Ac_cachevar], -[AC_TRY_RUN( -[typedef $1 int64; - -/* - * These are globals to discourage the compiler from folding all the - * arithmetic tests down to compile-time constants. - */ -int64 a = 20000001; -int64 b = 40000005; - -int does_int64_work() -{ - int64 c,d; - - if (sizeof(int64) != 8) - return 0; /* definitely not the right size */ - - /* Do perfunctory checks to see if 64-bit arithmetic seems to work */ - c = a * b; - d = (c + b) / b; - if (d != a+1) - return 0; - return 1; -} -main() { - exit(! does_int64_work()); -}], -[Ac_cachevar=yes], -[Ac_cachevar=no], -[Ac_cachevar=no -dnl We will do better here with Autoconf 2.50 -AC_MSG_WARN([64 bit arithmetic disabled when cross-compiling])])]) - -Ac_define=$Ac_cachevar -if test x"$Ac_cachevar" = xyes ; then - AC_DEFINE(Ac_define,, [Set to 1 if `]$1[' is 64 bits]) -fi -undefine([Ac_define])dnl -undefine([Ac_cachevar])dnl -])# PGAC_TYPE_64BIT_INT - - - -# PGAC_CHECK_ALIGNOF(TYPE) -# ------------------------ -# Find the alignment requirement of the given type. Define the result -# as ALIGNOF_TYPE. If cross-compiling, sizeof(type) is used as a -# default assumption. -# -# This is modeled on the standard autoconf macro AC_CHECK_SIZEOF. -# That macro never got any points for style. -AC_DEFUN([PGAC_CHECK_ALIGNOF], -[changequote(<<, >>)dnl -dnl The name to #define. -define(<>, translit(alignof_$1, [a-z *], [A-Z_P]))dnl -dnl The cache variable name. -define(<>, translit(pgac_cv_alignof_$1, [ *], [_p]))dnl -changequote([, ])dnl -AC_MSG_CHECKING(alignment of $1) -AC_CACHE_VAL(AC_CV_NAME, -[AC_TRY_RUN([#include -struct { char filler; $1 field; } mystruct; -main() -{ - FILE *f=fopen("conftestval", "w"); - if (!f) exit(1); - fprintf(f, "%d\n", ((char*) & mystruct.field) - ((char*) & mystruct)); - exit(0); -}], AC_CV_NAME=`cat conftestval`, -AC_CV_NAME='sizeof($1)', -AC_CV_NAME='sizeof($1)')])dnl -AC_MSG_RESULT($AC_CV_NAME) -AC_DEFINE_UNQUOTED(AC_TYPE_NAME, $AC_CV_NAME, [The alignment requirement of a `]$1[']) -undefine([AC_TYPE_NAME])dnl -undefine([AC_CV_NAME])dnl -])# PGAC_CHECK_ALIGNOF -# Macros that test various C library quirks -# $Header: /cvsroot/pgsql/aclocal.m4,v 1.7 2000/08/29 09:36:37 petere Exp $ - - -# PGAC_VAR_INT_TIMEZONE -# --------------------- -# Check if the global variable `timezone' exists. If so, define -# HAVE_INT_TIMEZONE. -AC_DEFUN([PGAC_VAR_INT_TIMEZONE], -[AC_CACHE_CHECK(for int timezone, pgac_cv_var_int_timezone, -[AC_TRY_LINK([#include ], - [int res = timezone / 60;], - [pgac_cv_var_int_timezone=yes], - [pgac_cv_var_int_timezone=no])]) -if test x"$pgac_cv_var_int_timezone" = xyes ; then - AC_DEFINE(HAVE_INT_TIMEZONE,, [Set to 1 if you have the global variable timezone]) -fi])# PGAC_VAR_INT_TIMEZONE - - -# PGAC_FUNC_GETTIMEOFDAY_1ARG -# --------------------------- -# Check if gettimeofday() has only one arguments. (Normal is two.) -# If so, define GETTIMEOFDAY_1ARG. -AC_DEFUN([PGAC_FUNC_GETTIMEOFDAY_1ARG], -[AC_CACHE_CHECK(whether gettimeofday takes only one argument, -pgac_cv_func_gettimeofday_1arg, -[AC_TRY_COMPILE([#include ], -[struct timeval *tp; -struct timezone *tzp; -gettimeofday(tp,tzp);], -[pgac_cv_func_gettimeofday_1arg=no], -[pgac_cv_func_gettimeofday_1arg=yes])]) -if test x"$pgac_cv_func_gettimeofday_1arg" = xyes ; then - AC_DEFINE(GETTIMEOFDAY_1ARG,, [Set to 1 if gettimeofday() takes only 1 argument]) -fi])# PGAC_FUNC_GETTIMEOFDAY_1ARG - - -# PGAC_UNION_SEMUN -# ---------------- -# Check if `union semun' exists. Define HAVE_UNION_SEMUN if so. -# If it doesn't then one could define it as -# union semun { int val; struct semid_ds *buf; unsigned short *array; } -AC_DEFUN([PGAC_UNION_SEMUN], -[AC_CACHE_CHECK(for union semun, pgac_cv_union_semun, -[AC_TRY_COMPILE([#include -#include -#include ], - [union semun semun;], - [pgac_cv_union_semun=yes], - [pgac_cv_union_semun=no])]) -if test x"$pgac_cv_union_semun" = xyes ; then - AC_DEFINE(HAVE_UNION_SEMUN,, [Set to 1 if you have `union semun']) -fi])# PGAC_UNION_SEMUN - - -# PGAC_FUNC_POSIX_SIGNALS -# ----------------------- -# Check to see if the machine has the POSIX signal interface. Define -# HAVE_POSIX_SIGNALS if so. Also set the output variable HAVE_POSIX_SIGNALS -# to yes or no. -# -# Note that this test only compiles a test program, it doesn't check -# whether the routines actually work. If that becomes a problem, make -# a fancier check. -AC_DEFUN([PGAC_FUNC_POSIX_SIGNALS], -[AC_CACHE_CHECK(for POSIX signal interface, pgac_cv_func_posix_signals, -[AC_TRY_LINK([#include -], -[struct sigaction act, oact; -sigemptyset(&act.sa_mask); -act.sa_flags = SA_RESTART; -sigaction(0, &act, &oact);], -[pgac_cv_func_posix_signals=yes], -[pgac_cv_func_posix_signals=no])]) -if test x"$pgac_cv_func_posix_signals" = xyes ; then - AC_DEFINE(HAVE_POSIX_SIGNALS,, [Set to 1 if you have the POSIX signal interface]) -fi -HAVE_POSIX_SIGNALS=$pgac_cv_func_posix_signals -AC_SUBST(HAVE_POSIX_SIGNALS)])# PGAC_FUNC_POSIX_SIGNALS -# Macros to detect certain C++ features -# $Header: /cvsroot/pgsql/aclocal.m4,v 1.7 2000/08/29 09:36:37 petere Exp $ - - -# PGAC_CLASS_STRING -# ----------------- -# Look for class `string'. First look for the header. If this -# is found a header then it's probably safe to assume that -# class string exists. If not, check to make sure that -# defines class `string'. -AC_DEFUN([PGAC_CLASS_STRING], -[AC_LANG_SAVE -AC_LANG_CPLUSPLUS -AC_CHECK_HEADER(string, - [AC_DEFINE(HAVE_CXX_STRING_HEADER)]) - -if test x"$ac_cv_header_string" != xyes ; then - AC_CACHE_CHECK([for class string in ], - [pgac_cv_class_string_in_string_h], - [AC_TRY_COMPILE([#include -#include -#include -], - [string foo = "test"], - [pgac_cv_class_string_in_string_h=yes], - [pgac_cv_class_string_in_string_h=no])]) - - if test x"$pgac_cv_class_string_in_string_h" != xyes ; then - AC_MSG_ERROR([neither nor seem to define the C++ class \`string\']) - fi -fi -AC_LANG_RESTORE])# PGAC_CLASS_STRING - - -# PGAC_CXX_NAMESPACE_STD -# ---------------------- -# Check whether the C++ compiler understands `using namespace std'. -# -# Note 1: On at least some compilers, it will not work until you've -# included a header that mentions namespace std. Thus, include the -# usual suspects before trying it. -# -# Note 2: This test does not actually reveal whether the C++ compiler -# properly understands namespaces in all generality. (GNU C++ 2.8.1 -# is one that doesn't.) However, we don't care. -AC_DEFUN([PGAC_CXX_NAMESPACE_STD], -[AC_REQUIRE([PGAC_CLASS_STRING]) -AC_CACHE_CHECK([for namespace std in C++], -pgac_cv_cxx_namespace_std, -[ -AC_LANG_SAVE -AC_LANG_CPLUSPLUS -AC_TRY_COMPILE( -[#include -#include -#ifdef HAVE_CXX_STRING_HEADER -#include -#endif -using namespace std; -], [], -[pgac_cv_cxx_namespace_std=yes], -[pgac_cv_cxx_namespace_std=no]) -AC_LANG_RESTORE]) - -if test $pgac_cv_cxx_namespace_std = yes ; then - AC_DEFINE(HAVE_NAMESPACE_STD, 1, [Define to 1 if the C++ compiler understands `using namespace std']) -fi])# PGAC_CXX_NAMESPACE_STD -# $Header: /cvsroot/pgsql/aclocal.m4,v 1.7 2000/08/29 09:36:37 petere 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. - -AC_DEFUN([PGAC_PATH_FLEX], -[AC_CACHE_CHECK([for flex], pgac_cv_path_flex, -[# Let the user override the test -if test -n "$FLEX"; then - pgac_cv_path_flex=$FLEX -else - pgac_save_IFS=$IFS - IFS=: - for pgac_dir in $PATH; do - if test -z "$pgac_dir" || test x"$pgac_dir" = x"."; then - pgac_dir=`pwd` - fi - for pgac_prog in flex lex; do - pgac_candidate="$pgac_dir/$pgac_prog" - if test -f "$pgac_candidate" \ - && $pgac_candidate --version >/dev/null 2>&1 - then - echo '%%' > conftest.l - if $pgac_candidate -t conftest.l 2>/dev/null | grep FLEX_SCANNER >/dev/null 2>&1; then - if $pgac_candidate --version | grep '2\.5\.3' >/dev/null 2>&1; then - pgac_broken_flex=$pgac_candidate - continue - fi - - pgac_cv_path_flex=$pgac_candidate - break 2 - fi - fi - done - done - IFS=$pgac_save_IFS - rm -f conftest.l - : ${pgac_cv_path_flex=no} -fi -])[]dnl AC_CACHE_CHECK - -if test x"$pgac_cv_path_flex" = x"no"; then - if test -n "$pgac_broken_flex"; then - AC_MSG_WARN([ -*** -The Flex version 2.5.3 you have at $pgac_broken_flex contains a bug. You -should get version 2.5.4 or later. -###]) - fi - - AC_MSG_WARN([ -*** -Without Flex you won't be able to build PostgreSQL from scratch, or change -any of the scanner definition files. You can obtain Flex from a GNU mirror -site. (If you are using the official distribution of PostgreSQL then you -do not need to worry about this because the lexer files are pre-generated.) -***]) -fi - -if test x"$pgac_cv_path_flex" = x"no"; then - FLEX= -else - FLEX=$pgac_cv_path_flex -fi - -AC_SUBST(FLEX) -AC_SUBST(FLEXFLAGS) -])# PGAC_PATH_FLEX -# -# Autoconf macros for configuring the build of Python extension modules -# -# $Header: /cvsroot/pgsql/aclocal.m4,v 1.7 2000/08/29 09:36:37 petere Exp $ -# - -# PGAC_PROG_PYTHON -# ---------------- -# Look for Python and set the output variable `PYTHON' -# to `python' if found, empty otherwise. -AC_DEFUN([PGAC_PROG_PYTHON], -[AC_CHECK_PROG(PYTHON, python, python)]) - - -# PGAC_PATH_PYTHONDIR -# ------------------- -# Finds the names of various install dirs and helper files -# necessary to build a Python extension module. -# -# It would be nice if we could check whether the current setup allows -# the build of the shared module. Future project. -AC_DEFUN([PGAC_PATH_PYTHONDIR], -[AC_REQUIRE([PGAC_PROG_PYTHON]) -[if test "${PYTHON+set}" = set ; then - python_version=`${PYTHON} -c "import sys; print sys.version[:3]"` - python_prefix=`${PYTHON} -c "import sys; print sys.prefix"` - python_execprefix=`${PYTHON} -c "import sys; print sys.exec_prefix"` - python_configdir="${python_execprefix}/lib/python${python_version}/config" - python_moduledir="${python_prefix}/lib/python${python_version}" - python_extmakefile="${python_configdir}/Makefile.pre.in"] - - AC_MSG_CHECKING(for Python extension makefile) - if test -f "${python_extmakefile}" ; then - AC_MSG_RESULT(found) - else - AC_MSG_RESULT(no) - AC_MSG_ERROR( -[The Python extension makefile was expected at \`${python_extmakefile}\' -but does not exist. This means the Python module cannot be built automatically.]) - fi - - AC_SUBST(python_version) - AC_SUBST(python_prefix) - AC_SUBST(python_execprefix) - AC_SUBST(python_configdir) - AC_SUBST(python_moduledir) - AC_SUBST(python_extmakefile) -else - AC_MSG_ERROR([Python not found]) -fi])# PGAC_PATH_PYTHONDIR +dnl $Header: /cvsroot/pgsql/aclocal.m4,v 1.8 2000/09/21 20:17:41 petere 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/general.m4]) +builtin([include], [config/programs.m4]) +builtin([include], [config/python.m4]) diff --git a/config/general.m4 b/config/general.m4 new file mode 100644 index 0000000000..2e17f2ba0b --- /dev/null +++ b/config/general.m4 @@ -0,0 +1,138 @@ +# $Header: /cvsroot/pgsql/config/general.m4,v 1.1 2000/09/21 20:17:42 petere Exp $ + +# This file defines new macros to process configure command line +# arguments, to replace the brain-dead AC_ARG_WITH and AC_ARG_ENABLE. +# The flaw in these is particularly that they only differentiate +# between "given" and "not given" and do not provide enough help to +# process arguments that only accept "yes/no", that require an +# argument (other than "yes/no"), etc. +# +# The point of this implementation is to reduce code size and +# redundancy in configure.in and to improve robustness and consistency +# in the option evaluation code. + + +# print an error message and exit (while running `autoconf') +define([pgac_error], + [errprint(__file__:__line__[: error: $1 +]) + m4exit(10)]) + + +# Convert type and name to shell variable name (e.g., "enable_long_strings") +define([pgac_arg_to_variable], + [$1[]_[]patsubst($2, -, _)]) + + +# PGAC_ARG(TYPE, NAME, HELP-STRING, +# [ACTION-IF-YES], [ACTION-IF-NO], [ACTION-IF-ARG], +# [ACTION-IF-OMITTED]) +# ---------------------------------------------------------- +# This is the base layer. TYPE is either "with" or "enable", depending +# on what you like. NAME is the rest of the option name, HELP-STRING +# as usual. ACTION-IF-YES is executed if the option is given without +# and argument (or "yes", which is the same); similar for ACTION-IF-NO. + +AC_DEFUN([PGAC_ARG], +[dnl Check arguments +ifelse([$1], enable, , + [$1], with, , + [pgac_error([first argument of $0 must be `enable' or `with', not `$1'])])[]dnl +define([pgac_variable], [pgac_arg_to_variable([$1], [$2])])[]dnl +dnl Register help string, only if there is one +ifelse([$3], [], [], +[AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl +ac_help="$ac_help +[$3]" +AC_DIVERT_POP()])dnl +[#] Check whether --$1-$2 was given +if test x"[$]{pgac_variable+set}" = xset; then + case [$]pgac_variable in + yes) + ifelse([$4], [], :, [$4]) + ;; + no) + ifelse([$5], [], :, [$5]) + ;; +dnl Action if called with argument +ifelse([$6], [], [], +[ *) +dnl Set up $withval or $enableval + $1[]val=[$]pgac_variable + $6 + ;; +])[]dnl + esac [#] [$]pgac_variable +dnl Action if omitted +ifelse([$7], [], [], +[else + $7 +])[]dnl +fi[]dnl +undefine([pgac_variable])dnl +])# PGAC_ARG + + +# PGAC_ARG_BOOL(TYPE, NAME, DEFAULT, HELP-STRING, +# [ACTION-IF-YES], [ACTION-IF-NO]) +# ----------------------------------------------- +# Accept a boolean option, that is, one that only takes yes or no. +# ("no" is equivalent to "disable" or "without"). DEFAULT is what +# should be done if the option is omitted; it should be "yes" or "no". +# (Consequently, one of ACTION-IF-YES and ACTION-IF-NO will always +# execute.) + +AC_DEFUN([PGAC_ARG_BOOL], +[PGAC_ARG([$1], [$2], [$4], [$5], [$6], + [AC_MSG_ERROR([no argument expected for --$1-$2 option])], + [ifelse([$3], yes, [pgac_arg_to_variable([$1], [$2])=yes +$5], + [$3], no, [pgac_arg_to_variable([$1], [$2])=no +$6], + [pgac_error([third argument of $0 must be `yes' or `no', not `$3'])])])[]dnl +])# PGAC_ARG_BOOL + + +# PGAC_ARG_REQ(TYPE, NAME, HELP-STRING, [ACTION-IF-GIVEN], [ACTION-IF-NOT-GIVEN]) +# ------------------------------------------------------------------------------- +# This option will require an argument; "yes" or "no" will not be +# accepted. + +AC_DEFUN([PGAC_ARG_REQ], +[PGAC_ARG([$1], [$2], [$3], + [AC_MSG_ERROR([argument required for --$1-$2 option])], + [AC_MSG_ERROR([argument required for --$1-$2 option])], + [$4], + [$5])])# PGAC_ARG_REQ + + +# PGAC_ARG_OPTARG(TYPE, NAME, HELP-STRING, [DEFAULT-ACTION], [ARG-ACTION] +# [ACTION-ENABLED], [ACTION-DISABLED]) +# ----------------------------------------------------------------------- +# This will create an option that behaves as follows: If omitted, or +# called with "no", then set the enable_variable to "no" and do +# nothing else. If called with "yes", then execute DEFAULT-ACTION. If +# called with argument, set enable_variable to "yes" and execute +# ARG-ACTION. Additionally, execute ACTION-ENABLED if we ended up with +# "yes" either way, else ACTION-DISABLED. +# +# The intent is to allow enabling a feature, and optionally pass an +# additional piece of information. + +AC_DEFUN([PGAC_ARG_OPTARG], +[PGAC_ARG([$1], [$2], [$3], [$4], [], + [pgac_arg_to_variable([$1], [$2])=yes +$5], + [pgac_arg_to_variable([$1], [$2])=no]) +dnl Add this code only if there's a ACTION-ENABLED or ACTION-DISABLED. +ifelse([$6[]$7], [], [], +[ +if test "[$]pgac_arg_to_variable([$1], [$2])" = yes; then + ifelse([$6], [], :, [$6]) +ifelse([$7], [], [], +[else + $7 +])[]dnl +fi +])[]dnl +])# PGAC_ARG_OPTARG diff --git a/configure b/configure index f7b6a0e473..fa9d533574 100755 --- a/configure +++ b/configure @@ -21,7 +21,7 @@ ac_help="$ac_help ac_help="$ac_help --enable-locale enable locale support" ac_help="$ac_help - --enable-recode enable cyrillic recode support" + --enable-recode enable character set recode support" ac_help="$ac_help --enable-multibyte enable multibyte character support" ac_help="$ac_help @@ -33,29 +33,29 @@ ac_help="$ac_help ac_help="$ac_help --enable-debug build with debugging symbols (-g)" ac_help="$ac_help - --with-tcl build Tcl interfaces and pgtclsh " + --enable-cassert enable assertion checks (for debugging)" +ac_help="$ac_help + --with-tcl build Tcl interfaces and pgtclsh" ac_help="$ac_help --with-tclconfig=DIR tclConfig.sh and tkConfig.sh are in DIR" ac_help="$ac_help --with-tkconfig=DIR tkConfig.sh is in DIR" ac_help="$ac_help - --with-perl build Perl interface and plperl" + --with-perl build Perl interface and PL/Perl" ac_help="$ac_help --with-python build Python interface module" ac_help="$ac_help - --with-krb4[=DIR] use Kerberos 4 [/usr/athena]" + --with-krb4[=DIR] build with Kerberos 4 support [/usr/athena]" ac_help="$ac_help - --with-krb5[=DIR] use Kerberos 5 [/usr/athena]" + --with-krb5[=DIR] build with Kerberos 5 support [/usr/athena]" ac_help="$ac_help - --with-krb-srvnam=NAME name of the Postgres service principal in Kerberos" + --with-krb-srvnam=NAME name of the PostgreSQL service principal in Kerberos" ac_help="$ac_help --with-openssl[=DIR] build with OpenSSL support [/usr/local/ssl]" ac_help="$ac_help --enable-odbc build the ODBC driver package" ac_help="$ac_help --with-odbcinst=DIR default directory for odbcinst.ini [sysconfdir]" -ac_help="$ac_help - --enable-cassert enable assertion checks (for debugging) " ac_help="$ac_help --with-CXX build C++ modules (libpq++)" ac_help="$ac_help @@ -638,19 +638,32 @@ template= echo $ac_n "checking which template to use""... $ac_c" 1>&6 echo "configure:640: checking which template to use" >&5 -# check if --with-template was given -if test x"${with_template+set}" = xset ; then +# Check whether --with-template was given +if test x"${with_template+set}" = xset; then case $with_template in - yes|no) { echo "configure: error: You must supply an argument to the --with-template option." 1>&2; exit 1; };; + yes) + { echo "configure: error: argument required for --with-template option" 1>&2; exit 1; } + ;; + no) + { echo "configure: error: argument required for --with-template option" 1>&2; exit 1; } + ;; + *) + withval=$with_template + + case $withval in list) echo; ls "$srcdir/src/template"; exit;; *) if test -f "$srcdir/src/template/$with_template" ; then - template=$with_template + template=$withval else - { echo "configure: error: \`$with_template' is not a valid template name. Use \`list' for a list." 1>&2; exit 1; } + { echo "configure: error: \`$withval' is not a valid template name. Use \`list' for a list." 1>&2; exit 1; } fi;; esac -else # --with-template not given + ;; + esac # $with_template +else + + # --with-template not given case $host_os in aix*) template=aix ;; @@ -696,7 +709,8 @@ line. " 1>&2; exit 1; } fi -fi # --with-template not given + +fi echo "$ac_t""$template" 1>&6 @@ -737,87 +751,110 @@ fi # # Add non-standard directories to the include path # -# Check whether --with-includes or --without-includes was given. -if test "${with_includes+set}" = set; then - withval="$with_includes" - - case $withval in - yes | no) { echo "configure: error: You must supply an argument to the --with-includes option." 1>&2; exit 1; };; - esac - +# Check whether --with-includes was given +if test x"${with_includes+set}" = xset; then + case $with_includes in + yes) + { echo "configure: error: argument required for --with-includes option" 1>&2; exit 1; } + ;; + no) + { echo "configure: error: argument required for --with-includes option" 1>&2; exit 1; } + ;; + esac # $with_includes fi - # # Add non-standard directories to the library search path # -# Check whether --with-libraries or --without-libraries was given. -if test "${with_libraries+set}" = set; then - withval="$with_libraries" - - case $withval in - yes | no) { echo "configure: error: You must supply an argument to the --with-libraries option." 1>&2; exit 1; };; - esac - LIBRARY_DIRS=$withval - +# Check whether --with-libraries was given +if test x"${with_libraries+set}" = xset; then + case $with_libraries in + yes) + { echo "configure: error: argument required for --with-libraries option" 1>&2; exit 1; } + ;; + no) + { echo "configure: error: argument required for --with-libraries option" 1>&2; exit 1; } + ;; + *) + withval=$with_libraries + LIBRARY_DIRS=$withval + ;; + esac # $with_libraries fi - -# Check whether --with-libs or --without-libs was given. -if test "${with_libs+set}" = set; then - withval="$with_libs" - - case $withval in - yes | no) { echo "configure: error: You must supply an argument to the --with-libs option." 1>&2; exit 1; };; - esac - LIBRARY_DIRS=$withval - +# Check whether --with-libs was given +if test x"${with_libs+set}" = xset; then + case $with_libs in + yes) + { echo "configure: error: argument required for --with-libs option" 1>&2; exit 1; } + ;; + no) + { echo "configure: error: argument required for --with-libs option" 1>&2; exit 1; } + ;; + *) + withval=$with_libs + LIBRARY_DIRS=$withval + ;; + esac # $with_libs fi - # # Locale (--enable-locale) # echo $ac_n "checking whether to build with locale support""... $ac_c" 1>&6 -echo "configure:785: checking whether to build with locale support" >&5 -# Check whether --enable-locale or --disable-locale was given. -if test "${enable_locale+set}" = set; then - enableval="$enable_locale" - if test x"$enable_locale" != x"no" ; then - enable_locale=yes - cat >> confdefs.h <<\EOF +echo "configure:808: 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 + yes) + cat >> confdefs.h <<\EOF #define USE_LOCALE 1 EOF -fi + ;; + no) + : + ;; + *) + enableval=$enable_locale + { echo "configure: error: no argument expected for --enable-locale option" 1>&2; exit 1; } + ;; + esac # $enable_locale else enable_locale=no -fi +fi echo "$ac_t""$enable_locale" 1>&6 # -# Cyrillic recode (--enable-recode) +# Character set recode (--enable-recode) # -echo $ac_n "checking whether to build with Cyrillic recode support""... $ac_c" 1>&6 -echo "configure:807: checking whether to build with Cyrillic recode support" >&5 -# Check whether --enable-recode or --disable-recode was given. -if test "${enable_recode+set}" = set; then - enableval="$enable_recode" - if test x"$enable_recode" != x"no" ; then - enable_recode=yes - cat >> confdefs.h <<\EOF +echo $ac_n "checking whether to build with recode support""... $ac_c" 1>&6 +echo "configure:837: 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 + yes) + cat >> confdefs.h <<\EOF #define CYR_RECODE 1 EOF -fi + ;; + no) + : + ;; + *) + enableval=$enable_recode + { echo "configure: error: no argument expected for --enable-recode option" 1>&2; exit 1; } + ;; + esac # $enable_recode else enable_recode=no -fi +fi echo "$ac_t""$enable_recode" 1>&6 @@ -826,59 +863,77 @@ 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:830: checking whether to build with multibyte character support" >&5 -# Check whether --enable-multibyte or --disable-multibyte was given. -if test "${enable_multibyte+set}" = set; then - enableval="$enable_multibyte" - +echo "configure:867: checking whether to build with multibyte character support" >&5 + +# Check whether --enable-multibyte was given +if test x"${enable_multibyte+set}" = xset; then + case $enable_multibyte in + yes) + MULTIBYTE=SQL_ASCII + ;; + no) + : + ;; + *) + enableval=$enable_multibyte + enable_multibyte=yes + case $enableval in - no) enable_multibyte=no;; - yes) enable_multibyte=yes; MULTIBYTE=SQL_ASCII;; SQL_ASCII|EUC_JP|EUC_CN|EUC_KR|EUC_TW|UNICODE|MULE_INTERNAL|LATIN1|LATIN2|LATIN3|LATIN4|LATIN5|KOI8|WIN|ALT) - enable_multibyte=yes; MULTIBYTE=$enableval;; - *) { echo "configure: error: argument to --enable-multibyte must be one of: + MULTIBYTE=$enableval;; + *) + { echo "configure: error: argument to --enable-multibyte must be one of: SQL_ASCII, EUC_JP, EUC_CN, EUC_KR, EUC_TW, UNICODE, MULE_INTERNAL, LATIN1, LATIN2, LATIN3, LATIN4, LATIN5, KOI8, WIN, ALT -Or do not specify an argument to the option to use the default." 1>&2; exit 1; } ;; +Or do not specify an argument to the option to use the default." 1>&2; exit 1; };; esac + ;; + esac # $enable_multibyte else enable_multibyte=no fi - - - -if test "$enable_multibyte" = yes ; then +if test "$enable_multibyte" = yes; then + cat >> confdefs.h <<\EOF #define MULTIBYTE 1 EOF echo "$ac_t""yes, default $MULTIBYTE" 1>&6 + else echo "$ac_t""no" 1>&6 fi + + + # # Default port number (--with-pgport), default 5432 # echo $ac_n "checking for default port number""... $ac_c" 1>&6 -echo "configure:870: checking for default port number" >&5 -# Check whether --with-pgport or --without-pgport was given. -if test "${with_pgport+set}" = set; then - withval="$with_pgport" - case $withval in - yes|no) { echo "configure: error: You must supply an argument to the --with-pgport option" 1>&2; exit 1; };; - *) default_port=$withval;; -esac - +echo "configure:920: checking for default port number" >&5 +# Check whether --with-pgport was given +if test x"${with_pgport+set}" = xset; then + case $with_pgport in + yes) + { echo "configure: error: argument required for --with-pgport option" 1>&2; exit 1; } + ;; + no) + { echo "configure: error: argument required for --with-pgport option" 1>&2; exit 1; } + ;; + *) + withval=$with_pgport + default_port=$withval + ;; + esac # $with_pgport else default_port=5432 fi - # Need both of these because backend wants an integer and frontend a string cat >> confdefs.h <&6 # 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:899: checking for default soft limit on number of connections" >&5 -# Check whether --with-maxbackends or --without-maxbackends was given. -if test "${with_maxbackends+set}" = set; then - withval="$with_maxbackends" - case $withval in - yes|no) { echo "configure: error: You must supply an argument to the --with-maxbackends option" 1>&2; exit 1; };; -esac +echo "configure:954: 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 + yes) + { echo "configure: error: argument required for --with-maxbackends option" 1>&2; exit 1; } + ;; + no) + { echo "configure: error: argument required for --with-maxbackends option" 1>&2; exit 1; } + ;; + esac # $with_maxbackends else with_maxbackends=32 fi - echo "$ac_t""$with_maxbackends" 1>&6 cat >> confdefs.h <&2; exit 1; };; - *) CC=$with_CC;; - esac + yes) + { echo "configure: error: argument required for --with-CC option" 1>&2; exit 1; } + ;; + no) + { echo "configure: error: argument required for --with-CC option" 1>&2; exit 1; } + ;; + *) + withval=$with_CC + CC=$with_CC + ;; + esac # $with_CC fi # On AIX, default compiler to xlc. @@ -933,7 +1000,7 @@ if test "$template" = aix && test -z "$CC" ; then CC=xlc; fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:937: checking for $ac_word" >&5 +echo "configure:1004: 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 @@ -963,7 +1030,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:967: checking for $ac_word" >&5 +echo "configure:1034: 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 @@ -1014,7 +1081,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:1018: checking for $ac_word" >&5 +echo "configure:1085: 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 @@ -1046,7 +1113,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1050: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1117: 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. @@ -1057,12 +1124,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1061 "configure" +#line 1128 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1133: \"$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 @@ -1088,12 +1155,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:1092: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1159: 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:1097: checking whether we are using GNU C" >&5 +echo "configure:1164: 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 @@ -1102,7 +1169,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1106: \"$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:1173: \"$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 @@ -1121,7 +1188,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:1125: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1192: 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 @@ -1157,7 +1224,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:1161: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1228: 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. @@ -1168,12 +1235,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1172 "configure" +#line 1239 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1244: \"$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 @@ -1199,12 +1266,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:1203: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1270: 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 how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1208: checking how to run the C preprocessor" >&5 +echo "configure:1275: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1219,13 +1286,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:1229: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1296: \"$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 : @@ -1236,13 +1303,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:1246: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1313: \"$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 : @@ -1253,13 +1320,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:1263: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1330: \"$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 : @@ -1285,13 +1352,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:1289: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:1356: 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 @@ -1309,7 +1376,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -1352,42 +1419,76 @@ EOF # # Automatic dependency tracking # -# Check whether --enable-depend or --disable-depend was given. -if test "${enable_depend+set}" = set; then - enableval="$enable_depend" - - if test x"$enableval" = x"yes" ; then - autodepend=yes - fi - -fi - - - - -# --enable-debug adds -g to compiler flags -# --disable-debug will forcefully remove it -echo $ac_n "checking setting debug compiler flag""... $ac_c" 1>&6 -echo "configure:1372: checking setting debug compiler flag" >&5 -# Check whether --enable-debug or --disable-debug was given. -if test "${enable_debug+set}" = set; then - enableval="$enable_debug" - - case $enableval in - yes) CFLAGS="$CFLAGS -g" - echo "$ac_t""yes" 1>&6 - ;; - *) CFLAGS=`echo "$CFLAGS" | sed -e 's/ -g/ /g' -e 's/^-g//'` - echo "$ac_t""no" 1>&6 - ;; - esac - +# Check whether --enable-depend was given +if test x"${enable_depend+set}" = xset; then + case $enable_depend in + yes) + autodepend=yes + ;; + no) + : + ;; + *) + enableval=$enable_depend + { echo "configure: error: no argument expected for --enable-depend option" 1>&2; exit 1; } + ;; + esac # $enable_depend else - echo "$ac_t""using default" 1>&6 + enable_depend=no + fi +# +# --enable-debug adds -g to compiler flags +# +# Check whether --enable-debug was given +if test x"${enable_debug+set}" = xset; then + case $enable_debug in + yes) + CFLAGS="$CFLAGS -g" + ;; + no) + : + ;; + *) + enableval=$enable_debug + { echo "configure: error: no argument expected for --enable-debug option" 1>&2; exit 1; } + ;; + esac # $enable_debug +else + enable_debug=no + +fi + + +# +# Enable assert checks +# +# Check whether --enable-cassert was given +if test x"${enable_cassert+set}" = xset; then + case $enable_cassert in + yes) + cat >> confdefs.h <<\EOF +#define USE_ASSERT_CHECKING 1 +EOF + + ;; + no) + : + ;; + *) + enableval=$enable_cassert + { echo "configure: error: no argument expected for --enable-cassert option" 1>&2; exit 1; } + ;; + esac # $enable_cassert +else + enable_cassert=no + +fi + + # # Include directories # @@ -1422,87 +1523,112 @@ IFS=$ac_save_IFS +# We exclude tcl support unless user says --with-tcl echo $ac_n "checking setting USE_TCL""... $ac_c" 1>&6 -echo "configure:1427: checking setting USE_TCL" >&5 -# Check whether --with-tcl or --without-tcl was given. -if test "${with_tcl+set}" = set; then - withval="$with_tcl" - - case "$withval" in - y | ye | yes) USE_TCL=true; USE_TK=true; echo "$ac_t""enabled" 1>&6 ;; - *) USE_TCL=; USE_TK=; echo "$ac_t""disabled" 1>&6 ;; - esac - +echo "configure:1529: checking setting USE_TCL" >&5 +# Check whether --with-tcl was given +if test x"${with_tcl+set}" = xset; then + case $with_tcl in + yes) + USE_TCL=true; USE_TK=true; echo "$ac_t""enabled" 1>&6 + ;; + no) + USE_TCL=; USE_TK=; echo "$ac_t""disabled" 1>&6 + ;; + *) + withval=$with_tcl + { echo "configure: error: no argument expected for --with-tcl option" 1>&2; exit 1; } + ;; + esac # $with_tcl else - USE_TCL=; USE_TK=; echo "$ac_t""disabled" 1>&6 - + with_tcl=no +USE_TCL=; USE_TK=; echo "$ac_t""disabled" 1>&6 fi +# We see if the path to the TCL/TK configuration scripts is specified. +# This will override the use of tclsh to find the paths to search. - -# Check whether --with-tclconfig or --without-tclconfig was given. -if test "${with_tclconfig+set}" = set; then - withval="$with_tclconfig" - - case "$withval" in - "" | y | ye | yes | n | no) - { echo "configure: error: *** You must supply an argument to the --with-tclconfig option." 1>&2; exit 1; } - ;; - esac - TCL_DIRS="$withval" - - +# Check whether --with-tclconfig was given +if test x"${with_tclconfig+set}" = xset; then + case $with_tclconfig in + yes) + { echo "configure: error: argument required for --with-tclconfig option" 1>&2; exit 1; } + ;; + no) + { echo "configure: error: argument required for --with-tclconfig option" 1>&2; exit 1; } + ;; + *) + withval=$with_tclconfig + TCL_DIRS=$withval + ;; + esac # $with_tclconfig fi +# We see if the path to the TK configuration scripts is specified. +# This will override the use of tclsh to find the paths to search. -# Check whether --with-tkconfig or --without-tkconfig was given. -if test "${with_tkconfig+set}" = set; then - withval="$with_tkconfig" - - case "$withval" in - "" | y | ye | yes | n | no) - { echo "configure: error: *** You must supply an argument to the --with-tkconfig option." 1>&2; exit 1; } - ;; - esac - TK_DIRS="$withval" - - +# Check whether --with-tkconfig was given +if test x"${with_tkconfig+set}" = xset; then + case $with_tkconfig in + yes) + { echo "configure: error: argument required for --with-tkconfig option" 1>&2; exit 1; } + ;; + no) + { echo "configure: error: argument required for --with-tkconfig option" 1>&2; exit 1; } + ;; + *) + withval=$with_tkconfig + TK_DIRS=$withval + ;; + esac # $with_tkconfig 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:1480: checking whether to build Perl modules" >&5 -# Check whether --with-perl or --without-perl was given. -if test "${with_perl+set}" = set; then - withval="$with_perl" - if test x"${withval}" = x"yes" ; then - echo "$ac_t""yes" 1>&6 +echo "configure:1596: 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 + yes) + : + ;; + no) + : + ;; + *) + withval=$with_perl + { echo "configure: error: no argument expected for --with-perl option" 1>&2; exit 1; } + ;; + esac # $with_perl else - echo "$ac_t""no" 1>&6 -fi -else - echo "$ac_t""no" 1>&6 + with_perl=no + fi +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:1497: checking whether to build Python modules" >&5 -# Check whether --with-python or --without-python was given. -if test "${with_python+set}" = set; then - withval="$with_python" - if test x"${withval}" = x"yes" ; then - echo "$ac_t""yes" 1>&6 - # Extract the first word of "python", so it can be a program name with args. +echo "configure:1623: 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 + yes) + echo "$ac_t""yes" 1>&6 +# Extract the first word of "python", so it can be a program name with args. set dummy python; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1506: checking for $ac_word" >&5 +echo "configure:1632: 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 @@ -1528,7 +1654,7 @@ else echo "$ac_t""no" 1>&6 fi - + if test "${PYTHON+set}" = set ; then python_version=`${PYTHON} -c "import sys; print sys.version[:3]"` python_prefix=`${PYTHON} -c "import sys; print sys.prefix"` @@ -1538,7 +1664,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:1542: checking for Python extension makefile" >&5 +echo "configure:1668: checking for Python extension makefile" >&5 if test -f "${python_extmakefile}" ; then echo "$ac_t""found" 1>&6 else @@ -1556,13 +1682,19 @@ but does not exist. This means the Python module cannot be built automatically." else { echo "configure: error: Python not found" 1>&2; exit 1; } fi + ;; + no) + echo "$ac_t""no" 1>&6 + ;; + *) + withval=$with_python + { echo "configure: error: no argument expected for --with-python option" 1>&2; exit 1; } + ;; + esac # $with_python else - echo "$ac_t""no" 1>&6 + with_python=no +echo "$ac_t""no" 1>&6 fi -else - echo "$ac_t""no" 1>&6 -fi - @@ -1570,29 +1702,30 @@ fi # # Kerberos 4 # -# Check whether --with-krb4 or --without-krb4 was given. -if test "${with_krb4+set}" = set; then - withval="$with_krb4" - if test x"$withval" != x"no"; then - if test x"$withval" != x"yes"; then - krb4_prefix=$withval - else - krb4_prefix=/usr/athena - fi - with_krb4=yes -else - with_krb4=no -fi +# Check whether --with-krb4 was given +if test x"${with_krb4+set}" = xset; then + case $with_krb4 in + yes) + krb4_prefix=/usr/athena + ;; + no) + : + ;; + *) + withval=$with_krb4 + with_krb4=yes +krb4_prefix=$withval + ;; + esac # $with_krb4 else with_krb4=no fi - - -if test "$with_krb4" = yes ; then +if test "$with_krb4" = yes; then + echo "$ac_t""building with Kerberos 4 support" 1>&6 cat >> confdefs.h <<\EOF -#define KRB4 +#define KRB4 1 EOF @@ -1605,42 +1738,48 @@ EOF LIBS="$krb_libdir $LIBS" fi fi - KRB_LIBS="$krb_libdir -lkrb -ldes" + # Test for these libraries is below + KRB_LIBS="$krb_libdir -lkrb -ldes" + + krb_srvtab="/etc/srvtab" - krb_srvtab='/etc/srvtab' fi + + + # # Kerberos 5 # -# Check whether --with-krb5 or --without-krb5 was given. -if test "${with_krb5+set}" = set; then - withval="$with_krb5" - if test x"$withval" != x"no"; then - if test x"$withval" != x"yes"; then - krb5_prefix=$withval - else - krb5_prefix=/usr/athena - fi - with_krb5=yes -else - with_krb5=no -fi +# Check whether --with-krb5 was given +if test x"${with_krb5+set}" = xset; then + case $with_krb5 in + yes) + krb5_prefix=/usr/athena + ;; + no) + : + ;; + *) + withval=$with_krb5 + with_krb5=yes +krb5_prefix=$withval + ;; + esac # $with_krb5 else with_krb5=no fi - - -if test "$with_krb5" = yes ; then +if test "$with_krb5" = yes; then + echo "$ac_t""building with Kerberos 5 support" 1>&6 cat >> confdefs.h <<\EOF -#define KRB5 +#define KRB5 1 EOF - if test -d $krb5_prefix; then + if test -d "$krb5_prefix"; then if test -d "$krb5_prefix/include"; then INCLUDES="$INCLUDES -I$krb5_prefix/include" fi @@ -1650,12 +1789,17 @@ EOF fi fi - KRB_LIBS="$krb_libdir -lkrb5 -lcrypto -lcom_err" + # Test for these libraries is below + KRB_LIBS="$krb_libdir -lkrb5 -lcrypto -lcom_err" + + krb_srvtab="FILE:\$(sysconfdir)/krb5.keytab" - krb_srvtab='FILE:$(sysconfdir)/krb5.keytab' fi + + + # Using both Kerberos 4 and Kerberos 5 at the same time isn't going to work. if test "$with_krb4" = yes && test "$with_krb5" = yes ; then { echo "configure: error: Kerberos 4 and Kerberos 5 support cannot be combined" 1>&2; exit 1; } @@ -1665,24 +1809,24 @@ fi - # # Kerberos configuration parameters # -# Check whether --with-krb-srvnam or --without-krb-srvnam was given. -if test "${with_krb_srvnam+set}" = set; then - withval="$with_krb_srvnam" - if test x"$withval" = x"yes"; then - { echo "configure: error: argument required for --with-krb-srvnam" 1>&2; exit 1; } +# Check whether --with-krb-srvnam was given +if test x"${with_krb_srvnam+set}" = xset; then + case $with_krb_srvnam in + yes) + { echo "configure: error: argument required for --with-krb-srvnam option" 1>&2; exit 1; } + ;; + no) + { echo "configure: error: argument required for --with-krb-srvnam option" 1>&2; exit 1; } + ;; + esac # $with_krb_srvnam else - krb_srvnam=$withval + with_krb_srvnam="postgres" fi -else - krb_srvnam="postgres" -fi - cat >> confdefs.h <&6 cat >> confdefs.h <<\EOF -#define USE_SSL +#define USE_SSL 1 EOF @@ -1727,9 +1872,13 @@ EOF openssl_libdir="${openssl_prefix}" LIBS="$LIBS -L${openssl_prefix}" fi + fi + + + # OpenSSL and Kerberos 5 both have a `crypto' library, so if you want to # use both of them you'll have to figure it out yourself. if test "$with_openssl" = yes && test "$with_krb5" = yes ; then @@ -1737,63 +1886,62 @@ if test "$with_openssl" = yes && test "$with_krb5" = yes ; then fi +# +# Optionally enable the building of the ODBC driver +# -if test "x${with_odbc+set}" = xset && test "x${enable_odbc+set}" != xset; then +# Old option name +if test "${with_odbc+set}" = set && test "${enable_odbc+set}" != set; then enable_odbc=$with_odbc fi echo $ac_n "checking whether to build the ODBC driver""... $ac_c" 1>&6 -echo "configure:1747: checking whether to build the ODBC driver" >&5 -# Check whether --enable-odbc or --disable-odbc was given. -if test "${enable_odbc+set}" = set; then - enableval="$enable_odbc" - if test x"$enableval" = x"yes" ; then - echo "$ac_t""yes" 1>&6 +echo "configure:1900: 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 + yes) + : + ;; + no) + : + ;; + *) + enableval=$enable_odbc + { echo "configure: error: no argument expected for --enable-odbc option" 1>&2; exit 1; } + ;; + esac # $enable_odbc else - echo "$ac_t""no" 1>&6 + enable_odbc=no + fi +echo "$ac_t""$enable_odbc" 1>&6 + + + +# Allow for overriding the default location of the odbcinst.ini +# file which is normally ${sysconfdir} (i.e., ${prefix}/etc). +# Check whether --with-odbcinst was given +if test x"${with_odbcinst+set}" = xset; then + case $with_odbcinst in + yes) + { echo "configure: error: argument required for --with-odbcinst option" 1>&2; exit 1; } + ;; + no) + { echo "configure: error: argument required for --with-odbcinst option" 1>&2; exit 1; } + ;; + *) + withval=$with_odbcinst + odbcinst_ini_dir=$withval + ;; + esac # $with_odbcinst else - echo "$ac_t""no" 1>&6 + odbcinst_ini_dir="\${sysconfdir}" fi -if test x"$enable_odbc" = x"yes" ; then -# Check whether --with-odbcinst or --without-odbcinst was given. -if test "${with_odbcinst+set}" = set; then - withval="$with_odbcinst" - if test x"$with_odbcinst" = x"yes" || test x"$with_odbcinst" = x"no" ; then - { echo "configure: error: You must supply an argument to the --with-odbcinst option." 1>&2; exit 1; } -fi -odbcinst_ini_dir=$withval -else - odbcinst_ini_dir='${sysconfdir}' -fi - -else - odbcinst_ini_dir='${sysconfdir}' -fi - - - - -echo $ac_n "checking setting ASSERT CHECKING""... $ac_c" 1>&6 -echo "configure:1783: checking setting ASSERT CHECKING" >&5 -# Check whether --enable-cassert or --disable-cassert was given. -if test "${enable_cassert+set}" = set; then - enableval="$enable_cassert" - cat >> confdefs.h <<\EOF -#define USE_ASSERT_CHECKING 1 -EOF - echo "$ac_t""enabled" 1>&6 -else - echo "$ac_t""disabled" 1>&6 - -fi - - - # Assume system is ELF if it predefines __ELF__ as 1, # otherwise believe host_os based default. case $host_os in @@ -1801,7 +1949,7 @@ case $host_os in esac cat > conftest.$ac_ext <&6 -echo "configure:1831: checking whether to build C++ modules" >&5 -# Check whether --with-CXX or --without-CXX was given. -if test "${with_CXX+set}" = set; then - withval="$with_CXX" - if test x"$withval" != x"no"; then - if test x"$withval" != x"yes" ; then - CXX=$withval - fi - with_CXX=yes -fi +echo "configure:1982: 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 + yes) + : + ;; + no) + : + ;; + *) + withval=$with_CXX + with_CXX=yes +CXX=$withval + ;; + esac # $with_CXX else with_CXX=no fi - -echo "$ac_t""$with_CXX" 1>&6 - - -if test $with_CXX = yes; then +if test "$with_CXX" = yes; then + + echo "$ac_t""yes" 1>&6 for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl 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:1855: checking for $ac_word" >&5 +echo "configure:2010: 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 @@ -1883,7 +2038,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1887: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:2042: 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. @@ -1894,12 +2049,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 1898 "configure" +#line 2053 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:1903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2058: \"$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 @@ -1925,12 +2080,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:1929: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:2084: 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:1934: checking whether we are using GNU C++" >&5 +echo "configure:2089: 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 @@ -1939,7 +2094,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1943: \"$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:2098: \"$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 @@ -1958,7 +2113,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:1962: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:2117: 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 @@ -1990,7 +2145,7 @@ else fi echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:1994: checking how to run the C++ preprocessor" >&5 +echo "configure:2149: 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 @@ -2003,12 +2158,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:2012: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2167: \"$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 : @@ -2042,17 +2197,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:2046: checking for string" >&5 +echo "configure:2201: 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:2056: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2211: \"$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* @@ -2079,12 +2234,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:2083: checking for class string in " >&5 +echo "configure:2238: 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 @@ -2094,7 +2249,7 @@ int main() { string foo = "test" ; return 0; } EOF -if { (eval echo configure:2098: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2253: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* pgac_cv_class_string_in_string_h=yes else @@ -2121,7 +2276,7 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking for namespace std in C++""... $ac_c" 1>&6 -echo "configure:2125: checking for namespace std in C++" >&5 +echo "configure:2280: 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 @@ -2135,7 +2290,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 @@ -2148,7 +2303,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2152: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2307: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* pgac_cv_cxx_namespace_std=yes else @@ -2175,9 +2330,14 @@ if test $pgac_cv_cxx_namespace_std = yes ; then EOF fi + +else + echo "$ac_t""no" 1>&6 fi + + CPPFLAGS="$CPPFLAGS $INCLUDES" LDFLAGS="$LDFLAGS $PGSQL_LDFLAGS" @@ -2199,7 +2359,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:2203: checking for a BSD compatible install" >&5 +echo "configure:2363: 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 @@ -2276,12 +2436,12 @@ mkinstalldirs="\$(SHELL) \$(top_srcdir)/config/mkinstalldirs" -for ac_prog in mawk gawk nawk awk +for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2285: checking for $ac_word" >&5 +echo "configure:2445: 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 @@ -2311,7 +2471,7 @@ test -n "$AWK" && break done echo $ac_n "checking for flex""... $ac_c" 1>&6 -echo "configure:2315: checking for flex" >&5 +echo "configure:2475: checking for flex" >&5 if eval "test \"`echo '$''{'pgac_cv_path_flex'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2379,7 +2539,7 @@ fi echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:2383: checking whether ln -s works" >&5 +echo "configure:2543: 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 @@ -2402,7 +2562,7 @@ fi # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2406: checking for $ac_word" >&5 +echo "configure:2566: 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 @@ -2432,7 +2592,7 @@ fi # Extract the first word of "tar", so it can be a program name with args. set dummy tar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2436: checking for $ac_word" >&5 +echo "configure:2596: 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 @@ -2469,7 +2629,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:2473: checking for $ac_word" >&5 +echo "configure:2633: 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 @@ -2503,7 +2663,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:2507: checking for $ac_word" >&5 +echo "configure:2667: 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 @@ -2541,7 +2701,7 @@ test -n "$YACC" || YACC="yacc" ## echo $ac_n "checking for main in -lsfio""... $ac_c" 1>&6 -echo "configure:2545: checking for main in -lsfio" >&5 +echo "configure:2705: 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 @@ -2549,14 +2709,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:2720: \"$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 @@ -2584,7 +2744,7 @@ else fi echo $ac_n "checking for main in -lncurses""... $ac_c" 1>&6 -echo "configure:2588: checking for main in -lncurses" >&5 +echo "configure:2748: checking for main in -lncurses" >&5 ac_lib_var=`echo ncurses'_'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 @@ -2592,14 +2752,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lncurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2763: \"$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 @@ -2625,7 +2785,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for main in -lcurses""... $ac_c" 1>&6 -echo "configure:2629: checking for main in -lcurses" >&5 +echo "configure:2789: checking for main in -lcurses" >&5 ac_lib_var=`echo curses'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2633,14 +2793,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lcurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2804: \"$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 @@ -2670,7 +2830,7 @@ fi fi echo $ac_n "checking for main in -ltermcap""... $ac_c" 1>&6 -echo "configure:2674: checking for main in -ltermcap" >&5 +echo "configure:2834: checking for main in -ltermcap" >&5 ac_lib_var=`echo termcap'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2678,14 +2838,14 @@ else ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2849: \"$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 @@ -2713,7 +2873,7 @@ else fi echo $ac_n "checking for main in -lreadline""... $ac_c" 1>&6 -echo "configure:2717: checking for main in -lreadline" >&5 +echo "configure:2877: checking for main in -lreadline" >&5 ac_lib_var=`echo readline'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2721,14 +2881,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lreadline $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2892: \"$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 @@ -2756,7 +2916,7 @@ else fi echo $ac_n "checking for using_history in -lreadline""... $ac_c" 1>&6 -echo "configure:2760: checking for using_history in -lreadline" >&5 +echo "configure:2920: checking for using_history in -lreadline" >&5 ac_lib_var=`echo readline'_'using_history | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2764,7 +2924,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lreadline $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2939: \"$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 @@ -2797,7 +2957,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for main in -lhistory""... $ac_c" 1>&6 -echo "configure:2801: checking for main in -lhistory" >&5 +echo "configure:2961: checking for main in -lhistory" >&5 ac_lib_var=`echo history'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2805,14 +2965,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lhistory $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2976: \"$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 @@ -2845,7 +3005,7 @@ fi if test "$PORTNAME" != "aix" -a "$PORTNAME" != "alpha" then echo $ac_n "checking for main in -lbsd""... $ac_c" 1>&6 -echo "configure:2849: checking for main in -lbsd" >&5 +echo "configure:3009: 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 @@ -2853,14 +3013,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:3024: \"$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 @@ -2889,7 +3049,7 @@ fi fi echo $ac_n "checking for setproctitle in -lutil""... $ac_c" 1>&6 -echo "configure:2893: checking for setproctitle in -lutil" >&5 +echo "configure:3053: 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 @@ -2897,7 +3057,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:3072: \"$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 @@ -2936,7 +3096,7 @@ else fi echo $ac_n "checking for main in -lm""... $ac_c" 1>&6 -echo "configure:2940: checking for main in -lm" >&5 +echo "configure:3100: 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 @@ -2944,14 +3104,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:3115: \"$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 @@ -2979,7 +3139,7 @@ else fi echo $ac_n "checking for main in -ldl""... $ac_c" 1>&6 -echo "configure:2983: checking for main in -ldl" >&5 +echo "configure:3143: 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 @@ -2987,14 +3147,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:3158: \"$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 @@ -3022,7 +3182,7 @@ else fi echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6 -echo "configure:3026: checking for main in -lsocket" >&5 +echo "configure:3186: 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 @@ -3030,14 +3190,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:3201: \"$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 @@ -3065,7 +3225,7 @@ else fi echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6 -echo "configure:3069: checking for main in -lnsl" >&5 +echo "configure:3229: 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 @@ -3073,14 +3233,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:3244: \"$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 @@ -3108,7 +3268,7 @@ else fi echo $ac_n "checking for main in -lipc""... $ac_c" 1>&6 -echo "configure:3112: checking for main in -lipc" >&5 +echo "configure:3272: 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 @@ -3116,14 +3276,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:3287: \"$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 @@ -3151,7 +3311,7 @@ else fi echo $ac_n "checking for main in -lIPC""... $ac_c" 1>&6 -echo "configure:3155: checking for main in -lIPC" >&5 +echo "configure:3315: 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 @@ -3159,14 +3319,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:3330: \"$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 @@ -3194,7 +3354,7 @@ else fi echo $ac_n "checking for main in -llc""... $ac_c" 1>&6 -echo "configure:3198: checking for main in -llc" >&5 +echo "configure:3358: 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 @@ -3202,14 +3362,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:3373: \"$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 @@ -3237,7 +3397,7 @@ else fi echo $ac_n "checking for main in -ldld""... $ac_c" 1>&6 -echo "configure:3241: checking for main in -ldld" >&5 +echo "configure:3401: 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 @@ -3245,14 +3405,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:3416: \"$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 @@ -3280,7 +3440,7 @@ else fi echo $ac_n "checking for main in -lln""... $ac_c" 1>&6 -echo "configure:3284: checking for main in -lln" >&5 +echo "configure:3444: checking for main in -lln" >&5 ac_lib_var=`echo ln'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3288,14 +3448,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lln $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3459: \"$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 @@ -3323,7 +3483,7 @@ else fi echo $ac_n "checking for main in -lld""... $ac_c" 1>&6 -echo "configure:3327: checking for main in -lld" >&5 +echo "configure:3487: 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 @@ -3331,14 +3491,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:3502: \"$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 @@ -3366,7 +3526,7 @@ else fi echo $ac_n "checking for main in -lcompat""... $ac_c" 1>&6 -echo "configure:3370: checking for main in -lcompat" >&5 +echo "configure:3530: 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 @@ -3374,14 +3534,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:3545: \"$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 @@ -3409,7 +3569,7 @@ else fi echo $ac_n "checking for main in -lBSD""... $ac_c" 1>&6 -echo "configure:3413: checking for main in -lBSD" >&5 +echo "configure:3573: 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 @@ -3417,14 +3577,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:3588: \"$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 @@ -3452,7 +3612,7 @@ else fi echo $ac_n "checking for main in -lgen""... $ac_c" 1>&6 -echo "configure:3456: checking for main in -lgen" >&5 +echo "configure:3616: 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 @@ -3460,14 +3620,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:3631: \"$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 @@ -3495,7 +3655,7 @@ else fi echo $ac_n "checking for main in -lPW""... $ac_c" 1>&6 -echo "configure:3499: checking for main in -lPW" >&5 +echo "configure:3659: 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 @@ -3503,14 +3663,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:3674: \"$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 @@ -3539,14 +3699,14 @@ fi echo $ac_n "checking for library containing crypt""... $ac_c" 1>&6 -echo "configure:3543: checking for library containing crypt" >&5 +echo "configure:3703: 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:3721: \"$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 @@ -3568,7 +3728,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:3743: \"$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 @@ -3600,7 +3760,7 @@ else : fi echo $ac_n "checking for inflate in -lz""... $ac_c" 1>&6 -echo "configure:3604: checking for inflate in -lz" >&5 +echo "configure:3764: 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 @@ -3608,7 +3768,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:3783: \"$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 @@ -3649,7 +3809,7 @@ fi if test "$with_krb4" = yes ; then echo $ac_n "checking for des_encrypt in -ldes""... $ac_c" 1>&6 -echo "configure:3653: checking for des_encrypt in -ldes" >&5 +echo "configure:3813: 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 @@ -3657,7 +3817,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:3832: \"$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 @@ -3697,7 +3857,7 @@ else fi echo $ac_n "checking for krb_sendauth in -lkrb""... $ac_c" 1>&6 -echo "configure:3701: checking for krb_sendauth in -lkrb" >&5 +echo "configure:3861: 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 @@ -3705,7 +3865,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:3880: \"$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 @@ -3748,7 +3908,7 @@ fi if test "$with_krb5" = yes ; then echo $ac_n "checking for main in -lcom_err""... $ac_c" 1>&6 -echo "configure:3752: checking for main in -lcom_err" >&5 +echo "configure:3912: checking for main in -lcom_err" >&5 ac_lib_var=`echo com_err'_'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 @@ -3756,14 +3916,14 @@ 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:3927: \"$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 @@ -3792,7 +3952,7 @@ else fi echo $ac_n "checking for main in -lcrypto""... $ac_c" 1>&6 -echo "configure:3796: checking for main in -lcrypto" >&5 +echo "configure:3956: checking for main in -lcrypto" >&5 ac_lib_var=`echo crypto'_'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 @@ -3800,14 +3960,14 @@ 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:3971: \"$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 @@ -3836,7 +3996,7 @@ else fi echo $ac_n "checking for main in -lkrb5""... $ac_c" 1>&6 -echo "configure:3840: checking for main in -lkrb5" >&5 +echo "configure:4000: checking for main in -lkrb5" >&5 ac_lib_var=`echo krb5'_'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 @@ -3844,14 +4004,14 @@ 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:4015: \"$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 @@ -3883,7 +4043,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:3887: checking for CRYPTO_new_ex_data in -lcrypto" >&5 +echo "configure:4047: 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 @@ -3891,7 +4051,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:4066: \"$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 @@ -3931,7 +4091,7 @@ else fi echo $ac_n "checking for SSL_library_init in -lssl""... $ac_c" 1>&6 -echo "configure:3935: checking for SSL_library_init in -lssl" >&5 +echo "configure:4095: 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 @@ -3939,7 +4099,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:4114: \"$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 @@ -3988,17 +4148,17 @@ for ac_hdr in crypt.h dld.h endian.h fp_class.h getopt.h ieeefp.h pwd.h sys/psta do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3992: checking for $ac_hdr" >&5 +echo "configure:4152: 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:4002: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4162: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4029,17 +4189,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:4033: checking for $ac_hdr" >&5 +echo "configure:4193: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4043: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4203: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4069,17 +4229,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:4073: checking for $ac_hdr" >&5 +echo "configure:4233: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4083: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4243: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4109,17 +4269,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:4113: checking for krb.h" >&5 +echo "configure:4273: 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:4123: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4283: \"$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* @@ -4146,17 +4306,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:4150: checking for krb5.h" >&5 +echo "configure:4310: 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:4160: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4320: \"$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* @@ -4180,17 +4340,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:4184: checking for com_err.h" >&5 +echo "configure:4344: 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:4194: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4354: \"$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* @@ -4217,17 +4377,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:4221: checking for openssl/ssl.h" >&5 +echo "configure:4381: 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:4231: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4391: \"$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* @@ -4251,17 +4411,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:4255: checking for openssl/err.h" >&5 +echo "configure:4415: 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:4265: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4425: \"$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* @@ -4290,12 +4450,12 @@ fi ## Types, structures, compiler characteristics ## echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:4294: checking for working const" >&5 +echo "configure:4454: 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:4508: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -4365,21 +4525,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:4369: checking for inline" >&5 +echo "configure:4529: 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:4543: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -4407,12 +4567,12 @@ esac echo $ac_n "checking for preprocessor stringizing operator""... $ac_c" 1>&6 -echo "configure:4411: checking for preprocessor stringizing operator" >&5 +echo "configure:4571: 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:4446: checking for signed types" >&5 +echo "configure:4606: 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:4618: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* pgac_cv_c_signed=yes else @@ -4474,19 +4634,19 @@ EOF fi echo $ac_n "checking for volatile""... $ac_c" 1>&6 -echo "configure:4478: checking for volatile" >&5 +echo "configure:4638: 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:4650: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* pgac_cv_c_volatile=yes else @@ -4506,12 +4666,12 @@ EOF fi echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:4510: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:4670: 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 @@ -4519,7 +4679,7 @@ int main() { struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:4523: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4683: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -4540,12 +4700,12 @@ EOF fi echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6 -echo "configure:4544: checking for tm_zone in struct tm" >&5 +echo "configure:4704: 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> @@ -4553,7 +4713,7 @@ int main() { struct tm tm; tm.tm_zone; ; return 0; } EOF -if { (eval echo configure:4557: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4717: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm_zone=yes else @@ -4573,12 +4733,12 @@ EOF else echo $ac_n "checking for tzname""... $ac_c" 1>&6 -echo "configure:4577: checking for tzname" >&5 +echo "configure:4737: 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. */ @@ -4588,7 +4748,7 @@ int main() { atoi(*tzname); ; return 0; } EOF -if { (eval echo configure:4592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_var_tzname=yes else @@ -4610,12 +4770,12 @@ EOF fi echo $ac_n "checking for union semun""... $ac_c" 1>&6 -echo "configure:4614: checking for union semun" >&5 +echo "configure:4774: 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 @@ -4624,7 +4784,7 @@ int main() { union semun semun; ; return 0; } EOF -if { (eval echo configure:4628: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4788: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* pgac_cv_union_semun=yes else @@ -4649,19 +4809,19 @@ fi ## Functions, global variables ## echo $ac_n "checking for int timezone""... $ac_c" 1>&6 -echo "configure:4653: checking for int timezone" >&5 +echo "configure:4813: 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 main() { int res = timezone / 60; ; return 0; } EOF -if { (eval echo configure:4665: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4825: \"$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 @@ -4681,7 +4841,7 @@ EOF fi echo $ac_n "checking types of arguments for accept()""... $ac_c" 1>&6 -echo "configure:4685: checking types of arguments for accept()" >&5 +echo "configure:4845: 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 @@ -4695,7 +4855,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'; do cat > conftest.$ac_ext < @@ -4708,7 +4868,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:4712: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4872: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_not_found=no; break 3 else @@ -4745,12 +4905,12 @@ EOF echo $ac_n "checking whether gettimeofday takes only one argument""... $ac_c" 1>&6 -echo "configure:4749: checking whether gettimeofday takes only one argument" >&5 +echo "configure:4909: 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() { @@ -4759,7 +4919,7 @@ struct timezone *tzp; gettimeofday(tp,tzp); ; return 0; } EOF -if { (eval echo configure:4763: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4923: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* pgac_cv_func_gettimeofday_1arg=no else @@ -4780,12 +4940,12 @@ EOF fi echo $ac_n "checking for fcntl(F_SETLK)""... $ac_c" 1>&6 -echo "configure:4784: checking for fcntl(F_SETLK)" >&5 +echo "configure:4944: checking for fcntl(F_SETLK)" >&5 case $host_os in linux*) echo "$ac_t""broken on Linux" 1>&6 ;; *) cat > conftest.$ac_ext < #include @@ -4797,7 +4957,7 @@ lck.l_type = F_WRLCK; fcntl(0, F_SETLK, &lck); ; return 0; } EOF -if { (eval echo configure:4801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_FCNTL_SETLK 1 @@ -4816,12 +4976,12 @@ esac for ac_func in fcvt getopt_long memmove pstat setproctitle setsid sigprocmask sysconf waitpid do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4820: checking for $ac_func" >&5 +echo "configure:4980: 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:5008: \"$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 @@ -4870,12 +5030,12 @@ done echo $ac_n "checking for PS_STRINGS""... $ac_c" 1>&6 -echo "configure:4874: checking for PS_STRINGS" >&5 +echo "configure:5034: 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 @@ -4885,7 +5045,7 @@ PS_STRINGS->ps_nargvstr = 1; PS_STRINGS->ps_argvstr = "foo"; ; return 0; } EOF -if { (eval echo configure:4889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5049: \"$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 @@ -4907,12 +5067,12 @@ fi SNPRINTF='' echo $ac_n "checking for snprintf""... $ac_c" 1>&6 -echo "configure:4911: checking for snprintf" >&5 +echo "configure:5071: 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:5099: \"$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 @@ -4959,12 +5119,12 @@ SNPRINTF='snprintf.o' fi echo $ac_n "checking for vsnprintf""... $ac_c" 1>&6 -echo "configure:4963: checking for vsnprintf" >&5 +echo "configure:5123: 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:5151: \"$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 @@ -5012,7 +5172,7 @@ fi cat > conftest.$ac_ext < EOF @@ -5027,7 +5187,7 @@ fi rm -f conftest* cat > conftest.$ac_ext < EOF @@ -5044,12 +5204,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:5048: checking for isinf" >&5 +echo "configure:5208: 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 < @@ -5057,7 +5217,7 @@ int main() { double x = 0.0; int res = isinf(x); ; return 0; } EOF -if { (eval echo configure:5061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_isinf=yes else @@ -5083,12 +5243,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:5087: checking for $ac_func" >&5 +echo "configure:5247: 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:5275: \"$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 @@ -5139,12 +5299,12 @@ fi echo $ac_n "checking for getrusage""... $ac_c" 1>&6 -echo "configure:5143: checking for getrusage" >&5 +echo "configure:5303: 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:5331: \"$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 @@ -5192,12 +5352,12 @@ fi echo $ac_n "checking for srandom""... $ac_c" 1>&6 -echo "configure:5196: checking for srandom" >&5 +echo "configure:5356: 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:5384: \"$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 @@ -5245,12 +5405,12 @@ fi echo $ac_n "checking for gethostname""... $ac_c" 1>&6 -echo "configure:5249: checking for gethostname" >&5 +echo "configure:5409: 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:5437: \"$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 @@ -5298,12 +5458,12 @@ fi echo $ac_n "checking for random""... $ac_c" 1>&6 -echo "configure:5302: checking for random" >&5 +echo "configure:5462: 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:5490: \"$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 @@ -5351,12 +5511,12 @@ fi echo $ac_n "checking for inet_aton""... $ac_c" 1>&6 -echo "configure:5355: checking for inet_aton" >&5 +echo "configure:5515: 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:5543: \"$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 @@ -5404,12 +5564,12 @@ fi echo $ac_n "checking for strerror""... $ac_c" 1>&6 -echo "configure:5408: checking for strerror" >&5 +echo "configure:5568: 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:5596: \"$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 @@ -5458,12 +5618,12 @@ fi echo $ac_n "checking for strdup""... $ac_c" 1>&6 -echo "configure:5462: checking for strdup" >&5 +echo "configure:5622: 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:5650: \"$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 @@ -5511,12 +5671,12 @@ fi echo $ac_n "checking for strtol""... $ac_c" 1>&6 -echo "configure:5515: checking for strtol" >&5 +echo "configure:5675: 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:5703: \"$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 @@ -5564,12 +5724,12 @@ fi echo $ac_n "checking for strtoul""... $ac_c" 1>&6 -echo "configure:5568: checking for strtoul" >&5 +echo "configure:5728: 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:5756: \"$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 @@ -5617,12 +5777,12 @@ fi echo $ac_n "checking for strcasecmp""... $ac_c" 1>&6 -echo "configure:5621: checking for strcasecmp" >&5 +echo "configure:5781: 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:5809: \"$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 @@ -5670,12 +5830,12 @@ fi echo $ac_n "checking for cbrt""... $ac_c" 1>&6 -echo "configure:5674: checking for cbrt" >&5 +echo "configure:5834: 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:5862: \"$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 @@ -5719,7 +5879,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for cbrt in -lm""... $ac_c" 1>&6 -echo "configure:5723: checking for cbrt in -lm" >&5 +echo "configure:5883: 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 @@ -5727,7 +5887,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:5902: \"$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 @@ -5776,12 +5936,12 @@ esac echo $ac_n "checking for rint""... $ac_c" 1>&6 -echo "configure:5780: checking for rint" >&5 +echo "configure:5940: 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:5968: \"$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 @@ -5825,7 +5985,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for rint in -lm""... $ac_c" 1>&6 -echo "configure:5829: checking for rint in -lm" >&5 +echo "configure:5989: 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 @@ -5833,7 +5993,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:6008: \"$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 @@ -5871,7 +6031,7 @@ fi cat > conftest.$ac_ext < EOF @@ -5885,7 +6045,7 @@ EOF else rm -rf conftest* cat > conftest.$ac_ext < EOF @@ -5907,12 +6067,12 @@ rm -f conftest* for ac_func in filename_completion_function do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5911: checking for $ac_func" >&5 +echo "configure:6071: 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:6099: \"$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 @@ -5954,7 +6114,7 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then #define $ac_tr_func 1 EOF cat > conftest.$ac_ext < EOF @@ -5968,7 +6128,7 @@ EOF else rm -rf conftest* cat > conftest.$ac_ext < EOF @@ -5996,16 +6156,16 @@ done echo $ac_n "checking for finite""... $ac_c" 1>&6 -echo "configure:6000: checking for finite" >&5 +echo "configure:6160: checking for finite" >&5 cat > conftest.$ac_ext < int main() { int dummy=finite(1.0); ; return 0; } EOF -if { (eval echo configure:6009: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6169: \"$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 @@ -6020,16 +6180,16 @@ fi rm -f conftest* echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6 -echo "configure:6024: checking for sigsetjmp" >&5 +echo "configure:6184: checking for sigsetjmp" >&5 cat > conftest.$ac_ext < int main() { sigjmp_buf x; sigsetjmp(x, 1); ; return 0; } EOF -if { (eval echo configure:6033: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6193: \"$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 @@ -6043,17 +6203,18 @@ else fi rm -f conftest* -# Check whether --enable-syslog or --disable-syslog was given. -if test "${enable_syslog+set}" = set; then - enableval="$enable_syslog" - case $enableval in y|ye|yes) - echo $ac_n "checking for syslog""... $ac_c" 1>&6 -echo "configure:6052: checking for syslog" >&5 + +# Check whether --enable-syslog was given +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:6213: 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:6241: \"$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 @@ -6099,15 +6260,24 @@ else { echo "configure: error: no syslog interface found" 1>&2; exit 1; } fi - ;; - esac + ;; + no) + : + ;; + *) + enableval=$enable_syslog + { echo "configure: error: no argument expected for --enable-syslog option" 1>&2; exit 1; } + ;; + esac # $enable_syslog +else + enable_syslog=no fi echo $ac_n "checking whether long int is 64 bits""... $ac_c" 1>&6 -echo "configure:6111: checking whether long int is 64 bits" >&5 +echo "configure:6281: 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 @@ -6116,7 +6286,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:6319: \"$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 @@ -6172,7 +6342,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:6176: checking whether long long int is 64 bits" >&5 +echo "configure:6346: 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 @@ -6181,7 +6351,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:6384: \"$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 @@ -6241,7 +6411,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:6245: checking whether snprintf handles 'long long int' as %lld" >&5 +echo "configure:6415: 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 @@ -6250,7 +6420,7 @@ echo "configure:6245: checking whether snprintf handles 'long long int' as %lld" else cat > conftest.$ac_ext < typedef long long int int64; @@ -6277,7 +6447,7 @@ main() { exit(! does_int64_snprintf_work()); } EOF -if { (eval echo configure:6281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6451: \"$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"' @@ -6288,7 +6458,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:6292: checking whether snprintf handles 'long long int' as %qd" >&5 +echo "configure:6462: 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 @@ -6297,7 +6467,7 @@ echo "configure:6292: checking whether snprintf handles 'long long int' as %qd" else cat > conftest.$ac_ext < typedef long long int int64; @@ -6324,7 +6494,7 @@ main() { exit(! does_int64_snprintf_work()); } EOF -if { (eval echo configure:6328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6498: \"$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"' @@ -6363,7 +6533,7 @@ EOF echo $ac_n "checking alignment of short""... $ac_c" 1>&6 -echo "configure:6367: checking alignment of short" >&5 +echo "configure:6537: 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 @@ -6371,7 +6541,7 @@ else pgac_cv_alignof_short='sizeof(short)' else cat > conftest.$ac_ext < struct { char filler; short field; } mystruct; @@ -6383,7 +6553,7 @@ main() exit(0); } EOF -if { (eval echo configure:6387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6557: \"$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 @@ -6403,7 +6573,7 @@ EOF echo $ac_n "checking alignment of int""... $ac_c" 1>&6 -echo "configure:6407: checking alignment of int" >&5 +echo "configure:6577: 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 @@ -6411,7 +6581,7 @@ else pgac_cv_alignof_int='sizeof(int)' else cat > conftest.$ac_ext < struct { char filler; int field; } mystruct; @@ -6423,7 +6593,7 @@ main() exit(0); } EOF -if { (eval echo configure:6427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6597: \"$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 @@ -6443,7 +6613,7 @@ EOF echo $ac_n "checking alignment of long""... $ac_c" 1>&6 -echo "configure:6447: checking alignment of long" >&5 +echo "configure:6617: 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 @@ -6451,7 +6621,7 @@ else pgac_cv_alignof_long='sizeof(long)' else cat > conftest.$ac_ext < struct { char filler; long field; } mystruct; @@ -6463,7 +6633,7 @@ main() exit(0); } EOF -if { (eval echo configure:6467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6637: \"$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 @@ -6484,7 +6654,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:6488: checking alignment of long long int" >&5 +echo "configure:6658: 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 @@ -6492,7 +6662,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; @@ -6504,7 +6674,7 @@ main() exit(0); } EOF -if { (eval echo configure:6508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6678: \"$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 @@ -6525,7 +6695,7 @@ EOF fi echo $ac_n "checking alignment of double""... $ac_c" 1>&6 -echo "configure:6529: checking alignment of double" >&5 +echo "configure:6699: 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 @@ -6533,7 +6703,7 @@ else pgac_cv_alignof_double='sizeof(double)' else cat > conftest.$ac_ext < struct { char filler; double field; } mystruct; @@ -6545,7 +6715,7 @@ main() exit(0); } EOF -if { (eval echo configure:6549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6719: \"$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 @@ -6583,12 +6753,12 @@ EOF echo $ac_n "checking for POSIX signal interface""... $ac_c" 1>&6 -echo "configure:6587: checking for POSIX signal interface" >&5 +echo "configure:6757: 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 < @@ -6599,7 +6769,7 @@ act.sa_flags = SA_RESTART; sigaction(0, &act, &oact); ; return 0; } EOF -if { (eval echo configure:6603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6773: \"$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 @@ -6628,7 +6798,7 @@ then # Extract the first word of "tclsh", so it can be a program name with args. set dummy tclsh; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6632: checking for $ac_word" >&5 +echo "configure:6802: 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 @@ -6665,7 +6835,7 @@ fi # Extract the first word of "tcl", so it can be a program name with args. set dummy tcl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6669: checking for $ac_word" >&5 +echo "configure:6839: 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 @@ -6708,7 +6878,7 @@ fi if test "$USE_TCL" = true then echo $ac_n "checking for tclConfig.sh""... $ac_c" 1>&6 -echo "configure:6712: checking for tclConfig.sh" >&5 +echo "configure:6882: checking for tclConfig.sh" >&5 TCL_CONFIG_SH= library_dirs= if test -z "$TCL_DIRS" @@ -6737,7 +6907,7 @@ USE_TK=$USE_TCL # If TCL is disabled, disable TK if test "$USE_TK" = true then echo $ac_n "checking for tkConfig.sh""... $ac_c" 1>&6 -echo "configure:6741: checking for tkConfig.sh" >&5 +echo "configure:6911: checking for tkConfig.sh" >&5 TK_CONFIG_SH= # library_dirs are set in the check for TCL for dir in $library_dirs @@ -6759,7 +6929,7 @@ echo "configure:6741: checking for tkConfig.sh" >&5 # Extract the first word of "wish", so it can be a program name with args. set dummy wish; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6763: checking for $ac_word" >&5 +echo "configure:6933: 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 @@ -6810,7 +6980,7 @@ if test "$USE_X" = true; then # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:6814: checking for X" >&5 +echo "configure:6984: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -6872,12 +7042,12 @@ if test "$ac_x_includes" = NO; then # First, try using that file with no special directory specified. cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6881: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7051: \"$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* @@ -6946,14 +7116,14 @@ if test "$ac_x_libraries" = NO; then ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -7059,17 +7229,17 @@ else case "`(uname -sr) 2>/dev/null`" in "SunOS 5"*) echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 -echo "configure:7063: checking whether -R must be followed by a space" >&5 +echo "configure:7233: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -7085,14 +7255,14 @@ rm -f conftest* else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -7124,7 +7294,7 @@ rm -f conftest* # libraries were built with DECnet support. And karl@cs.umb.edu says # the Alpha needs dnet_stub (dnet does not exist). echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:7128: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:7298: checking for dnet_ntoa in -ldnet" >&5 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7132,7 +7302,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7317: \"$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 @@ -7165,7 +7335,7 @@ fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:7169: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:7339: checking for dnet_ntoa in -ldnet_stub" >&5 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7173,7 +7343,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7358: \"$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 @@ -7213,12 +7383,12 @@ fi # The nsl library prevents programs from opening the X display # on Irix 5.2, according to dickey@clark.net. echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:7217: checking for gethostbyname" >&5 +echo "configure:7387: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -7262,7 +7432,7 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:7266: checking for gethostbyname in -lnsl" >&5 +echo "configure:7436: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7270,7 +7440,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7455: \"$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 @@ -7311,12 +7481,12 @@ fi # -lsocket must be given before -lnsl if both are needed. # We assume that if connect needs -lnsl, so does gethostbyname. echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:7315: checking for connect" >&5 +echo "configure:7485: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -7360,7 +7530,7 @@ fi if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:7364: checking for connect in -lsocket" >&5 +echo "configure:7534: checking for connect in -lsocket" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7368,7 +7538,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7553: \"$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 @@ -7403,12 +7573,12 @@ fi # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:7407: checking for remove" >&5 +echo "configure:7577: checking for remove" >&5 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -7452,7 +7622,7 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:7456: checking for remove in -lposix" >&5 +echo "configure:7626: checking for remove in -lposix" >&5 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7460,7 +7630,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7645: \"$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 @@ -7495,12 +7665,12 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:7499: checking for shmat" >&5 +echo "configure:7669: checking for shmat" >&5 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else @@ -7544,7 +7714,7 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:7548: checking for shmat in -lipc" >&5 +echo "configure:7718: checking for shmat in -lipc" >&5 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7552,7 +7722,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7737: \"$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 @@ -7596,7 +7766,7 @@ fi # libraries we check for below, so use a different variable. # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:7600: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:7770: checking for IceConnectionNumber in -lICE" >&5 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7604,7 +7774,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7789: \"$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 @@ -7648,7 +7818,7 @@ fi X11_LIBS="" echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -echo "configure:7652: checking for XOpenDisplay in -lX11" >&5 +echo "configure:7822: checking for XOpenDisplay in -lX11" >&5 ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7656,7 +7826,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lX11 ${X_PRE_LIBS} $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7841: \"$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 @@ -7706,13 +7876,6 @@ See the file 'config.log' for further diagnostics." 1>&2 fi -# Wait with these until we're done so no tests fail because of too -# many warnings. -if test x"$GCC" = x"yes" ; then - CFLAGS="$CFLAGS -Wall -Wmissing-prototypes -Wmissing-declarations" -fi - - trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure @@ -7889,9 +8052,9 @@ s%@with_openssl@%$with_openssl%g s%@enable_odbc@%$enable_odbc%g s%@odbcinst_ini_dir@%$odbcinst_ini_dir%g s%@ELF_SYS@%$ELF_SYS%g -s%@with_CXX@%$with_CXX%g s%@CXX@%$CXX%g s%@CXXCPP@%$CXXCPP%g +s%@with_CXX@%$with_CXX%g s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g s%@INSTALL_DATA@%$INSTALL_DATA%g diff --git a/configure.in b/configure.in index ab14940c9b..67c6692829 100644 --- a/configure.in +++ b/configure.in @@ -37,19 +37,19 @@ AC_CANONICAL_HOST template= AC_MSG_CHECKING([which template to use]) -# check if --with-template was given -if test x"${with_template+set}" = xset ; then - case $with_template in - yes|no) AC_MSG_ERROR([You must supply an argument to the --with-template option.]);; +PGAC_ARG_REQ(with, template, [], +[ + case $withval in list) echo; ls "$srcdir/src/template"; exit;; *) if test -f "$srcdir/src/template/$with_template" ; then - template=$with_template + template=$withval else - AC_MSG_ERROR([\`$with_template' is not a valid template name. Use \`list' for a list.]) + AC_MSG_ERROR([\`$withval' is not a valid template name. Use \`list' for a list.]) fi;; esac - -else # --with-template not given +], +[ + # --with-template not given case $host_os in aix*) template=aix ;; @@ -95,7 +95,7 @@ line. ]) fi -fi # --with-template not given +]) AC_MSG_RESULT([$template]) @@ -136,57 +136,36 @@ AC_SUBST(TAS) # # Add non-standard directories to the include path # -AC_ARG_WITH(includes, [ --with-includes=DIRS look for additional header files in DIRS], -[ - case $withval in - yes | no) AC_MSG_ERROR([You must supply an argument to the --with-includes option.]);; - esac -]) +PGAC_ARG_REQ(with, includes, [ --with-includes=DIRS look for additional header files in DIRS]) # # Add non-standard directories to the library search path # -AC_ARG_WITH(libraries, [ --with-libraries=DIRS look for additional libraries in DIRS], -[ - case $withval in - yes | no) AC_MSG_ERROR([You must supply an argument to the --with-libraries option.]);; - esac - LIBRARY_DIRS=$withval -]) +PGAC_ARG_REQ(with, libraries, [ --with-libraries=DIRS look for additional libraries in DIRS], + [LIBRARY_DIRS=$withval]) -AC_ARG_WITH(libs, [ --with-libs=DIRS alternative spelling of --with-libraries], -[ - case $withval in - yes | no) AC_MSG_ERROR([You must supply an argument to the --with-libs option.]);; - esac - LIBRARY_DIRS=$withval -]) +PGAC_ARG_REQ(with, libs, [ --with-libs=DIRS alternative spelling of --with-libraries], + [LIBRARY_DIRS=$withval]) # # Locale (--enable-locale) # AC_MSG_CHECKING([whether to build with locale support]) -AC_ARG_ENABLE(locale, [ --enable-locale enable locale support], -[if test x"$enable_locale" != x"no" ; then - enable_locale=yes - AC_DEFINE(USE_LOCALE, 1, [Set to 1 if you want LOCALE support (--enable-locale)]) -fi], -[enable_locale=no]) +PGAC_ARG_BOOL(enable, locale, no, [ --enable-locale enable locale support], + [AC_DEFINE([USE_LOCALE], 1, + [Set to 1 if you want LOCALE support (--enable-locale)])]) AC_MSG_RESULT([$enable_locale]) # -# Cyrillic recode (--enable-recode) +# Character set recode (--enable-recode) # -AC_MSG_CHECKING([whether to build with Cyrillic recode support]) -AC_ARG_ENABLE(recode, [ --enable-recode enable cyrillic recode support], -[if test x"$enable_recode" != x"no" ; then - enable_recode=yes - AC_DEFINE(CYR_RECODE, 1, [Set to 1 if you want cyrillic recode support (--enable-recode)]) -fi], -[enable_recode=no]) +AC_MSG_CHECKING([whether to build with recode support]) +PGAC_ARG_BOOL(enable, recode, no, [ --enable-recode enable character set recode support], + [AC_DEFINE([CYR_RECODE], 1, + [Set to 1 if you want cyrillic recode support (--enable-recode)])]) AC_MSG_RESULT([$enable_recode]) @@ -195,45 +174,39 @@ AC_MSG_RESULT([$enable_recode]) # MULTIBYTE= AC_MSG_CHECKING([whether to build with multibyte character support]) -AC_ARG_ENABLE(multibyte, [ --enable-multibyte enable multibyte character support], + +PGAC_ARG_OPTARG(enable, multibyte, [ --enable-multibyte enable multibyte character support], +[MULTIBYTE=SQL_ASCII], [ case $enableval in - no) enable_multibyte=no;; - yes) enable_multibyte=yes; MULTIBYTE=SQL_ASCII;; SQL_ASCII|EUC_JP|EUC_CN|EUC_KR|EUC_TW|UNICODE|MULE_INTERNAL|LATIN1|LATIN2|LATIN3|LATIN4|LATIN5|KOI8|WIN|ALT) - enable_multibyte=yes; MULTIBYTE=$enableval;; - *) AC_MSG_ERROR( + MULTIBYTE=$enableval;; + *) + AC_MSG_ERROR( [argument to --enable-multibyte must be one of: SQL_ASCII, EUC_JP, EUC_CN, EUC_KR, EUC_TW, UNICODE, MULE_INTERNAL, LATIN1, LATIN2, LATIN3, LATIN4, LATIN5, KOI8, WIN, ALT -Or do not specify an argument to the option to use the default.]) ;; +Or do not specify an argument to the option to use the default.]);; esac ], -[enable_multibyte=no]) - -AC_SUBST(MULTIBYTE) - -if test "$enable_multibyte" = yes ; then +[ AC_DEFINE(MULTIBYTE, 1, [Set to 1 if you want to use multibyte characters (--enable-multibyte)]) AC_MSG_RESULT([yes, default $MULTIBYTE]) -else - AC_MSG_RESULT(no) -fi +], +[AC_MSG_RESULT(no)]) + +AC_SUBST(MULTIBYTE) # # Default port number (--with-pgport), default 5432 # AC_MSG_CHECKING([for default port number]) -AC_ARG_WITH(pgport, [ --with-pgport=PORTNUM change default port number [5432]], -[case $withval in - yes|no) AC_MSG_ERROR([You must supply an argument to the --with-pgport option]);; - *) default_port=$withval;; -esac -], -[default_port=5432]) +PGAC_ARG_REQ(with, pgport, [ --with-pgport=PORTNUM change default port number [5432]], + [default_port=$withval], + [default_port=5432]) # Need both of these because backend wants an integer and frontend a string AC_DEFINE_UNQUOTED(DEF_PGPORT, ${default_port}) AC_DEFINE_UNQUOTED(DEF_PGPORT_STR, "${default_port}") @@ -244,13 +217,12 @@ AC_MSG_RESULT([$default_port]) # Maximum number of allowed connections (--with-maxbackends), default 32 # AC_MSG_CHECKING([for default soft limit on number of connections]) -AC_ARG_WITH(maxbackends, [ --with-maxbackends=N set default maximum number of connections [32]], -[case $withval in - yes|no) AC_MSG_ERROR([You must supply an argument to the --with-maxbackends option]);; -esac], -[with_maxbackends=32]) +PGAC_ARG_REQ(with, maxbackends, [ --with-maxbackends=N set default maximum number of connections [32]], + [], + [with_maxbackends=32]) AC_MSG_RESULT([$with_maxbackends]) -AC_DEFINE_UNQUOTED(DEF_MAXBACKENDS, [$with_maxbackends], [The default soft limit on the number of concurrent connections, i.e., the default for the postmaster -N switch (--with-maxbackends)]) +AC_DEFINE_UNQUOTED([DEF_MAXBACKENDS], [$with_maxbackends], + [The default soft limit on the number of concurrent connections, i.e., the default for the postmaster -N switch (--with-maxbackends)]) # @@ -260,12 +232,7 @@ AC_DEFINE_UNQUOTED(DEF_MAXBACKENDS, [$with_maxbackends], [The default soft limit # For historical reasons you can also use --with-CC to specify the C compiler # to use, although the standard way to do this is to set the CC environment # variable. -if test "${with_CC+set}" = set; then - case $with_CC in - yes | no) AC_MSG_ERROR([You must supply an argument to the --with-CC option.]);; - *) CC=$with_CC;; - esac -fi +PGAC_ARG_REQ(with, CC, [], [CC=$with_CC]) # On AIX, default compiler to xlc. if test "$template" = aix && test -z "$CC" ; then CC=xlc; fi @@ -297,30 +264,24 @@ AC_DEFINE_UNQUOTED(PG_VERSION_STR, ["PostgreSQL $VERSION on $host, compiled by $ # # Automatic dependency tracking # -AC_ARG_ENABLE(depend, [ --enable-depend turn on automatic dependency tracking], -[ - if test x"$enableval" = x"yes" ; then - autodepend=yes - fi -]) +PGAC_ARG_BOOL(enable, depend, no, [ --enable-depend turn on automatic dependency tracking], + [autodepend=yes]) AC_SUBST(autodepend) +# # --enable-debug adds -g to compiler flags -# --disable-debug will forcefully remove it -AC_MSG_CHECKING(setting debug compiler flag) -AC_ARG_ENABLE(debug, [ --enable-debug build with debugging symbols (-g)], -[ - case $enableval in - yes) CFLAGS="$CFLAGS -g" - AC_MSG_RESULT(yes) - ;; - *) CFLAGS=`echo "$CFLAGS" | sed -e 's/ -g/ /g' -e 's/^-g//'` - AC_MSG_RESULT(no) - ;; - esac -], -[AC_MSG_RESULT(using default)]) +# +PGAC_ARG_BOOL(enable, debug, no, [ --enable-debug build with debugging symbols (-g)], + [CFLAGS="$CFLAGS -g"]) + + +# +# Enable assert checks +# +PGAC_ARG_BOOL(enable, cassert, no, [ --enable-cassert enable assertion checks (for debugging)], + [AC_DEFINE([USE_ASSERT_CHECKING], 1, + [Define to 1 to build with assertion checks])]) # @@ -357,80 +318,46 @@ IFS=$ac_save_IFS -dnl We exclude tcl support unless user says --with-tcl +# We exclude tcl support unless user says --with-tcl AC_MSG_CHECKING(setting USE_TCL) -AC_ARG_WITH( - tcl, - [ --with-tcl build Tcl interfaces and pgtclsh ], - [ - case "$withval" in - y | ye | yes) USE_TCL=true; USE_TK=true; AC_MSG_RESULT(enabled) ;; - *) USE_TCL=; USE_TK=; AC_MSG_RESULT(disabled) ;; - esac - ], - [ USE_TCL=; USE_TK=; AC_MSG_RESULT(disabled) ] -) +PGAC_ARG_BOOL(with, tcl, no, [ --with-tcl build Tcl interfaces and pgtclsh], + [USE_TCL=true; USE_TK=true; AC_MSG_RESULT(enabled)], + [USE_TCL=; USE_TK=; AC_MSG_RESULT(disabled)]) AC_SUBST(USE_TCL) AC_SUBST(USE_TK) -dnl We see if the path to the TCL/TK configuration scripts is specified. -dnl This will override the use of tclsh to find the paths to search. +# We see if the path to the TCL/TK configuration scripts is specified. +# This will override the use of tclsh to find the paths to search. -AC_ARG_WITH(tclconfig, - [ --with-tclconfig=DIR tclConfig.sh and tkConfig.sh are in DIR], - [ - case "$withval" in - "" | y | ye | yes | n | no) - AC_MSG_ERROR([*** You must supply an argument to the --with-tclconfig option.]) - ;; - esac - TCL_DIRS="$withval" - ] -) - -dnl We see if the path to the TK configuration scripts is specified. -dnl This will override the use of tclsh to find the paths to search. - -AC_ARG_WITH(tkconfig, - [ --with-tkconfig=DIR tkConfig.sh is in DIR], - [ - case "$withval" in - "" | y | ye | yes | n | no) - AC_MSG_ERROR([*** You must supply an argument to the --with-tkconfig option.]) - ;; - esac - TK_DIRS="$withval" - ] -) +PGAC_ARG_REQ(with, tclconfig, [ --with-tclconfig=DIR tclConfig.sh and tkConfig.sh are in DIR], + [TCL_DIRS=$withval]) -dnl -dnl Optionally build Perl modules (Pg.pm and PL/Perl) -dnl -AC_MSG_CHECKING(whether to build Perl modules) -AC_ARG_WITH(perl, [ --with-perl build Perl interface and plperl], -[if test x"${withval}" = x"yes" ; then - AC_MSG_RESULT(yes) -else - AC_MSG_RESULT(no) -fi], -[AC_MSG_RESULT(no)]) +# We see if the path to the TK configuration scripts is specified. +# This will override the use of tclsh to find the paths to search. + +PGAC_ARG_REQ(with, tkconfig, [ --with-tkconfig=DIR tkConfig.sh is in DIR], + [TK_DIRS=$withval]) + + +# +# Optionally build Perl modules (Pg.pm and PL/Perl) +# +AC_MSG_CHECKING([whether to build Perl modules]) +PGAC_ARG_BOOL(with, perl, no, [ --with-perl build Perl interface and PL/Perl]) +AC_MSG_RESULT([$with_perl]) AC_SUBST(with_perl) -dnl -dnl Optionally build Python interface module -dnl -AC_MSG_CHECKING(whether to build Python modules) -AC_ARG_WITH(python, [ --with-python build Python interface module], -[if test x"${withval}" = x"yes" ; then - AC_MSG_RESULT(yes) - PGAC_PROG_PYTHON - PGAC_PATH_PYTHONDIR -else - AC_MSG_RESULT(no) -fi], +# +# Optionally build Python interface module +# +AC_MSG_CHECKING([whether to build Python modules]) +PGAC_ARG_BOOL(with, python, no, [ --with-python build Python interface module], +[AC_MSG_RESULT(yes) +PGAC_PROG_PYTHON +PGAC_PATH_PYTHONDIR], [AC_MSG_RESULT(no)]) AC_SUBST(with_python) @@ -448,23 +375,12 @@ dnl is non-standard. # # Kerberos 4 # -AC_ARG_WITH(krb4, [ --with-krb4[=DIR] use Kerberos 4 [/usr/athena]], -[if test x"$withval" != x"no"; then - if test x"$withval" != x"yes"; then - krb4_prefix=$withval - else - krb4_prefix=/usr/athena - fi - with_krb4=yes -else - with_krb4=no -fi], -[with_krb4=no]) - -AC_SUBST(with_krb4) -if test "$with_krb4" = yes ; then +PGAC_ARG_OPTARG(with, krb4, [ --with-krb4[=DIR] build with Kerberos 4 support [/usr/athena]], + [krb4_prefix=/usr/athena], + [krb4_prefix=$withval], +[ AC_MSG_RESULT([building with Kerberos 4 support]) - AC_DEFINE(KRB4, [], [Define if you are building with Kerberos 4 support.]) + AC_DEFINE(KRB4, 1, [Define if you are building with Kerberos 4 support.]) if test -d "$krb4_prefix"; then if test -d "$krb4_prefix/include"; then @@ -475,35 +391,26 @@ if test "$with_krb4" = yes ; then LIBS="$krb_libdir $LIBS" fi fi - dnl Test for these libraries is below + # Test for these libraries is below KRB_LIBS="$krb_libdir -lkrb -ldes" - krb_srvtab='/etc/srvtab' -fi + krb_srvtab="/etc/srvtab" +]) + +AC_SUBST(with_krb4) # # Kerberos 5 # -AC_ARG_WITH(krb5, [ --with-krb5[=DIR] use Kerberos 5 [/usr/athena]], -[if test x"$withval" != x"no"; then - if test x"$withval" != x"yes"; then - krb5_prefix=$withval - else - krb5_prefix=/usr/athena - fi - with_krb5=yes -else - with_krb5=no -fi], -[with_krb5=no]) - -AC_SUBST(with_krb5) -if test "$with_krb5" = yes ; then +PGAC_ARG_OPTARG(with, krb5, [ --with-krb5[=DIR] build with Kerberos 5 support [/usr/athena]], + [krb5_prefix=/usr/athena], + [krb5_prefix=$withval], +[ AC_MSG_RESULT([building with Kerberos 5 support]) - AC_DEFINE(KRB5,, [Define if you are building with Kerberos 5 support.]) + AC_DEFINE(KRB5, 1, [Define if you are building with Kerberos 5 support.]) - if test -d $krb5_prefix; then + if test -d "$krb5_prefix"; then if test -d "$krb5_prefix/include"; then INCLUDES="$INCLUDES -I$krb5_prefix/include" fi @@ -513,11 +420,13 @@ if test "$with_krb5" = yes ; then fi fi - dnl Test for these libraries is below + # Test for these libraries is below KRB_LIBS="$krb_libdir -lkrb5 -lcrypto -lcom_err" - krb_srvtab='FILE:$(sysconfdir)/krb5.keytab' -fi + krb_srvtab="FILE:\$(sysconfdir)/krb5.keytab" +]) + +AC_SUBST(with_krb5) # Using both Kerberos 4 and Kerberos 5 at the same time isn't going to work. @@ -525,7 +434,6 @@ if test "$with_krb4" = yes && test "$with_krb5" = yes ; then AC_MSG_ERROR([Kerberos 4 and Kerberos 5 support cannot be combined]) fi - AC_SUBST(krb_srvtab) dnl Necessary for special libpq link AC_SUBST(KRB_LIBS) @@ -534,37 +442,25 @@ AC_SUBST(KRB_LIBS) # # Kerberos configuration parameters # -AC_ARG_WITH(krb-srvnam, [ --with-krb-srvnam=NAME name of the Postgres service principal in Kerberos], -[if test x"$withval" = x"yes"; then - AC_MSG_ERROR([argument required for --with-krb-srvnam]) -else - krb_srvnam=$withval -fi], -[krb_srvnam="postgres"]) -AC_DEFINE_UNQUOTED(PG_KRB_SRVNAM, ["$krb_srvnam"], [The name of the Postgres service principal]) +PGAC_ARG_REQ(with, krb-srvnam, + [ --with-krb-srvnam=NAME name of the PostgreSQL service principal in Kerberos], + [], + [with_krb_srvnam="postgres"]) +AC_DEFINE_UNQUOTED([PG_KRB_SRVNAM], ["$with_krb_srvnam"], + [The name of the PostgreSQL service principal in Kerberos]) # # OpenSSL # -AC_ARG_WITH(openssl, [ --with-openssl[=DIR] build with OpenSSL support [/usr/local/ssl]], -[if test x"$withval" != x"no" ; then - if test x"$withval" != x"yes" ; then - openssl_prefix=$withval - else - openssl_prefix=/usr/local/ssl - fi - with_openssl=yes -else - with_openssl=no -fi], -[with_openssl=no]) - -AC_SUBST(with_openssl) -if test "$with_openssl" = yes ; then +PGAC_ARG_OPTARG(with, openssl, + [ --with-openssl[=DIR] build with OpenSSL support [/usr/local/ssl]], + [openssl_prefix=/usr/local/ssl], + [openssl_prefix=$withval], +[ AC_MSG_RESULT([building with OpenSSL support]) - AC_DEFINE([USE_SSL], [], [Define to build with (Open)SSL support]) + AC_DEFINE([USE_SSL], 1, [Define to build with (Open)SSL support]) if test -d "${openssl_prefix}/include" ; then INCLUDES="$INCLUDES -I${openssl_prefix}/include" @@ -576,7 +472,9 @@ if test "$with_openssl" = yes ; then openssl_libdir="${openssl_prefix}" LIBS="$LIBS -L${openssl_prefix}" fi -fi +]) + +AC_SUBST(with_openssl) # OpenSSL and Kerberos 5 both have a `crypto' library, so if you want to @@ -586,54 +484,31 @@ if test "$with_openssl" = yes && test "$with_krb5" = yes ; then fi -dnl -dnl Optionally enable the building of the ODBC driver -dnl +# +# Optionally enable the building of the ODBC driver +# -dnl Old option name -if test "x${with_odbc+set}" = xset && test "x${enable_odbc+set}" != xset; then +# Old option name +if test "${with_odbc+set}" = set && test "${enable_odbc+set}" != set; then enable_odbc=$with_odbc fi -AC_MSG_CHECKING(whether to build the ODBC driver) -AC_ARG_ENABLE(odbc, [ --enable-odbc build the ODBC driver package], -[if test x"$enableval" = x"yes" ; then - AC_MSG_RESULT(yes) -else - AC_MSG_RESULT(no) -fi], -[AC_MSG_RESULT(no)]) -AC_SUBST(enable_odbc) +AC_MSG_CHECKING([whether to build the ODBC driver]) +PGAC_ARG_BOOL(enable, odbc, no, [ --enable-odbc build the ODBC driver package]) +AC_MSG_RESULT([$enable_odbc]) +AC_SUBST([enable_odbc]) -dnl Allow for overriding the default location of the odbcinst.ini -dnl file which is normally ${datadir} (i.e., ${prefix}/share). -if test x"$enable_odbc" = x"yes" ; then -AC_ARG_WITH(odbcinst, [ --with-odbcinst=DIR default directory for odbcinst.ini [sysconfdir]], -[if test x"$with_odbcinst" = x"yes" || test x"$with_odbcinst" = x"no" ; then - AC_MSG_ERROR([You must supply an argument to the --with-odbcinst option.]) -fi -odbcinst_ini_dir=$withval], -[odbcinst_ini_dir='${sysconfdir}']) -else - odbcinst_ini_dir='${sysconfdir}' -fi -AC_SUBST(odbcinst_ini_dir) +# Allow for overriding the default location of the odbcinst.ini +# file which is normally ${sysconfdir} (i.e., ${prefix}/etc). +PGAC_ARG_REQ(with, odbcinst, + [ --with-odbcinst=DIR default directory for odbcinst.ini [sysconfdir]], + [odbcinst_ini_dir=$withval], + [odbcinst_ini_dir="\${sysconfdir}"]) +AC_SUBST([odbcinst_ini_dir]) -dnl Unless we specify the command line options -dnl --enable cassert to explicitly enable it -dnl If you do not explicitly do it, it defaults to disabled -AC_MSG_CHECKING(setting ASSERT CHECKING) -AC_ARG_ENABLE( - cassert, - [ --enable-cassert enable assertion checks (for debugging) ], - AC_DEFINE(USE_ASSERT_CHECKING) AC_MSG_RESULT(enabled), - AC_MSG_RESULT(disabled) -) - - # Assume system is ELF if it predefines __ELF__ as 1, # otherwise believe host_os based default. case $host_os in @@ -655,28 +530,22 @@ AC_SUBST(ELF_SYS) -dnl -dnl Optionally build C++ code (i.e., libpq++) -dnl +# +# Optionally build C++ code (i.e., libpq++) +# AC_MSG_CHECKING([whether to build C++ modules]) -AC_ARG_WITH(CXX, [ --with-CXX build C++ modules (libpq++)], -[if test x"$withval" != x"no"; then - if test x"$withval" != x"yes" ; then - CXX=$withval - fi - with_CXX=yes -fi], -[with_CXX=no]) - -AC_MSG_RESULT([$with_CXX]) -AC_SUBST(with_CXX) - -if test $with_CXX = yes; then +PGAC_ARG_OPTARG(with, CXX, [ --with-CXX build C++ modules (libpq++)], + [], + [CXX=$withval], +[ + AC_MSG_RESULT(yes) AC_PROG_CXX AC_PROG_CXXCPP PGAC_CLASS_STRING PGAC_CXX_NAMESPACE_STD -fi +], +[AC_MSG_RESULT(no)]) +AC_SUBST(with_CXX) CPPFLAGS="$CPPFLAGS $INCLUDES" @@ -987,12 +856,13 @@ AC_TRY_LINK([#include ], [AC_DEFINE(HAVE_SIGSETJMP) AC_MSG_RESULT(yes)], AC_MSG_RESULT(no)) -AC_ARG_ENABLE(syslog, [ --enable-syslog enable logging to syslog], - [case $enableval in y|ye|yes) - AC_CHECK_FUNC(syslog, [AC_DEFINE(ENABLE_SYSLOG)], [AC_MSG_ERROR([no syslog interface found])]) - ;; - esac] -) + +PGAC_ARG_BOOL(enable, syslog, no, [ --enable-syslog enable logging to syslog], + [AC_CHECK_FUNC(syslog, + [AC_DEFINE([ENABLE_SYSLOG], 1, + [Define to 1 if to enable the syslogging code])], + [AC_MSG_ERROR([no syslog interface found])])]) + dnl Check to see if we have a working 64-bit integer type. dnl This breaks down into two steps: @@ -1250,13 +1120,6 @@ See the file 'config.log' for further diagnostics.]) LDFLAGS="$ice_save_LDFLAGS" fi - -# Wait with these until we're done so no tests fail because of too -# many warnings. -if test x"$GCC" = x"yes" ; then - CFLAGS="$CFLAGS -Wall -Wmissing-prototypes -Wmissing-declarations" -fi - dnl Finally ready to produce output files ... AC_OUTPUT( diff --git a/src/Makefile.global.in b/src/Makefile.global.in index d0188db79f..80069263b1 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -1,4 +1,4 @@ -# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.93 2000/09/08 18:29:20 petere Exp $ +# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.94 2000/09/21 20:17:43 petere Exp $ #------------------------------------------------------------------------------ # All PostgreSQL makefiles include this file and use the variables it sets, @@ -156,6 +156,9 @@ CXX=@CXX@ CXXFLAGS=@CXXFLAGS@ @INCLUDES@ GCC = @GCC@ +ifeq ($(GCC), yes) + CFLAGS += -Wall -Wmissing-prototypes -Wmissing-declarations +endif ############################################################################## #