From 968d7733a19cda3db16947024bd335d877b3d9c3 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Fri, 24 Aug 2001 14:07:50 +0000 Subject: Rename config.h to pg_config.h and os.h to pg_config_os.h, fix a number of places that were including the wrong files. --- configure | 827 +++++++++++++++++----------------- configure.in | 11 +- doc/FAQ | 2 +- doc/FAQ_german | 2 +- doc/src/FAQ/FAQ.html | 2 +- doc/src/FAQ/FAQ_german.html | 2 +- doc/src/sgml/indices.sgml | 4 +- src/Makefile.global.in | 16 +- src/backend/access/transam/Makefile | 15 +- src/backend/catalog/Makefile | 12 +- src/backend/catalog/genbki.sh | 14 +- src/backend/libpq/pqsignal.c | 4 +- src/backend/port/gethostname.c | 6 +- src/backend/port/inet_aton.c | 6 +- src/backend/port/isinf.c | 6 +- src/backend/port/qnx4/isnan.c | 4 +- src/backend/port/qnx4/rint.c | 4 +- src/backend/port/qnx4/sem.c | 5 +- src/backend/port/qnx4/shm.c | 4 +- src/backend/port/qnx4/tstrint.c | 5 +- src/backend/port/qnx4/tstsem.c | 4 +- src/backend/port/qnx4/tstshm.c | 4 +- src/backend/port/random.c | 6 +- src/backend/port/srandom.c | 6 +- src/backend/storage/smgr/md.c | 4 +- src/backend/utils/adt/int8.c | 4 +- src/include/Makefile | 6 +- src/include/c.h | 12 +- src/include/config.h.in | 717 ----------------------------- src/include/config.h.win32 | 25 - src/include/pg_config.h.in | 717 +++++++++++++++++++++++++++++ src/include/pg_config.h.win32 | 25 + src/interfaces/ecpg/lib/connect.c | 4 + src/interfaces/ecpg/lib/data.c | 4 +- src/interfaces/ecpg/lib/descriptor.c | 4 +- src/interfaces/ecpg/lib/error.c | 4 + src/interfaces/ecpg/lib/execute.c | 7 +- src/interfaces/ecpg/lib/memory.c | 4 + src/interfaces/ecpg/lib/misc.c | 4 + src/interfaces/ecpg/lib/prepare.c | 4 + src/interfaces/ecpg/lib/typename.c | 4 +- src/interfaces/libpq++/pgconnection.h | 6 +- src/interfaces/odbc/bind.c | 5 +- src/interfaces/odbc/columninfo.c | 1 + src/interfaces/odbc/connection.c | 5 +- src/interfaces/odbc/connection.h | 8 +- src/interfaces/odbc/convert.c | 7 +- src/interfaces/odbc/convert.h | 2 + src/interfaces/odbc/dlg_specific.c | 4 +- src/interfaces/odbc/dlg_specific.h | 4 - src/interfaces/odbc/drvconn.c | 5 +- src/interfaces/odbc/environ.c | 1 + src/interfaces/odbc/environ.h | 4 - src/interfaces/odbc/execute.c | 4 - src/interfaces/odbc/gpps.c | 11 +- src/interfaces/odbc/gpps.h | 4 +- src/interfaces/odbc/info.c | 5 +- src/interfaces/odbc/misc.c | 8 +- src/interfaces/odbc/misc.h | 4 +- src/interfaces/odbc/multibyte.c | 2 +- src/interfaces/odbc/multibyte.h | 1 + src/interfaces/odbc/odbcapi.c | 4 - src/interfaces/odbc/odbcapi30.c | 4 - src/interfaces/odbc/options.c | 4 - src/interfaces/odbc/parse.c | 4 +- src/interfaces/odbc/pgapifunc.h | 3 - src/interfaces/odbc/pgtypes.c | 6 +- src/interfaces/odbc/psqlodbc.c | 4 - src/interfaces/odbc/psqlodbc.h | 4 +- src/interfaces/odbc/qresult.h | 3 +- src/interfaces/odbc/results.c | 5 +- src/interfaces/odbc/socket.c | 4 - src/interfaces/odbc/socket.h | 4 +- src/interfaces/odbc/statement.c | 4 - src/interfaces/odbc/statement.h | 4 - src/interfaces/odbc/tuplelist.c | 2 +- src/interfaces/python/GNUmakefile | 3 +- src/tools/pginclude/pgrminclude | 2 +- 78 files changed, 1303 insertions(+), 1372 deletions(-) delete mode 100644 src/include/config.h.in delete mode 100644 src/include/config.h.win32 create mode 100644 src/include/pg_config.h.in create mode 100644 src/include/pg_config.h.win32 diff --git a/configure b/configure index f035c03df3e..df7ac84927b 100755 --- a/configure +++ b/configure @@ -708,8 +708,7 @@ nextstep*) template=nextstep ;; univel) template=univel ;; esac ;; sysv4*) template=svr4 ;; - sysv5uw*) template=unixware ;; - sysv5*) template=unixware ;; + sysv5*) template=unixware ;; ultrix*) template=ultrix4 ;; esac @@ -819,7 +818,7 @@ fi # Locale (--enable-locale) # echo $ac_n "checking whether to build with locale support""... $ac_c" 1>&6 -echo "configure:823: checking whether to build with locale support" >&5 +echo "configure:822: 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 @@ -848,7 +847,7 @@ echo "$ac_t""$enable_locale" 1>&6 # Character set recode (--enable-recode) # echo $ac_n "checking whether to build with recode support""... $ac_c" 1>&6 -echo "configure:852: checking whether to build with recode support" >&5 +echo "configure:851: 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 @@ -878,7 +877,7 @@ echo "$ac_t""$enable_recode" 1>&6 # MULTIBYTE= echo $ac_n "checking whether to build with multibyte character support""... $ac_c" 1>&6 -echo "configure:882: checking whether to build with multibyte character support" >&5 +echo "configure:881: checking whether to build with multibyte character support" >&5 # Check whether --enable-multibyte was given if test x"${enable_multibyte+set}" = xset; then @@ -930,7 +929,7 @@ fi # Unicode conversion (--enable-unicode-conversion) # echo $ac_n "checking whether to build with Unicode conversion support""... $ac_c" 1>&6 -echo "configure:934: checking whether to build with Unicode conversion support" >&5 +echo "configure:933: checking whether to build with Unicode conversion support" >&5 # Check whether --enable-unicode-conversion was given if test x"${enable_unicode_conversion+set}" = xset; then case $enable_unicode_conversion in @@ -961,7 +960,7 @@ echo "$ac_t""$enable_unicode_conversion" 1>&6 # NLS # echo $ac_n "checking whether NLS is wanted""... $ac_c" 1>&6 -echo "configure:965: checking whether NLS is wanted" >&5 +echo "configure:964: checking whether NLS is wanted" >&5 # Check whether --enable-nls was given if test x"${enable_nls+set}" = xset; then case $enable_nls in @@ -996,7 +995,7 @@ echo "$ac_t""$enable_nls" 1>&6 # Default port number (--with-pgport), default 5432 # echo $ac_n "checking for default port number""... $ac_c" 1>&6 -echo "configure:1000: checking for default port number" >&5 +echo "configure:999: checking for default port number" >&5 # Check whether --with-pgport was given if test x"${with_pgport+set}" = xset; then case $with_pgport in @@ -1030,7 +1029,7 @@ EOF # Maximum number of allowed connections (--with-maxbackends), default 32 # echo $ac_n "checking for default soft limit on number of connections""... $ac_c" 1>&6 -echo "configure:1034: checking for default soft limit on number of connections" >&5 +echo "configure:1033: 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 @@ -1154,7 +1153,7 @@ save_CFLAGS=$CFLAGS # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1158: checking for $ac_word" >&5 +echo "configure:1157: 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 @@ -1184,7 +1183,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:1188: checking for $ac_word" >&5 +echo "configure:1187: 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 @@ -1235,7 +1234,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:1239: checking for $ac_word" >&5 +echo "configure:1238: 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 @@ -1267,7 +1266,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1271: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1270: 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. @@ -1278,12 +1277,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1282 "configure" +#line 1281 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1286: \"$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 @@ -1309,12 +1308,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:1313: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1312: 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:1318: checking whether we are using GNU C" >&5 +echo "configure:1317: 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 @@ -1323,7 +1322,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1327: \"$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:1326: \"$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 @@ -1342,7 +1341,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:1346: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1345: 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 @@ -1385,7 +1384,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:1389: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1388: 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. @@ -1396,12 +1395,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1400 "configure" +#line 1399 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1404: \"$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 @@ -1427,17 +1426,17 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1431: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1430: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:1436: checking for Cygwin environment" >&5 +echo "configure:1435: checking for Cygwin environment" >&5 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1451: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -1465,19 +1464,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6 CYGWIN= test "$ac_cv_cygwin" = yes && CYGWIN=yes echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:1469: checking for mingw32 environment" >&5 +echo "configure:1468: checking for mingw32 environment" >&5 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1480: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -1496,7 +1495,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=yes echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1500: checking for executable suffix" >&5 +echo "configure:1499: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1506,7 +1505,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -1527,7 +1526,7 @@ echo "$ac_t""${ac_cv_exeext}" 1>&6 ac_exeext=$EXEEXT echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1531: checking how to run the C preprocessor" >&5 +echo "configure:1530: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1542,13 +1541,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:1552: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1551: \"$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 : @@ -1559,13 +1558,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:1569: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1568: \"$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 : @@ -1576,13 +1575,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:1586: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1585: \"$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 : @@ -1608,13 +1607,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:1612: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:1611: 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 @@ -1632,7 +1631,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -1754,7 +1753,7 @@ IFS=$ac_save_IFS # Tcl/Tk # echo $ac_n "checking whether to build with Tcl""... $ac_c" 1>&6 -echo "configure:1758: checking whether to build with Tcl" >&5 +echo "configure:1757: checking whether to build with Tcl" >&5 # Check whether --with-tcl was given if test x"${with_tcl+set}" = xset; then case $with_tcl in @@ -1778,7 +1777,7 @@ echo "$ac_t""$with_tcl" 1>&6 # If Tcl is enabled (above) then Tk is also, unless the user disables it using --without-tk echo $ac_n "checking whether to build with Tk""... $ac_c" 1>&6 -echo "configure:1782: checking whether to build with Tk" >&5 +echo "configure:1781: checking whether to build with Tk" >&5 if test "$with_tcl" = yes; then # Check whether --with-tk was given if test x"${with_tk+set}" = xset; then @@ -1840,7 +1839,7 @@ fi # If Tcl is enabled (above) then check for pltcl_unknown_support # echo $ac_n "checking whether to build with PL/Tcl unknown support""... $ac_c" 1>&6 -echo "configure:1844: checking whether to build with PL/Tcl unknown support" >&5 +echo "configure:1843: checking whether to build with PL/Tcl unknown support" >&5 if test "$with_tcl" = yes; then # Check whether --enable-pltcl-unknown was given if test x"${enable_pltcl_unknown+set}" = xset; then @@ -1874,7 +1873,7 @@ echo "$ac_t""$enable_pltcl_unknown" 1>&6 # Optionally build Perl modules (Pg.pm and PL/Perl) # echo $ac_n "checking whether to build Perl modules""... $ac_c" 1>&6 -echo "configure:1878: checking whether to build Perl modules" >&5 +echo "configure:1877: 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 @@ -1901,7 +1900,7 @@ echo "$ac_t""$with_perl" 1>&6 # Optionally build Python interface module # echo $ac_n "checking whether to build Python modules""... $ac_c" 1>&6 -echo "configure:1905: checking whether to build Python modules" >&5 +echo "configure:1904: 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 @@ -1927,7 +1926,7 @@ echo "$ac_t""$with_python" 1>&6 # Optionally build the Java/JDBC tools # echo $ac_n "checking whether to build Java/JDBC tools""... $ac_c" 1>&6 -echo "configure:1931: checking whether to build Java/JDBC tools" >&5 +echo "configure:1930: checking whether to build Java/JDBC tools" >&5 # Check whether --with-java was given if test x"${with_java+set}" = xset; then case $with_java in @@ -1939,7 +1938,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:1943: checking for $ac_word" >&5 +echo "configure:1942: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_ANT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1976,7 +1975,7 @@ done echo $ac_n "checking whether $ANT works""... $ac_c" 1>&6 -echo "configure:1980: checking whether $ANT works" >&5 +echo "configure:1979: checking whether $ANT works" >&5 if eval "test \"`echo '$''{'pgac_cv_prog_ant_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1999,7 +1998,7 @@ EOF EOF pgac_cmd='$ANT -buildfile conftest.xml 1>&2' - { (eval echo configure:2003: \"$pgac_cmd\") 1>&5; (eval $pgac_cmd) 2>&5; } + { (eval echo configure:2002: \"$pgac_cmd\") 1>&5; (eval $pgac_cmd) 2>&5; } pgac_save_status=$? if test $? = 0 && test -f ./conftest.class ; then pgac_cv_prog_ant_works=yes @@ -2216,7 +2215,7 @@ if test "${with_odbc+set}" = set && test "${enable_odbc+set}" != set; then fi echo $ac_n "checking whether to build the ODBC driver""... $ac_c" 1>&6 -echo "configure:2220: checking whether to build the ODBC driver" >&5 +echo "configure:2219: 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 @@ -2270,7 +2269,7 @@ case $host_os in esac cat > conftest.$ac_ext <&6 -echo "configure:2303: checking whether to build C++ modules" >&5 +echo "configure:2302: 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 @@ -2332,7 +2331,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:2336: checking for $ac_word" >&5 +echo "configure:2335: 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 @@ -2364,7 +2363,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:2368: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:2367: 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. @@ -2375,12 +2374,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 2379 "configure" +#line 2378 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:2384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2383: \"$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 @@ -2406,12 +2405,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:2410: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:2409: 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:2415: checking whether we are using GNU C++" >&5 +echo "configure:2414: 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 @@ -2420,7 +2419,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2424: \"$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:2423: \"$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 @@ -2439,7 +2438,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:2443: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:2442: 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 @@ -2487,7 +2486,7 @@ fi echo "using CXXFLAGS=$CXXFLAGS" echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:2491: checking how to run the C++ preprocessor" >&5 +echo "configure:2490: 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 @@ -2500,12 +2499,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:2509: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2508: \"$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 : @@ -2540,17 +2539,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:2544: checking for string" >&5 +echo "configure:2543: 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:2554: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2553: \"$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* @@ -2577,12 +2576,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:2581: checking for class string in " >&5 +echo "configure:2580: 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 @@ -2592,7 +2591,7 @@ int main() { string foo = "test" ; return 0; } EOF -if { (eval echo configure:2596: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2595: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* pgac_cv_class_string_in_string_h=yes else @@ -2619,7 +2618,7 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking for namespace std in C++""... $ac_c" 1>&6 -echo "configure:2623: checking for namespace std in C++" >&5 +echo "configure:2622: 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 @@ -2633,7 +2632,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 @@ -2646,7 +2645,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2650: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2649: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* pgac_cv_cxx_namespace_std=yes else @@ -2692,7 +2691,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:2696: checking for $ac_word" >&5 +echo "configure:2695: 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 @@ -2722,7 +2721,7 @@ test -n "$AWK" && break done echo $ac_n "checking for flex""... $ac_c" 1>&6 -echo "configure:2726: checking for flex" >&5 +echo "configure:2725: checking for flex" >&5 if eval "test \"`echo '$''{'pgac_cv_path_flex'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2787,7 +2786,7 @@ fi echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:2791: checking whether ln -s works" >&5 +echo "configure:2790: 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 @@ -2819,7 +2818,7 @@ ac_prog=ld if test "$ac_cv_prog_gcc" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:2823: checking for ld used by GCC" >&5 +echo "configure:2822: checking for ld used by GCC" >&5 case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -2849,10 +2848,10 @@ echo "configure:2823: checking for ld used by GCC" >&5 esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:2853: checking for GNU ld" >&5 +echo "configure:2852: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:2856: checking for non-GNU ld" >&5 +echo "configure:2855: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2887,7 +2886,7 @@ else fi test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:2891: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:2890: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2907,21 +2906,21 @@ with_gnu_ld=$ac_cv_prog_gnu_ld case $host_os in sysv5*) echo $ac_n "checking whether ld -R works""... $ac_c" 1>&6 -echo "configure:2911: checking whether ld -R works" >&5 +echo "configure:2910: checking whether ld -R works" >&5 if eval "test \"`echo '$''{'pgac_cv_prog_ld_R'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else pgac_save_LDFLAGS=$LDFLAGS; LDFLAGS="$LDFLAGS -Wl,-R/usr/lib" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* pgac_cv_prog_ld_R=yes else @@ -2942,7 +2941,7 @@ esac # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2946: checking for $ac_word" >&5 +echo "configure:2945: 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 @@ -2974,7 +2973,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:2978: checking for $ac_word" >&5 +echo "configure:2977: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LORDER'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3006,7 +3005,7 @@ done # Extract the first word of "tar", so it can be a program name with args. set dummy tar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3010: checking for $ac_word" >&5 +echo "configure:3009: 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 @@ -3043,7 +3042,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:3047: checking for $ac_word" >&5 +echo "configure:3046: 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 @@ -3078,7 +3077,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:3082: checking for $ac_word" >&5 +echo "configure:3081: 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 @@ -3123,7 +3122,7 @@ if test "$with_tk" = yes; then # Extract the first word of "wish", so it can be a program name with args. set dummy wish; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3127: checking for $ac_word" >&5 +echo "configure:3126: 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 @@ -3162,7 +3161,7 @@ if test "$with_python" = yes; then # Extract the first word of "python", so it can be a program name with args. set dummy python; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3166: checking for $ac_word" >&5 +echo "configure:3165: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3200,7 +3199,7 @@ fi echo $ac_n "checking Python installation directories""... $ac_c" 1>&6 -echo "configure:3204: checking Python installation directories" >&5 +echo "configure:3203: checking Python installation directories" >&5 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"` @@ -3224,7 +3223,7 @@ fi echo $ac_n "checking how to link an embedded Python application""... $ac_c" 1>&6 -echo "configure:3228: checking how to link an embedded Python application" >&5 +echo "configure:3227: checking how to link an embedded Python application" >&5 _python_libs=`grep '^LIBS=' $python_configdir/Makefile | sed 's/^.*=//'` _python_libc=`grep '^LIBC=' $python_configdir/Makefile | sed 's/^.*=//'` @@ -3246,7 +3245,7 @@ fi ## echo $ac_n "checking for readline""... $ac_c" 1>&6 -echo "configure:3250: checking for readline" >&5 +echo "configure:3249: checking for readline" >&5 if eval "test \"`echo '$''{'pgac_cv_check_readline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3257,7 +3256,7 @@ for pgac_lib in "" " -ltermcap" " -lncurses" " -lcurses" ; do pgac_save_LIBS=$LIBS LIBS="${pgac_rllib}${pgac_lib} $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3271: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* pgac_cv_check_readline="${pgac_rllib}${pgac_lib}"; break 2 else @@ -3295,14 +3294,14 @@ else fi echo $ac_n "checking for library containing using_history""... $ac_c" 1>&6 -echo "configure:3299: checking for library containing using_history" >&5 +echo "configure:3298: checking for library containing using_history" >&5 if eval "test \"`echo '$''{'ac_cv_search_using_history'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_func_search_save_LIBS="$LIBS" ac_cv_search_using_history="no" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_using_history="none required" else @@ -3324,7 +3323,7 @@ rm -f conftest* test "$ac_cv_search_using_history" = "no" && for i in history; do LIBS="-l$i $ac_func_search_save_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_using_history="-l$i" break @@ -3362,7 +3361,7 @@ fi if test "$PORTNAME" != "aix" -a "$PORTNAME" != "alpha" then echo $ac_n "checking for main in -lbsd""... $ac_c" 1>&6 -echo "configure:3366: checking for main in -lbsd" >&5 +echo "configure:3365: 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 @@ -3370,14 +3369,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:3380: \"$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 @@ -3406,7 +3405,7 @@ fi fi echo $ac_n "checking for setproctitle in -lutil""... $ac_c" 1>&6 -echo "configure:3410: checking for setproctitle in -lutil" >&5 +echo "configure:3409: 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 @@ -3414,7 +3413,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:3428: \"$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 @@ -3453,7 +3452,7 @@ else fi echo $ac_n "checking for main in -lm""... $ac_c" 1>&6 -echo "configure:3457: checking for main in -lm" >&5 +echo "configure:3456: 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 @@ -3461,14 +3460,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:3471: \"$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 @@ -3496,7 +3495,7 @@ else fi echo $ac_n "checking for main in -ldl""... $ac_c" 1>&6 -echo "configure:3500: checking for main in -ldl" >&5 +echo "configure:3499: 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 @@ -3504,14 +3503,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:3514: \"$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,7 +3538,7 @@ else fi echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6 -echo "configure:3543: checking for main in -lsocket" >&5 +echo "configure:3542: 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 @@ -3547,14 +3546,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:3557: \"$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 @@ -3582,7 +3581,7 @@ else fi echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6 -echo "configure:3586: checking for main in -lnsl" >&5 +echo "configure:3585: 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 @@ -3590,14 +3589,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:3600: \"$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 @@ -3625,7 +3624,7 @@ else fi echo $ac_n "checking for main in -lipc""... $ac_c" 1>&6 -echo "configure:3629: checking for main in -lipc" >&5 +echo "configure:3628: 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 @@ -3633,14 +3632,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:3643: \"$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 @@ -3668,7 +3667,7 @@ else fi echo $ac_n "checking for main in -lIPC""... $ac_c" 1>&6 -echo "configure:3672: checking for main in -lIPC" >&5 +echo "configure:3671: 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 @@ -3676,14 +3675,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:3686: \"$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 @@ -3711,7 +3710,7 @@ else fi echo $ac_n "checking for main in -llc""... $ac_c" 1>&6 -echo "configure:3715: checking for main in -llc" >&5 +echo "configure:3714: 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 @@ -3719,14 +3718,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:3729: \"$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 @@ -3754,7 +3753,7 @@ else fi echo $ac_n "checking for main in -ldld""... $ac_c" 1>&6 -echo "configure:3758: checking for main in -ldld" >&5 +echo "configure:3757: 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 @@ -3762,14 +3761,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:3772: \"$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 @@ -3797,7 +3796,7 @@ else fi echo $ac_n "checking for main in -lld""... $ac_c" 1>&6 -echo "configure:3801: checking for main in -lld" >&5 +echo "configure:3800: 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 @@ -3805,14 +3804,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:3815: \"$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 @@ -3840,7 +3839,7 @@ else fi echo $ac_n "checking for main in -lcompat""... $ac_c" 1>&6 -echo "configure:3844: checking for main in -lcompat" >&5 +echo "configure:3843: 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 @@ -3848,14 +3847,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:3858: \"$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 +3882,7 @@ else fi echo $ac_n "checking for main in -lBSD""... $ac_c" 1>&6 -echo "configure:3887: checking for main in -lBSD" >&5 +echo "configure:3886: 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 @@ -3891,14 +3890,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:3901: \"$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 @@ -3926,7 +3925,7 @@ else fi echo $ac_n "checking for main in -lgen""... $ac_c" 1>&6 -echo "configure:3930: checking for main in -lgen" >&5 +echo "configure:3929: 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 @@ -3934,14 +3933,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:3944: \"$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 @@ -3969,7 +3968,7 @@ else fi echo $ac_n "checking for main in -lPW""... $ac_c" 1>&6 -echo "configure:3973: checking for main in -lPW" >&5 +echo "configure:3972: 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 @@ -3977,14 +3976,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:3987: \"$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 @@ -4012,7 +4011,7 @@ else fi echo $ac_n "checking for main in -lresolv""... $ac_c" 1>&6 -echo "configure:4016: checking for main in -lresolv" >&5 +echo "configure:4015: checking for main in -lresolv" >&5 ac_lib_var=`echo resolv'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4020,14 +4019,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4030: \"$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 @@ -4055,7 +4054,7 @@ else fi echo $ac_n "checking for main in -lunix""... $ac_c" 1>&6 -echo "configure:4059: checking for main in -lunix" >&5 +echo "configure:4058: checking for main in -lunix" >&5 ac_lib_var=`echo unix'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4063,14 +4062,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lunix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4073: \"$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 @@ -4099,14 +4098,14 @@ fi echo $ac_n "checking for library containing crypt""... $ac_c" 1>&6 -echo "configure:4103: checking for library containing crypt" >&5 +echo "configure:4102: 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:4120: \"$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 @@ -4128,7 +4127,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:4142: \"$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 @@ -4160,7 +4159,7 @@ else : fi echo $ac_n "checking for __inet_ntoa in -lbind""... $ac_c" 1>&6 -echo "configure:4164: checking for __inet_ntoa in -lbind" >&5 +echo "configure:4163: checking for __inet_ntoa in -lbind" >&5 ac_lib_var=`echo bind'_'__inet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4168,7 +4167,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lbind $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4182: \"$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 @@ -4207,7 +4206,7 @@ else fi cat > conftest.$ac_ext < EOF @@ -4216,7 +4215,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | rm -rf conftest* echo $ac_n "checking for inflate in -lz""... $ac_c" 1>&6 -echo "configure:4220: checking for inflate in -lz" >&5 +echo "configure:4219: 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 @@ -4224,7 +4223,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:4238: \"$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 @@ -4270,7 +4269,7 @@ rm -f conftest* if test "$with_krb4" = yes ; then echo $ac_n "checking for des_encrypt in -ldes""... $ac_c" 1>&6 -echo "configure:4274: checking for des_encrypt in -ldes" >&5 +echo "configure:4273: 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 @@ -4278,7 +4277,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:4292: \"$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 @@ -4318,7 +4317,7 @@ else fi echo $ac_n "checking for krb_sendauth in -lkrb""... $ac_c" 1>&6 -echo "configure:4322: checking for krb_sendauth in -lkrb" >&5 +echo "configure:4321: 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 @@ -4326,7 +4325,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:4340: \"$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 @@ -4369,7 +4368,7 @@ fi if test "$with_krb5" = yes ; then echo $ac_n "checking for com_err in -lcom_err""... $ac_c" 1>&6 -echo "configure:4373: checking for com_err in -lcom_err" >&5 +echo "configure:4372: checking for com_err in -lcom_err" >&5 ac_lib_var=`echo com_err'_'com_err | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4377,7 +4376,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcom_err $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4391: \"$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 @@ -4417,7 +4416,7 @@ else fi echo $ac_n "checking for krb5_encrypt in -lcrypto""... $ac_c" 1>&6 -echo "configure:4421: checking for krb5_encrypt in -lcrypto" >&5 +echo "configure:4420: checking for krb5_encrypt in -lcrypto" >&5 ac_lib_var=`echo crypto'_'krb5_encrypt | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4425,7 +4424,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:4439: \"$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 @@ -4462,7 +4461,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for krb5_encrypt in -lk5crypto""... $ac_c" 1>&6 -echo "configure:4466: checking for krb5_encrypt in -lk5crypto" >&5 +echo "configure:4465: checking for krb5_encrypt in -lk5crypto" >&5 ac_lib_var=`echo k5crypto'_'krb5_encrypt | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4470,7 +4469,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lk5crypto $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4484: \"$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 @@ -4512,7 +4511,7 @@ fi fi echo $ac_n "checking for krb5_sendauth in -lkrb5""... $ac_c" 1>&6 -echo "configure:4516: checking for krb5_sendauth in -lkrb5" >&5 +echo "configure:4515: checking for krb5_sendauth in -lkrb5" >&5 ac_lib_var=`echo krb5'_'krb5_sendauth | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4520,7 +4519,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lkrb5 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4534: \"$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 @@ -4563,7 +4562,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:4567: checking for CRYPTO_new_ex_data in -lcrypto" >&5 +echo "configure:4566: 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 @@ -4571,7 +4570,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:4585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4611,7 +4610,7 @@ else fi echo $ac_n "checking for SSL_library_init in -lssl""... $ac_c" 1>&6 -echo "configure:4615: checking for SSL_library_init in -lssl" >&5 +echo "configure:4614: 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 @@ -4619,7 +4618,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:4633: \"$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 @@ -4664,14 +4663,14 @@ if test "$enable_nls" = yes ; then echo $ac_n "checking for library containing gettext""... $ac_c" 1>&6 -echo "configure:4668: checking for library containing gettext" >&5 +echo "configure:4667: checking for library containing gettext" >&5 if eval "test \"`echo '$''{'ac_cv_search_gettext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_func_search_save_LIBS="$LIBS" ac_cv_search_gettext="no" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_gettext="none required" else @@ -4693,7 +4692,7 @@ rm -f conftest* test "$ac_cv_search_gettext" = "no" && for i in intl; 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:4707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_gettext="-l$i" break @@ -4726,17 +4725,17 @@ else : fi ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for libintl.h""... $ac_c" 1>&6 -echo "configure:4730: checking for libintl.h" >&5 +echo "configure:4729: checking for libintl.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:4740: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4739: \"$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* @@ -4763,7 +4762,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:4767: checking for $ac_word" >&5 +echo "configure:4766: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4800,7 +4799,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:4804: checking for $ac_word" >&5 +echo "configure:4803: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MSGMERGE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4834,7 +4833,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:4838: checking for $ac_word" >&5 +echo "configure:4837: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4888,17 +4887,17 @@ for ac_hdr in crypt.h dld.h endian.h fp_class.h getopt.h ieeefp.h pwd.h sys/ipc. do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4892: checking for $ac_hdr" >&5 +echo "configure:4891: 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:4902: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4901: \"$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* @@ -4929,17 +4928,17 @@ for ac_hdr in netinet/in.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4933: checking for $ac_hdr" >&5 +echo "configure:4932: 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:4943: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4942: \"$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* @@ -4966,9 +4965,9 @@ fi done echo $ac_n "checking for netinet/tcp.h""... $ac_c" 1>&6 -echo "configure:4970: checking for netinet/tcp.h" >&5 +echo "configure:4969: checking for netinet/tcp.h" >&5 cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4981: \"$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* @@ -4996,24 +4995,24 @@ fi rm -f conftest* echo $ac_n "checking whether string.h and strings.h may both be included""... $ac_c" 1>&6 -echo "configure:5000: checking whether string.h and strings.h may both be included" >&5 +echo "configure:4999: checking whether string.h and strings.h may both be included" >&5 if eval "test \"`echo '$''{'pgac_cv_header_strings_both'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5012: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5011: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* cat > conftest.$ac_ext < #include @@ -5022,7 +5021,7 @@ int main() { int n = strcasecmp("a", "b"); ; return 0; } EOF -if { (eval echo configure:5026: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5025: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* pgac_cv_header_strings_both=yes else @@ -5054,17 +5053,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:5058: checking for $ac_hdr" >&5 +echo "configure:5057: 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:5068: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5067: \"$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* @@ -5094,17 +5093,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:5098: checking for $ac_hdr" >&5 +echo "configure:5097: 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:5108: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5107: \"$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* @@ -5134,17 +5133,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:5138: checking for krb.h" >&5 +echo "configure:5137: 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:5148: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5147: \"$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* @@ -5171,17 +5170,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:5175: checking for krb5.h" >&5 +echo "configure:5174: 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:5185: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5184: \"$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* @@ -5205,17 +5204,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:5209: checking for com_err.h" >&5 +echo "configure:5208: 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:5219: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5218: \"$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* @@ -5242,17 +5241,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:5246: checking for openssl/ssl.h" >&5 +echo "configure:5245: 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:5256: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5255: \"$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* @@ -5276,17 +5275,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:5280: checking for openssl/err.h" >&5 +echo "configure:5279: 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:5290: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5289: \"$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* @@ -5315,12 +5314,12 @@ fi ## Types, structures, compiler characteristics ## echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:5319: checking for working const" >&5 +echo "configure:5318: 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:5372: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -5390,21 +5389,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:5394: checking for inline" >&5 +echo "configure:5393: 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:5407: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -5432,12 +5431,12 @@ esac echo $ac_n "checking for preprocessor stringizing operator""... $ac_c" 1>&6 -echo "configure:5436: checking for preprocessor stringizing operator" >&5 +echo "configure:5435: 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:5471: checking for signed types" >&5 +echo "configure:5470: 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:5482: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* pgac_cv_c_signed=yes else @@ -5499,19 +5498,19 @@ EOF fi echo $ac_n "checking for volatile""... $ac_c" 1>&6 -echo "configure:5503: checking for volatile" >&5 +echo "configure:5502: 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:5514: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* pgac_cv_c_volatile=yes else @@ -5531,12 +5530,12 @@ EOF fi echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:5535: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:5534: 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 @@ -5544,7 +5543,7 @@ int main() { struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:5548: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5547: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -5565,12 +5564,12 @@ EOF fi echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6 -echo "configure:5569: checking for tm_zone in struct tm" >&5 +echo "configure:5568: 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> @@ -5578,7 +5577,7 @@ int main() { struct tm tm; tm.tm_zone; ; return 0; } EOF -if { (eval echo configure:5582: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5581: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm_zone=yes else @@ -5598,12 +5597,12 @@ EOF else echo $ac_n "checking for tzname""... $ac_c" 1>&6 -echo "configure:5602: checking for tzname" >&5 +echo "configure:5601: 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. */ @@ -5613,7 +5612,7 @@ int main() { atoi(*tzname); ; return 0; } EOF -if { (eval echo configure:5617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_var_tzname=yes else @@ -5635,12 +5634,12 @@ EOF fi echo $ac_n "checking for union semun""... $ac_c" 1>&6 -echo "configure:5639: checking for union semun" >&5 +echo "configure:5638: 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 @@ -5649,7 +5648,7 @@ int main() { union semun semun; ; return 0; } EOF -if { (eval echo configure:5653: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5652: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* pgac_cv_union_semun=yes else @@ -5669,12 +5668,12 @@ EOF fi echo $ac_n "checking for struct sockaddr_un""... $ac_c" 1>&6 -echo "configure:5673: checking for struct sockaddr_un" >&5 +echo "configure:5672: checking for struct sockaddr_un" >&5 if eval "test \"`echo '$''{'pgac_cv_struct_sockaddr_un'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #ifdef HAVE_SYS_UN_H @@ -5684,7 +5683,7 @@ int main() { struct sockaddr_un un; ; return 0; } EOF -if { (eval echo configure:5688: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5687: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* pgac_cv_struct_sockaddr_un=yes else @@ -5708,12 +5707,12 @@ fi ## Functions, global variables ## echo $ac_n "checking for int timezone""... $ac_c" 1>&6 -echo "configure:5712: checking for int timezone" >&5 +echo "configure:5711: checking for int timezone" >&5 if eval "test \"`echo '$''{'pgac_cv_var_int_timezone'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int res; @@ -5721,7 +5720,7 @@ int main() { res = timezone / 60; ; return 0; } EOF -if { (eval echo configure:5725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5724: \"$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 @@ -5741,7 +5740,7 @@ EOF fi echo $ac_n "checking types of arguments for accept()""... $ac_c" 1>&6 -echo "configure:5745: checking types of arguments for accept()" >&5 +echo "configure:5744: 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 @@ -5755,7 +5754,7 @@ else for ac_cv_func_accept_arg2 in 'struct sockaddr *' 'const struct sockaddr *' 'void *'; do for ac_cv_func_accept_arg3 in 'int' 'size_t' 'socklen_t' 'unsigned int' 'void'; do cat > conftest.$ac_ext < @@ -5768,7 +5767,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:5772: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5771: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_not_found=no; break 3 else @@ -5808,12 +5807,12 @@ EOF echo $ac_n "checking whether gettimeofday takes only one argument""... $ac_c" 1>&6 -echo "configure:5812: checking whether gettimeofday takes only one argument" >&5 +echo "configure:5811: 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() { @@ -5822,7 +5821,7 @@ struct timezone *tzp; gettimeofday(tp,tzp); ; return 0; } EOF -if { (eval echo configure:5826: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5825: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* pgac_cv_func_gettimeofday_1arg=no else @@ -5845,12 +5844,12 @@ fi for ac_func in fcvt getopt_long memmove pstat setproctitle setsid sigprocmask sysconf waitpid dlopen fdatasync do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5849: checking for $ac_func" >&5 +echo "configure:5848: 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:5876: \"$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 @@ -5899,7 +5898,7 @@ done cat > conftest.$ac_ext < EOF @@ -5915,12 +5914,12 @@ rm -f conftest* echo $ac_n "checking for PS_STRINGS""... $ac_c" 1>&6 -echo "configure:5919: checking for PS_STRINGS" >&5 +echo "configure:5918: 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 @@ -5930,7 +5929,7 @@ PS_STRINGS->ps_nargvstr = 1; PS_STRINGS->ps_argvstr = "foo"; ; return 0; } EOF -if { (eval echo configure:5934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5933: \"$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 @@ -5952,12 +5951,12 @@ fi SNPRINTF='' echo $ac_n "checking for snprintf""... $ac_c" 1>&6 -echo "configure:5956: checking for snprintf" >&5 +echo "configure:5955: 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:5983: \"$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 @@ -6004,12 +6003,12 @@ SNPRINTF='snprintf.o' fi echo $ac_n "checking for vsnprintf""... $ac_c" 1>&6 -echo "configure:6008: checking for vsnprintf" >&5 +echo "configure:6007: 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:6035: \"$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 @@ -6057,7 +6056,7 @@ fi cat > conftest.$ac_ext < EOF @@ -6072,7 +6071,7 @@ fi rm -f conftest* cat > conftest.$ac_ext < EOF @@ -6089,12 +6088,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:6093: checking for isinf" >&5 +echo "configure:6092: 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 < @@ -6102,7 +6101,7 @@ int main() { double x = 0.0; int res = isinf(x); ; return 0; } EOF -if { (eval echo configure:6106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_isinf=yes else @@ -6128,12 +6127,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:6132: checking for $ac_func" >&5 +echo "configure:6131: 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:6159: \"$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 @@ -6184,12 +6183,12 @@ fi echo $ac_n "checking for getrusage""... $ac_c" 1>&6 -echo "configure:6188: checking for getrusage" >&5 +echo "configure:6187: 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:6215: \"$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 @@ -6237,12 +6236,12 @@ fi echo $ac_n "checking for srandom""... $ac_c" 1>&6 -echo "configure:6241: checking for srandom" >&5 +echo "configure:6240: 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:6268: \"$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 @@ -6290,12 +6289,12 @@ fi echo $ac_n "checking for gethostname""... $ac_c" 1>&6 -echo "configure:6294: checking for gethostname" >&5 +echo "configure:6293: 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:6321: \"$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 @@ -6343,12 +6342,12 @@ fi echo $ac_n "checking for random""... $ac_c" 1>&6 -echo "configure:6347: checking for random" >&5 +echo "configure:6346: 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:6374: \"$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 @@ -6396,12 +6395,12 @@ fi echo $ac_n "checking for inet_aton""... $ac_c" 1>&6 -echo "configure:6400: checking for inet_aton" >&5 +echo "configure:6399: 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:6427: \"$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 @@ -6449,12 +6448,12 @@ fi echo $ac_n "checking for strerror""... $ac_c" 1>&6 -echo "configure:6453: checking for strerror" >&5 +echo "configure:6452: 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:6480: \"$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 @@ -6502,12 +6501,12 @@ fi echo $ac_n "checking for strdup""... $ac_c" 1>&6 -echo "configure:6506: checking for strdup" >&5 +echo "configure:6505: 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:6533: \"$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 @@ -6555,12 +6554,12 @@ fi echo $ac_n "checking for strtol""... $ac_c" 1>&6 -echo "configure:6559: checking for strtol" >&5 +echo "configure:6558: 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:6586: \"$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 @@ -6608,12 +6607,12 @@ fi echo $ac_n "checking for strtoul""... $ac_c" 1>&6 -echo "configure:6612: checking for strtoul" >&5 +echo "configure:6611: 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:6639: \"$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 @@ -6661,12 +6660,12 @@ fi echo $ac_n "checking for strcasecmp""... $ac_c" 1>&6 -echo "configure:6665: checking for strcasecmp" >&5 +echo "configure:6664: 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:6692: \"$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 @@ -6714,12 +6713,12 @@ fi echo $ac_n "checking for cbrt""... $ac_c" 1>&6 -echo "configure:6718: checking for cbrt" >&5 +echo "configure:6717: 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:6745: \"$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 @@ -6763,7 +6762,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for cbrt in -lm""... $ac_c" 1>&6 -echo "configure:6767: checking for cbrt in -lm" >&5 +echo "configure:6766: 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 @@ -6771,7 +6770,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:6785: \"$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 @@ -6820,12 +6819,12 @@ esac echo $ac_n "checking for rint""... $ac_c" 1>&6 -echo "configure:6824: checking for rint" >&5 +echo "configure:6823: 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:6851: \"$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 @@ -6869,7 +6868,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for rint in -lm""... $ac_c" 1>&6 -echo "configure:6873: checking for rint in -lm" >&5 +echo "configure:6872: 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 @@ -6877,7 +6876,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:6891: \"$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 @@ -6917,9 +6916,9 @@ fi # Readline versions < 2.1 don't have rl_completion_append_character echo $ac_n "checking for rl_completion_append_character""... $ac_c" 1>&6 -echo "configure:6921: checking for rl_completion_append_character" >&5 +echo "configure:6920: checking for rl_completion_append_character" >&5 cat > conftest.$ac_ext < #ifdef HAVE_READLINE_READLINE_H @@ -6932,7 +6931,7 @@ int main() { rl_completion_append_character = 'x'; ; return 0; } EOF -if { (eval echo configure:6936: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF @@ -6950,12 +6949,12 @@ rm -f conftest* for ac_func in rl_completion_matches rl_filename_completion_function do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6954: checking for $ac_func" >&5 +echo "configure:6953: 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:6981: \"$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 @@ -7005,16 +7004,16 @@ done echo $ac_n "checking for finite""... $ac_c" 1>&6 -echo "configure:7009: checking for finite" >&5 +echo "configure:7008: checking for finite" >&5 cat > conftest.$ac_ext < int main() { int dummy=finite(1.0); ; return 0; } EOF -if { (eval echo configure:7018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7017: \"$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 @@ -7029,16 +7028,16 @@ fi rm -f conftest* echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6 -echo "configure:7033: checking for sigsetjmp" >&5 +echo "configure:7032: checking for sigsetjmp" >&5 cat > conftest.$ac_ext < int main() { sigjmp_buf x; sigsetjmp(x, 1); ; return 0; } EOF -if { (eval echo configure:7042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7041: \"$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 @@ -7058,12 +7057,12 @@ if test x"${enable_syslog+set}" = xset; then case $enable_syslog in yes) echo $ac_n "checking for syslog""... $ac_c" 1>&6 -echo "configure:7062: checking for syslog" >&5 +echo "configure:7061: 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:7089: \"$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 @@ -7125,19 +7124,19 @@ fi echo $ac_n "checking for optreset""... $ac_c" 1>&6 -echo "configure:7129: checking for optreset" >&5 +echo "configure:7128: checking for optreset" >&5 if eval "test \"`echo '$''{'pgac_cv_var_int_optreset'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { extern int optreset; optreset = 1; ; return 0; } EOF -if { (eval echo configure:7141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7140: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* pgac_cv_var_int_optreset=yes else @@ -7163,16 +7162,16 @@ fi # This check should come after all modifications of compiler or linker # variables, and before any other run tests. echo $ac_n "checking test program""... $ac_c" 1>&6 -echo "configure:7167: checking test program" >&5 +echo "configure:7166: checking test program" >&5 if test "$cross_compiling" = yes; then echo "$ac_t""cross-compiling" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "$ac_t""ok" 1>&6 else @@ -7192,7 +7191,7 @@ fi echo $ac_n "checking whether long int is 64 bits""... $ac_c" 1>&6 -echo "configure:7196: checking whether long int is 64 bits" >&5 +echo "configure:7195: 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 @@ -7201,7 +7200,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:7233: \"$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 @@ -7257,7 +7256,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:7261: checking whether long long int is 64 bits" >&5 +echo "configure:7260: 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 @@ -7266,7 +7265,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:7298: \"$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 @@ -7325,7 +7324,7 @@ fi if [ x"$HAVE_LONG_LONG_INT_64" = xyes ] ; then cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7338: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_LL_CONSTANTS 1 @@ -7353,7 +7352,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:7357: checking whether snprintf handles 'long long int' as %lld" >&5 +echo "configure:7356: 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 @@ -7362,7 +7361,7 @@ echo "configure:7357: checking whether snprintf handles 'long long int' as %lld" else cat > conftest.$ac_ext < typedef long long int int64; @@ -7389,7 +7388,7 @@ main() { exit(! does_int64_snprintf_work()); } EOF -if { (eval echo configure:7393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7392: \"$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"' @@ -7400,7 +7399,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:7404: checking whether snprintf handles 'long long int' as %qd" >&5 +echo "configure:7403: 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 @@ -7409,7 +7408,7 @@ echo "configure:7404: checking whether snprintf handles 'long long int' as %qd" else cat > conftest.$ac_ext < typedef long long int int64; @@ -7436,7 +7435,7 @@ main() { exit(! does_int64_snprintf_work()); } EOF -if { (eval echo configure:7440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7439: \"$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"' @@ -7476,12 +7475,12 @@ EOF for ac_func in strtoll strtoq do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7480: checking for $ac_func" >&5 +echo "configure:7479: 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:7507: \"$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 @@ -7531,12 +7530,12 @@ done for ac_func in strtoull strtouq do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7535: checking for $ac_func" >&5 +echo "configure:7534: 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:7562: \"$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 @@ -7585,12 +7584,12 @@ done echo $ac_n "checking for atexit""... $ac_c" 1>&6 -echo "configure:7589: checking for atexit" >&5 +echo "configure:7588: checking for atexit" >&5 if eval "test \"`echo '$''{'ac_cv_func_atexit'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_atexit=yes" else @@ -7636,12 +7635,12 @@ else for ac_func in on_exit do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7640: checking for $ac_func" >&5 +echo "configure:7639: 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:7667: \"$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 @@ -7697,7 +7696,7 @@ fi echo $ac_n "checking size of unsigned long""... $ac_c" 1>&6 -echo "configure:7701: checking size of unsigned long" >&5 +echo "configure:7700: checking size of unsigned long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7705,7 +7704,7 @@ else ac_cv_sizeof_unsigned_long=4 else cat > conftest.$ac_ext < main() @@ -7716,7 +7715,7 @@ main() exit(0); } EOF -if { (eval echo configure:7720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_unsigned_long=`cat conftestval` else @@ -7742,7 +7741,7 @@ EOF echo $ac_n "checking alignment of short""... $ac_c" 1>&6 -echo "configure:7746: checking alignment of short" >&5 +echo "configure:7745: 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 @@ -7750,7 +7749,7 @@ else pgac_cv_alignof_short='sizeof(short)' else cat > conftest.$ac_ext < struct { char filler; short field; } mystruct; @@ -7762,7 +7761,7 @@ main() exit(0); } EOF -if { (eval echo configure:7766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7765: \"$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 @@ -7782,7 +7781,7 @@ EOF echo $ac_n "checking alignment of int""... $ac_c" 1>&6 -echo "configure:7786: checking alignment of int" >&5 +echo "configure:7785: 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 @@ -7790,7 +7789,7 @@ else pgac_cv_alignof_int='sizeof(int)' else cat > conftest.$ac_ext < struct { char filler; int field; } mystruct; @@ -7802,7 +7801,7 @@ main() exit(0); } EOF -if { (eval echo configure:7806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7805: \"$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 @@ -7822,7 +7821,7 @@ EOF echo $ac_n "checking alignment of long""... $ac_c" 1>&6 -echo "configure:7826: checking alignment of long" >&5 +echo "configure:7825: 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 @@ -7830,7 +7829,7 @@ else pgac_cv_alignof_long='sizeof(long)' else cat > conftest.$ac_ext < struct { char filler; long field; } mystruct; @@ -7842,7 +7841,7 @@ main() exit(0); } EOF -if { (eval echo configure:7846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7845: \"$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 @@ -7863,7 +7862,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:7867: checking alignment of long long int" >&5 +echo "configure:7866: 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 @@ -7871,7 +7870,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; @@ -7883,7 +7882,7 @@ main() exit(0); } EOF -if { (eval echo configure:7887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7886: \"$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 @@ -7904,7 +7903,7 @@ EOF fi echo $ac_n "checking alignment of double""... $ac_c" 1>&6 -echo "configure:7908: checking alignment of double" >&5 +echo "configure:7907: 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 @@ -7912,7 +7911,7 @@ else pgac_cv_alignof_double='sizeof(double)' else cat > conftest.$ac_ext < struct { char filler; double field; } mystruct; @@ -7924,7 +7923,7 @@ main() exit(0); } EOF -if { (eval echo configure:7928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7927: \"$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 @@ -7962,12 +7961,12 @@ EOF echo $ac_n "checking for POSIX signal interface""... $ac_c" 1>&6 -echo "configure:7966: checking for POSIX signal interface" >&5 +echo "configure:7965: 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 < @@ -7978,7 +7977,7 @@ act.sa_flags = SA_RESTART; sigaction(0, &act, &oact); ; return 0; } EOF -if { (eval echo configure:7982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7981: \"$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 @@ -8008,7 +8007,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:8012: checking for $ac_word" >&5 +echo "configure:8011: 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 @@ -8044,7 +8043,7 @@ test -n "$TCLSH" && break done echo $ac_n "checking for tclConfig.sh""... $ac_c" 1>&6 -echo "configure:8048: checking for tclConfig.sh" >&5 +echo "configure:8047: checking for tclConfig.sh" >&5 # Let user override test if test -z "$TCL_CONFIG_SH"; then pgac_test_dirs="$with_tclconfig" @@ -8077,7 +8076,7 @@ fi # Check for Tk configuration script tkConfig.sh if test "$with_tk" = yes; then echo $ac_n "checking for tkConfig.sh""... $ac_c" 1>&6 -echo "configure:8081: checking for tkConfig.sh" >&5 +echo "configure:8080: checking for tkConfig.sh" >&5 # Let user override test if test -z "$TK_CONFIG_SH"; then pgac_test_dirs="$with_tkconfig $with_tclconfig" @@ -8116,7 +8115,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:8120: checking for $ac_word" >&5 +echo "configure:8119: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_NSGMLS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8152,7 +8151,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:8156: checking for $ac_word" >&5 +echo "configure:8155: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_JADE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8183,7 +8182,7 @@ done echo $ac_n "checking for DocBook V3.1""... $ac_c" 1>&6 -echo "configure:8187: checking for DocBook V3.1" >&5 +echo "configure:8186: checking for DocBook V3.1" >&5 if eval "test \"`echo '$''{'pgac_cv_check_docbook'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8216,7 +8215,7 @@ have_docbook=$pgac_cv_check_docbook echo $ac_n "checking for DocBook stylesheets""... $ac_c" 1>&6 -echo "configure:8220: checking for DocBook stylesheets" >&5 +echo "configure:8219: checking for DocBook stylesheets" >&5 if eval "test \"`echo '$''{'pgac_cv_path_stylesheets'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8255,7 +8254,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:8259: checking for $ac_word" >&5 +echo "configure:8258: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_SGMLSPL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8412,7 +8411,7 @@ trap 'rm -fr `echo " src/GNUmakefile src/Makefile.global src/backend/port/Makefile - src/include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 + src/include/pg_config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF fi @@ -8742,7 +8741,7 @@ EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF @@ -8789,7 +8788,7 @@ cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF -# Update timestamp for config.h (see Makefile.global) +# Update timestamp for pg_config.h (see Makefile.global) test x"$CONFIG_HEADERS" != x"" && echo >src/include/stamp-h exit 0 diff --git a/configure.in b/configure.in index 076fd8a0fd4..c21e344ab75 100644 --- a/configure.in +++ b/configure.in @@ -23,7 +23,7 @@ undefine([infodir]) undefine([info]) AC_PREFIX_DEFAULT(/usr/local/pgsql) -AC_CONFIG_HEADER(src/include/config.h) +AC_CONFIG_HEADER(src/include/pg_config.h) AC_PREREQ(2.13) AC_CONFIG_AUX_DIR(config) @@ -80,8 +80,7 @@ nextstep*) template=nextstep ;; univel) template=univel ;; esac ;; sysv4*) template=svr4 ;; - sysv5uw*) template=unixware ;; - sysv5*) template=unixware ;; + sysv5*) template=unixware ;; ultrix*) template=ultrix4 ;; esac @@ -108,7 +107,7 @@ AC_SUBST(PORTNAME) AC_LINK_FILES([src/backend/port/dynloader/${template}.c], [src/backend/port/dynloader.c]) AC_LINK_FILES([src/backend/port/dynloader/${template}.h], [src/include/dynloader.h]) -AC_LINK_FILES([src/include/port/${template}.h], [src/include/os.h]) +AC_LINK_FILES([src/include/port/${template}.h], [src/include/pg_config_os.h]) AC_LINK_FILES([src/makefiles/Makefile.${template}], [src/Makefile.port]) # Pick right test-and-set (TAS) code. Most platforms have inline @@ -941,7 +940,7 @@ AC_TRY_LINK([#include ], dnl Cannot use AC_CHECK_FUNC because sigsetjmp may be a macro dnl (especially on GNU libc) -dnl See also comments in config.h. +dnl See also comments in pg_config.h. AC_MSG_CHECKING(for sigsetjmp) AC_TRY_LINK([#include ], [sigjmp_buf x; sigsetjmp(x, 1);], @@ -1204,6 +1203,6 @@ AC_OUTPUT( src/backend/port/Makefile ], [ -# Update timestamp for config.h (see Makefile.global) +# Update timestamp for pg_config.h (see Makefile.global) test x"$CONFIG_HEADERS" != x"" && echo >src/include/stamp-h ]) diff --git a/doc/FAQ b/doc/FAQ index e3053e47305..db031a0e7bb 100644 --- a/doc/FAQ +++ b/doc/FAQ @@ -559,7 +559,7 @@ In PostgreSQL 6.5 and up, the default limit is 32 processes. You can increase it by restarting the postmaster with a suitable -N value. With the default configuration you can set -N as large as 1024. If you - need more, increase MAXBACKENDS in include/config.h and rebuild. You + need more, increase MAXBACKENDS in include/pg_config.h and rebuild. You can set the default value of -N at configuration time, if you like, using configure's --with-maxbackends switch. diff --git a/doc/FAQ_german b/doc/FAQ_german index 127ea98ecc9..9a7a7d50f60 100644 --- a/doc/FAQ_german +++ b/doc/FAQ_german @@ -682,7 +682,7 @@ Wert dadurch erhöhen, daß Du den postmaster mit einem entsprechenden -N Wert neu startest. In der Standardkonfiguration kannst Du -N auf maximal 1024 setzen. Falls Du mehr brauchst, erhöhe MAXBACKENDS in - include/config.h und kompiliere das Paket neu. Du kannst den + include/pg_config.h und kompiliere das Paket neu. Du kannst den Standardwert von -N während der Konfiguration setzen, indem Du --with-maxbackends angibst. Anmerkung: Falls Du -N größer als 32 einstellst, solltest Du -B auf einen Wert, höher als 64 setzen. Für diff --git a/doc/src/FAQ/FAQ.html b/doc/src/FAQ/FAQ.html index ef698e7ae90..83b121a00e4 100644 --- a/doc/src/FAQ/FAQ.html +++ b/doc/src/FAQ/FAQ.html @@ -725,7 +725,7 @@ can increase it by restarting the postmaster with a suitable -N value. With the default configuration you can set -N as large as 1024. If you need more, increase - MAXBACKENDS in include/config.h and rebuild. + MAXBACKENDS in include/pg_config.h and rebuild. You can set the default value of -N at configuration time, if you like, using configure's --with-maxbackends switch.

diff --git a/doc/src/FAQ/FAQ_german.html b/doc/src/FAQ/FAQ_german.html index e133ef361b5..6c40523afce 100644 --- a/doc/src/FAQ/FAQ_german.html +++ b/doc/src/FAQ/FAQ_german.html @@ -712,7 +712,7 @@ Du mußt die Grenze des postmasters, die festlegt, In Postgres 6.5 sind das normalerweise 32 Prozesse. Du kannst diesen Wert dadurch erhöhen, daß Du den postmaster mit einem entsprechenden -N Wert neu startest. In der Standardkonfiguration kannst Du -N auf maximal 1024 setzen. -Falls Du mehr brauchst, erhöhe MAXBACKENDS in include/config.h und +Falls Du mehr brauchst, erhöhe MAXBACKENDS in include/pg_config.h und kompiliere das Paket neu. Du kannst den Standardwert von -N während der Konfiguration setzen, indem Du --with-maxbackends angibst. diff --git a/doc/src/sgml/indices.sgml b/doc/src/sgml/indices.sgml index 9c5b805bb28..1f746aa8b09 100644 --- a/doc/src/sgml/indices.sgml +++ b/doc/src/sgml/indices.sgml @@ -1,4 +1,4 @@ - + Indexes @@ -238,7 +238,7 @@ CREATE INDEX test2_mm_idx ON test2 (major, minor); Currently, only the B-tree implementation supports multi-column indexes. Up to 16 columns may be specified. (This limit can be altered when building Postgres; see the - file config.h.) + file pg_config.h.) diff --git a/src/Makefile.global.in b/src/Makefile.global.in index a447d4e87c3..1b1abc8f207 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -1,5 +1,5 @@ # -*-makefile-*- -# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.131 2001/07/15 11:20:01 petere Exp $ +# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.132 2001/08/24 14:07:48 petere Exp $ #------------------------------------------------------------------------------ # All PostgreSQL makefiles include this file and use the variables it sets, @@ -321,20 +321,20 @@ STRTOUL = @STRTOUL@ $(top_builddir)/src/Makefile.global: $(top_srcdir)/src/Makefile.global.in $(top_builddir)/config.status cd $(top_builddir) && CONFIG_FILES=src/Makefile.global CONFIG_HEADERS= ./config.status -# Remake config.h from config.h.in if the latter changed. -# config.status will not change the timestamp on config.h if it +# Remake pg_config.h from pg_config.h.in if the latter changed. +# config.status will not change the timestamp on pg_config.h if it # doesn't change, so as to avoid recompiling the entire tree # unnecessarily. Therefore we make config.status update a timestamp file # stamp-h everytime it runs, so that we don't trigger this rule everytime. -# (We do trigger the null rule for stamp-h to config.h everytime; so it's +# (We do trigger the null rule for stamp-h to pg_config.h everytime; so it's # important for that rule to be null!) # # Of course you need to turn on dependency tracking to get any -# dependencies on config.h. -$(top_builddir)/src/include/config.h: $(top_builddir)/src/include/stamp-h +# dependencies on pg_config.h. +$(top_builddir)/src/include/pg_config.h: $(top_builddir)/src/include/stamp-h -$(top_builddir)/src/include/stamp-h: $(top_srcdir)/src/include/config.h.in $(top_builddir)/config.status - cd $(top_builddir) && CONFIG_FILES= CONFIG_HEADERS=src/include/config.h ./config.status +$(top_builddir)/src/include/stamp-h: $(top_srcdir)/src/include/pg_config.h.in $(top_builddir)/config.status + cd $(top_builddir) && CONFIG_FILES= CONFIG_HEADERS=src/include/pg_config.h ./config.status # When configure changes, rerun configure with the same options as # last time. To change configure, you need to run autoconf manually. diff --git a/src/backend/access/transam/Makefile b/src/backend/access/transam/Makefile index 272a883c521..c4adcc5bffa 100644 --- a/src/backend/access/transam/Makefile +++ b/src/backend/access/transam/Makefile @@ -4,7 +4,7 @@ # Makefile for access/transam # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/access/transam/Makefile,v 1.13 2000/10/13 12:05:21 vadim Exp $ +# $Header: /cvsroot/pgsql/src/backend/access/transam/Makefile,v 1.14 2001/08/24 14:07:48 petere Exp $ # #------------------------------------------------------------------------- @@ -19,17 +19,8 @@ all: SUBSYS.o SUBSYS.o: $(OBJS) $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS) -depend dep: - $(CC) -MM $(CFLAGS) *.c >depend - clean: rm -f SUBSYS.o $(OBJS) -# ensure that version checks in xlog.c get recompiled when config.h or -# catversion.h changes, even if "make depend" hasn't been done. -xlog.o: xlog.c $(top_builddir)/src/include/config.h $(top_srcdir)/src/include/catalog/catversion.h - -ifeq (depend,$(wildcard depend)) -include depend -endif - +# ensure that version checks in xlog.c get recompiled when catversion.h changes +xlog.o: xlog.c $(top_srcdir)/src/include/catalog/catversion.h diff --git a/src/backend/catalog/Makefile b/src/backend/catalog/Makefile index 07801c9a14e..999897d9fee 100644 --- a/src/backend/catalog/Makefile +++ b/src/backend/catalog/Makefile @@ -2,7 +2,7 @@ # # Makefile for catalog # -# $Header: /cvsroot/pgsql/src/backend/catalog/Makefile,v 1.35 2001/06/12 05:55:49 tgl Exp $ +# $Header: /cvsroot/pgsql/src/backend/catalog/Makefile,v 1.36 2001/08/24 14:07:48 petere Exp $ # #------------------------------------------------------------------------- @@ -37,7 +37,7 @@ POSTGRES_BKI_SRCS := $(addprefix $(top_srcdir)/src/include/catalog/,\ pg_includes := $(sort -I$(top_srcdir)/src/include -I$(top_builddir)/src/include) postgres.bki postgres.description: genbki.sh $(POSTGRES_BKI_SRCS) \ - $(top_srcdir)/src/include/postgres_ext.h $(top_builddir)/src/include/config.h + $(top_srcdir)/src/include/postgres_ext.h $(top_builddir)/src/include/pg_config.h CPP='$(CPP)' AWK='$(AWK)' $(SHELL) $< $(BKIOPTS) -o postgres $(pg_includes) $(POSTGRES_BKI_SRCS) --set-version=$(VERSION) .PHONY: install-bki @@ -55,11 +55,3 @@ uninstall-bki: clean: rm -f SUBSYS.o $(OBJS) $(BKIFILES) - - -depend dep: - $(CC) -MM $(CFLAGS) *.c >depend - -ifeq (depend,$(wildcard depend)) -include depend -endif diff --git a/src/backend/catalog/genbki.sh b/src/backend/catalog/genbki.sh index 260d680f7b3..3d51423af42 100644 --- a/src/backend/catalog/genbki.sh +++ b/src/backend/catalog/genbki.sh @@ -10,7 +10,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/catalog/Attic/genbki.sh,v 1.21 2001/08/10 18:57:33 tgl Exp $ +# $Header: /cvsroot/pgsql/src/backend/catalog/Attic/genbki.sh,v 1.22 2001/08/24 14:07:48 petere Exp $ # # NOTES # non-essential whitespace is removed from the generated file. @@ -66,7 +66,7 @@ do echo " $CMDNAME [ -D define [...] ] [ -I dir ] --set-version=VERSION -o prefix files..." echo echo "Options:" - echo " -I path to postgres_ext.h and config.h files" + echo " -I path to postgres_ext.h and pg_config.h files" echo " -o prefix of output files" echo " --set-version PostgreSQL version number for initdb cross-check" echo @@ -126,12 +126,12 @@ for dir in $INCLUDE_DIRS; do fi done -# Get INDEX_MAX_KEYS and DEFAULT_ATTSTATTARGET from config.h +# Get INDEX_MAX_KEYS and DEFAULT_ATTSTATTARGET from pg_config.h # (who needs consistency?) for dir in $INCLUDE_DIRS; do - if [ -f "$dir/config.h" ]; then - INDEXMAXKEYS=`grep '#define[ ]*INDEX_MAX_KEYS' $dir/config.h | $AWK '{ print $3 }'` - DEFAULTATTSTATTARGET=`grep '#define[ ]*DEFAULT_ATTSTATTARGET' $dir/config.h | $AWK '{ print $3 }'` + if [ -f "$dir/pg_config.h" ]; then + INDEXMAXKEYS=`grep '#define[ ]*INDEX_MAX_KEYS' $dir/pg_config.h | $AWK '{ print $3 }'` + DEFAULTATTSTATTARGET=`grep '#define[ ]*DEFAULT_ATTSTATTARGET' $dir/pg_config.h | $AWK '{ print $3 }'` break fi done @@ -146,7 +146,7 @@ done export BKIOBJECTID # NOTE: we assume here that FUNC_MAX_ARGS has the same value as INDEX_MAX_KEYS, -# and don't read it separately from config.h. This is OK because both of them +# and don't read it separately from pg_config.h. This is OK because both of them # must be equal to the length of oidvector. INDEXMAXKEYS2=`expr $INDEXMAXKEYS '*' 2` || exit diff --git a/src/backend/libpq/pqsignal.c b/src/backend/libpq/pqsignal.c index 8cc8f140ace..9bdcd27b703 100644 --- a/src/backend/libpq/pqsignal.c +++ b/src/backend/libpq/pqsignal.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/libpq/pqsignal.c,v 1.20 2001/03/22 03:59:30 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/libpq/pqsignal.c,v 1.21 2001/08/24 14:07:49 petere Exp $ * * NOTES * This shouldn't be in libpq, but the monitor and some other @@ -17,7 +17,7 @@ * * A NOTE ABOUT SIGNAL HANDLING ACROSS THE VARIOUS PLATFORMS. * - * config.h defines the macro HAVE_POSIX_SIGNALS for some platforms and + * pg_config.h defines the macro HAVE_POSIX_SIGNALS for some platforms and * not for others. This file and pqsignal.h use that macro to decide * how to handle signalling. * diff --git a/src/backend/port/gethostname.c b/src/backend/port/gethostname.c index be7046e7c0e..568a2221a9d 100644 --- a/src/backend/port/gethostname.c +++ b/src/backend/port/gethostname.c @@ -1,12 +1,12 @@ -/* $Id: gethostname.c,v 1.4 1998/09/01 03:24:25 momjian Exp $ */ +/* $Id: gethostname.c,v 1.5 2001/08/24 14:07:49 petere Exp $ */ + +#include "c.h" #include #include #include -#include "config.h" - int gethostname(char *name, int namelen) { diff --git a/src/backend/port/inet_aton.c b/src/backend/port/inet_aton.c index b6cd4974393..81f20da9672 100644 --- a/src/backend/port/inet_aton.c +++ b/src/backend/port/inet_aton.c @@ -1,4 +1,4 @@ -/* $Id: inet_aton.c,v 1.18 2000/12/03 20:45:34 tgl Exp $ +/* $Id: inet_aton.c,v 1.19 2001/08/24 14:07:49 petere Exp $ * * This inet_aton() function was taken from the GNU C library and * incorporated into Postgres for those systems which do not have this @@ -42,12 +42,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ +#include "c.h" + #include #include #include -#include "config.h" - /* * Check whether "cp" is a valid ascii representation * of an Internet address and convert to a binary address. diff --git a/src/backend/port/isinf.c b/src/backend/port/isinf.c index 208cef53494..f589f47816e 100644 --- a/src/backend/port/isinf.c +++ b/src/backend/port/isinf.c @@ -1,8 +1,8 @@ -/* $Id: isinf.c,v 1.15 2000/04/12 17:15:28 momjian Exp $ */ +/* $Id: isinf.c,v 1.16 2001/08/24 14:07:49 petere Exp $ */ -#include +#include "c.h" -#include "config.h" +#include #if HAVE_FPCLASS /* this is _not_ HAVE_FP_CLASS, and not * typo */ diff --git a/src/backend/port/qnx4/isnan.c b/src/backend/port/qnx4/isnan.c index a0afb3d1849..725b26c2eea 100644 --- a/src/backend/port/qnx4/isnan.c +++ b/src/backend/port/qnx4/isnan.c @@ -7,12 +7,12 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/isnan.c,v 1.2 2000/04/12 17:15:30 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/isnan.c,v 1.3 2001/08/24 14:07:49 petere Exp $ * *------------------------------------------------------------------------- */ -#include "os.h" +#include "c.h" unsigned char __nan[8] = __nan_bytes; diff --git a/src/backend/port/qnx4/rint.c b/src/backend/port/qnx4/rint.c index 4450d8c0567..972c51e74bf 100644 --- a/src/backend/port/qnx4/rint.c +++ b/src/backend/port/qnx4/rint.c @@ -7,13 +7,13 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/rint.c,v 1.2 2000/04/12 17:15:30 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/rint.c,v 1.3 2001/08/24 14:07:49 petere Exp $ * *------------------------------------------------------------------------- */ +#include "c.h" #include -#include "os.h" double rint(double x) diff --git a/src/backend/port/qnx4/sem.c b/src/backend/port/qnx4/sem.c index 188a5f0616f..98fcc28993d 100644 --- a/src/backend/port/qnx4/sem.c +++ b/src/backend/port/qnx4/sem.c @@ -7,11 +7,13 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/sem.c,v 1.5 2001/05/24 15:53:33 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/sem.c,v 1.6 2001/08/24 14:07:49 petere Exp $ * *------------------------------------------------------------------------- */ +#include "postgres.h" + #include #include #include @@ -19,7 +21,6 @@ #include #include #include -#include "postgres.h" #include "storage/ipc.h" #include "storage/proc.h" #include diff --git a/src/backend/port/qnx4/shm.c b/src/backend/port/qnx4/shm.c index b96203f1c2d..466c4b4b402 100644 --- a/src/backend/port/qnx4/shm.c +++ b/src/backend/port/qnx4/shm.c @@ -7,11 +7,13 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/shm.c,v 1.5 2001/05/24 15:53:33 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/shm.c,v 1.6 2001/08/24 14:07:49 petere Exp $ * *------------------------------------------------------------------------- */ +#include "postgres.h" + #include #include #include diff --git a/src/backend/port/qnx4/tstrint.c b/src/backend/port/qnx4/tstrint.c index 222051692a8..5586edb6787 100644 --- a/src/backend/port/qnx4/tstrint.c +++ b/src/backend/port/qnx4/tstrint.c @@ -7,15 +7,16 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/tstrint.c,v 1.2 2000/04/12 17:15:30 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/tstrint.c,v 1.3 2001/08/24 14:07:49 petere Exp $ * *------------------------------------------------------------------------- */ +#include "c.h" + #include #include #include -#include "os.h" int diff --git a/src/backend/port/qnx4/tstsem.c b/src/backend/port/qnx4/tstsem.c index c58a724f9d0..571a6def252 100644 --- a/src/backend/port/qnx4/tstsem.c +++ b/src/backend/port/qnx4/tstsem.c @@ -7,17 +7,17 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/tstsem.c,v 1.4 2001/05/24 15:53:33 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/tstsem.c,v 1.5 2001/08/24 14:07:49 petere Exp $ * *------------------------------------------------------------------------- */ +#include "postgres.h" #include #include #include #include -#include "postgres.h" #include "storage/ipc.h" #include #include diff --git a/src/backend/port/qnx4/tstshm.c b/src/backend/port/qnx4/tstshm.c index d6e577f2924..0fd8226faad 100644 --- a/src/backend/port/qnx4/tstshm.c +++ b/src/backend/port/qnx4/tstshm.c @@ -7,11 +7,13 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/tstshm.c,v 1.2 2000/04/12 17:15:30 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/tstshm.c,v 1.3 2001/08/24 14:07:49 petere Exp $ * *------------------------------------------------------------------------- */ +#include "postgres.h" + #include #include #include diff --git a/src/backend/port/random.c b/src/backend/port/random.c index 950b9106eca..882a3fbf529 100644 --- a/src/backend/port/random.c +++ b/src/backend/port/random.c @@ -1,11 +1,11 @@ -/* $Id: random.c,v 1.9 1999/07/16 23:09:45 tgl Exp $ */ +/* $Id: random.c,v 1.10 2001/08/24 14:07:49 petere Exp $ */ + +#include "c.h" #include #include #include -#include "config.h" - long random() { diff --git a/src/backend/port/srandom.c b/src/backend/port/srandom.c index eb16736d4ce..5f61088be69 100644 --- a/src/backend/port/srandom.c +++ b/src/backend/port/srandom.c @@ -1,11 +1,11 @@ -/* $Id: srandom.c,v 1.9 1999/07/16 23:09:45 tgl Exp $ */ +/* $Id: srandom.c,v 1.10 2001/08/24 14:07:49 petere Exp $ */ + +#include "c.h" #include #include #include -#include "config.h" - void srandom(unsigned int seed) { diff --git a/src/backend/storage/smgr/md.c b/src/backend/storage/smgr/md.c index 54054ee137e..424b667c630 100644 --- a/src/backend/storage/smgr/md.c +++ b/src/backend/storage/smgr/md.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/smgr/md.c,v 1.86 2001/06/27 23:31:39 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/smgr/md.c,v 1.87 2001/08/24 14:07:49 petere Exp $ * *------------------------------------------------------------------------- */ @@ -36,7 +36,7 @@ * to support relations larger than the OS' file size limit (often 2GBytes). * In order to do that, we break relations up into chunks of < 2GBytes * and store one chunk in each of several files that represent the relation. - * See the BLCKSZ and RELSEG_SIZE configuration constants in include/config.h. + * See the BLCKSZ and RELSEG_SIZE configuration constants in include/pg_config.h. * * The file descriptor stored in the relation cache (see RelationGetFile()) * is actually an index into the Md_fdvec array. -1 indicates not open. diff --git a/src/backend/utils/adt/int8.c b/src/backend/utils/adt/int8.c index 711c17ad8ad..7a93d219d70 100644 --- a/src/backend/utils/adt/int8.c +++ b/src/backend/utils/adt/int8.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/int8.c,v 1.31 2001/08/14 22:21:58 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/int8.c,v 1.32 2001/08/24 14:07:49 petere Exp $ * *------------------------------------------------------------------------- */ @@ -21,7 +21,7 @@ #include "utils/int8.h" -/* this should be set in config.h, but just in case it wasn't: */ +/* this should be set in pg_config.h, but just in case it wasn't: */ #ifndef INT64_FORMAT #define INT64_FORMAT "%ld" #endif diff --git a/src/include/Makefile b/src/include/Makefile index 7d8a3e5b7f5..a8aed3fdd70 100644 --- a/src/include/Makefile +++ b/src/include/Makefile @@ -6,7 +6,7 @@ # programming. 'make install-all-headers' installs the whole contents # of src/include. # -# $Header: /cvsroot/pgsql/src/include/Makefile,v 1.8 2001/03/01 16:17:53 petere Exp $ +# $Header: /cvsroot/pgsql/src/include/Makefile,v 1.9 2001/08/24 14:07:49 petere Exp $ # #------------------------------------------------------------------------- @@ -18,7 +18,7 @@ include $(top_builddir)/src/Makefile.global srcdir_headers := c.h postgres_ext.h postgres_fe.h \ libpq/pqcomm.h libpq/libpq-fs.h lib/dllist.h -builddir_headers := os.h config.h +builddir_headers := pg_config_os.h pg_config.h HEADERS = $(srcdir_headers) $(builddir_headers) @@ -91,4 +91,4 @@ clean: rm -f utils/fmgroids.h parser/parse.h distclean maintainer-clean: clean - rm -f config.h dynloader.h os.h stamp-h + rm -f pg_config.h dynloader.h pg_config_os.h stamp-h diff --git a/src/include/c.h b/src/include/c.h index d67dee12ac6..fc95d381d39 100644 --- a/src/include/c.h +++ b/src/include/c.h @@ -12,7 +12,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: c.h,v 1.98 2001/08/23 23:06:38 tgl Exp $ + * $Id: c.h,v 1.99 2001/08/24 14:07:49 petere Exp $ * *------------------------------------------------------------------------- */ @@ -25,7 +25,7 @@ * * section description * ------- ------------------------------------------------ - * 0) config.h and standard system headers + * 0) pg_config.h and standard system headers * 1) hacks to cope with non-ANSI C compilers * 2) bool, true, false, TRUE, FALSE, NULL * 3) standard system types @@ -49,7 +49,7 @@ have its own. The same goes for stddef and stdarg if present. */ -#include "config.h" +#include "pg_config.h" #include #include @@ -79,7 +79,7 @@ /* ---------------------------------------------------------------- * Section 1: hacks to cope with non-ANSI C compilers * - * type prefixes (const, signed, volatile, inline) are now handled in config.h. + * type prefixes (const, signed, volatile, inline) are handled in pg_config.h. * ---------------------------------------------------------------- */ @@ -624,8 +624,8 @@ typedef NameData *Name; #endif /* Provide prototypes for routines not present in a particular machine's - * standard C library. It'd be better to put these in config.h, but - * in config.h we haven't yet included anything that defines size_t... + * standard C library. It'd be better to put these in pg_config.h, but + * in pg_config.h we haven't yet included anything that defines size_t... */ #ifndef HAVE_SNPRINTF_DECL diff --git a/src/include/config.h.in b/src/include/config.h.in deleted file mode 100644 index c0559089eb6..00000000000 --- a/src/include/config.h.in +++ /dev/null @@ -1,717 +0,0 @@ -/* - * PostgreSQL configuration-settings file. - * - * config.h.in is processed by configure to produce config.h. - * - * If you want to modify any of the tweakable settings in Part 2 - * of this file, you can do it in config.h.in before running configure, - * or in config.h afterwards. Of course, if you edit config.h, then your - * changes will be overwritten the next time you run configure. - * - * $Id: config.h.in,v 1.170 2001/08/01 23:52:50 tgl Exp $ - */ - -#ifndef CONFIG_H -#define CONFIG_H - - -/* - *------------------------------------------------------------------------ - * Part 1: feature symbols and limits that are set by configure based on - * user-supplied switches. This is first so that stuff in Part 2 can - * depend on these values. - * - * Beware of "fixing" configure-time mistakes by editing these values, - * since configure may have inserted the settings in other files as well - * as here. Best to rerun configure if you forgot --enable-multibyte - * or whatever. - *------------------------------------------------------------------------ - */ - -/* The version number is actually hard-coded into configure.in */ -#undef PG_VERSION -/* A canonical string containing the version number, platform, and C compiler */ -#undef PG_VERSION_STR - -/* Set to 1 if you want LOCALE support (--enable-locale) */ -#undef USE_LOCALE - -/* Set to 1 if you want cyrillic recode (--enable-recode) */ -#undef CYR_RECODE - -/* Set to 1 if you want to use multibyte characters (--enable-multibyte) */ -#undef MULTIBYTE - -/* Set to 1 if you want Unicode conversion support (--enable-uniconv) */ -#undef UNICODE_CONVERSION - -/* Set to 1 if you want ASSERT checking (--enable-cassert) */ -#undef USE_ASSERT_CHECKING - -/* Set to 1 to use syslog() to write postmaster log (--enable-syslog) */ -#undef ENABLE_SYSLOG - -/* Define to build with Kerberos 4 support (--with-krb4[=DIR]) */ -#undef KRB4 - -/* Define to build with Kerberos 5 support (--with-krb5[=DIR]) */ -#undef KRB5 - -/* Kerberos name of the Postgres service principal (--with-krb-srvnam=NAME) */ -#undef PG_KRB_SRVNAM - -/* Define to build with (Open)SSL support (--with-openssl[=DIR]) */ -#undef USE_SSL - -/* - * DEF_PGPORT is the TCP port number on which the Postmaster listens and - * which clients will try to connect to. This is just a default value; - * it can be overridden at postmaster or client startup. It's awfully - * convenient if your clients have the right default compiled in, though. - * (--with-pgport=PORTNUM) - */ -#undef DEF_PGPORT -/* ... and once more as a string constant instead */ -#undef DEF_PGPORT_STR - -/* - * Default soft limit on number of backend server processes per postmaster; - * this is just the default setting for the postmaster's -N switch. - * (--with-maxbackends=N) - */ -#undef DEF_MAXBACKENDS - -/* --enable-pltcl-unknown */ -#undef ENABLE_PLTCL_UNKNOWN - -/* --enable-nls */ -#undef ENABLE_NLS - -/* location of locale files */ -#undef LOCALEDIR - -/* - *------------------------------------------------------------------------ - * Part 2: feature symbols and limits that are user-configurable, but - * only by editing this file ... there's no configure support for them. - * - * Editing this file and doing a full rebuild (and an initdb if noted) - * should be sufficient to change any of these. - *------------------------------------------------------------------------ - */ - -/* - * Hard limit on number of backend server processes per postmaster. - * Increasing this costs about 32 bytes per process slot as of v 6.5. - */ -#define MAXBACKENDS (DEF_MAXBACKENDS > 1024 ? DEF_MAXBACKENDS : 1024) - -/* - * Default number of buffers in shared buffer pool (each of size BLCKSZ). - * This is just the default setting for the postmaster's -B switch. - * Perhaps it ought to be configurable from a configure switch. - * NOTE: default setting corresponds to the minimum number of buffers - * that postmaster.c will allow for the default MaxBackends value. - */ -#define DEF_NBUFFERS (DEF_MAXBACKENDS > 8 ? DEF_MAXBACKENDS * 2 : 16) - -/* - * Size of a disk block --- this also limits the size of a tuple. - * You can set it bigger if you need bigger tuples (although TOAST - * should reduce the need to have large tuples, since fields can now - * be spread across multiple tuples). - * - * The maximum possible value of BLCKSZ is currently 2^15 (32768). - * This is determined by the 15-bit widths of the lp_off and lp_len - * fields in ItemIdData (see include/storage/itemid.h). - * - * CAUTION: changing BLCKSZ requires an initdb. - */ -#define BLCKSZ 8192 - -/* - * RELSEG_SIZE is the maximum number of blocks allowed in one disk file. - * Thus, the maximum size of a single file is RELSEG_SIZE * BLCKSZ; - * relations bigger than that are divided into multiple files. - * - * CAUTION: RELSEG_SIZE * BLCKSZ must be less than your OS' limit on file - * size. This is typically 2Gb or 4Gb in a 32-bit operating system. By - * default, we make the limit 1Gb to avoid any possible integer-overflow - * problems within the OS. A limit smaller than necessary only means we - * divide a large relation into more chunks than necessary, so it seems - * best to err in the direction of a small limit. (Besides, a power-of-2 - * value saves a few cycles in md.c.) - * - * CAUTION: changing RELSEG_SIZE requires an initdb. - */ -#define RELSEG_SIZE (0x40000000 / BLCKSZ) - -/* - * Maximum number of columns in an index and maximum number of arguments - * to a function. They must be the same value. - * - * The minimum value is 8 (index creation uses 8-argument functions). - * There is no specific upper limit, although large values will waste - * system-table space and processing time. - * - * CAUTION: changing these requires an initdb. - * - * BTW: if you need to call dynamically-loaded old-style C functions that - * have more than 16 arguments, you will also need to add cases to the - * switch statement in fmgr_oldstyle() in src/backend/utils/fmgr/fmgr.c. - * But consider converting such functions to new-style instead... - */ -#define INDEX_MAX_KEYS 16 -#define FUNC_MAX_ARGS INDEX_MAX_KEYS - -/* - * System default value for pg_attribute.attstattarget - */ -#define DEFAULT_ATTSTATTARGET 10 - -/* - * Define this to make libpgtcl's "pg_result -assign" command process C-style - * backslash sequences in returned tuple data and convert Postgres array - * attributes into Tcl lists. CAUTION: this conversion is *wrong* unless - * you install the routines in contrib/string/string_io to make the backend - * produce C-style backslash sequences in the first place. - */ -/* #define TCL_ARRAYS */ - -/* - * User locks are handled totally on the application side as long term - * cooperative locks which extend beyond the normal transaction boundaries. - * Their purpose is to indicate to an application that someone is `working' - * on an item. Define this flag to enable user locks. You will need the - * loadable module user-locks.c to use this feature. - */ -#define USER_LOCKS - -/* - * Define this if you want psql to _always_ ask for a username and a password - * for password authentication. - */ -/* #define PSQL_ALWAYS_GET_PASSWORDS */ - -/* - * Define this if you want to allow the lo_import and lo_export SQL functions - * to be executed by ordinary users. By default these functions are only - * available to the Postgres superuser. CAUTION: these functions are - * SECURITY HOLES since they can read and write any file that the Postgres - * backend has permission to access. If you turn this on, don't say we - * didn't warn you. - */ -/* #define ALLOW_DANGEROUS_LO_FUNCTIONS */ - -/* - * Use btree bulkload code: - * this code is moderately slow (~10% slower) compared to the regular - * btree (insertion) build code on sorted or well-clustered data. on - * random data, however, the insertion build code is unusable -- the - * difference on a 60MB heap is a factor of 15 because the random - * probes into the btree thrash the buffer pool. - * - * Great thanks to Paul M. Aoki (aoki@CS.Berkeley.EDU) - */ -#define FASTBUILD /* access/nbtree/nbtsort.c */ - -/* - * MAXPGPATH: standard size of a pathname buffer in Postgres (hence, - * maximum usable pathname length is one less). - * - * We'd use a standard system header symbol for this, if there weren't - * so many to choose from: MAXPATHLEN, _POSIX_PATH_MAX, MAX_PATH, PATH_MAX - * are all defined by different "standards", and often have different - * values on the same platform! So we just punt and use a reasonably - * generous setting here. - */ -#define MAXPGPATH 1024 - -/* - * DEFAULT_MAX_EXPR_DEPTH: default value of max_expr_depth SET variable. - */ -#define DEFAULT_MAX_EXPR_DEPTH 10000 - -/* - * PG_SOMAXCONN: maximum accept-queue length limit passed to listen(2). - * You'd think we should use SOMAXCONN from , but on many - * systems that symbol is much smaller than the kernel's actual limit. - * In any case, this symbol need be twiddled only if you have a kernel - * that refuses large limit values, rather than silently reducing the - * value to what it can handle (which is what most if not all Unixen do). - */ -#define PG_SOMAXCONN 10000 - -/* - * You can try changing this if you have a machine with bytes of another - * size, but no guarantee... - */ -#define BITS_PER_BYTE 8 - -/* - * Define this if your operating system supports AF_UNIX family sockets. - */ -#if !defined(__QNX__) && !defined(__BEOS__) -# define HAVE_UNIX_SOCKETS 1 -#endif - -/* - * This is the default directory in which AF_UNIX socket files are placed. - * Caution: changing this risks breaking your existing client applications, - * which are likely to continue to look in the old directory. But if you - * just hate the idea of sockets in /tmp, here's where to twiddle it. - * You can also override this at runtime with the postmaster's -k switch. - */ -#define DEFAULT_PGSOCKET_DIR "/tmp" - - -/* - *------------------------------------------------------------------------ - * These hand-configurable symbols are for enabling debugging code, - * not for controlling user-visible features or resource limits. - *------------------------------------------------------------------------ - */ - -/* Define this to cause pfree()'d memory to be cleared immediately, - * to facilitate catching bugs that refer to already-freed values. - * XXX For 7.1 development, define this automatically if --enable-cassert. - * In the long term it probably doesn't need to be on by default. - */ -#ifdef USE_ASSERT_CHECKING -#define CLOBBER_FREED_MEMORY -#endif - -/* Define this to check memory allocation errors (scribbling on more - * bytes than were allocated). - * XXX For 7.1 development, define this automatically if --enable-cassert. - * In the long term it probably doesn't need to be on by default. - */ -#ifdef USE_ASSERT_CHECKING -#define MEMORY_CONTEXT_CHECKING -#endif - -/* Define this to force all parse and plan trees to be passed through - * copyObject(), to facilitate catching errors and omissions in copyObject(). - */ -/* #define COPY_PARSE_PLAN_TREES */ - -/* Enable debugging print statements in the date/time support routines. */ -/* #define DATEDEBUG */ - -/* Enable debugging print statements for lock-related operations. */ -/* #define LOCK_DEBUG */ - -/* - * Other debug #defines (documentation, anyone?) - */ -/* #define IPORTAL_DEBUG */ -/* #define HEAPDEBUGALL */ -/* #define ISTRATDEBUG */ -/* #define ACLDEBUG */ -/* #define RTDEBUG */ -/* #define GISTDEBUG */ - -/* - * defining unsafe floats will make float4 and float8 ops faster - * by suppressing overflow/underflow checks. - */ -/* #define UNSAFE_FLOATS */ - - -/* - *------------------------------------------------------------------------ - * Part 3: system configuration information that is auto-detected by - * configure. In theory you shouldn't have to touch any of this stuff - * by hand. In the real world, configure might get it wrong... - *------------------------------------------------------------------------ - */ - -/* Define const as empty if your compiler doesn't grok const. */ -#undef const - -/* Define as your compiler's spelling of "inline", or empty if no inline. */ -#undef inline - -/* Define as empty if the C compiler doesn't understand "signed". */ -#undef signed - -/* Define as empty if the C compiler doesn't understand "volatile". */ -#undef volatile - -/* Define if your cpp understands the ANSI stringizing operators in macros */ -#undef HAVE_STRINGIZE - -/* Set to 1 if you have */ -#undef HAVE_CRYPT_H - -/* Set to 1 if you have */ -#undef HAVE_DLD_H - -/* Set to 1 if you have */ -#undef HAVE_ENDIAN_H - -/* Set to 1 if you have */ -#undef HAVE_FP_CLASS_H - -/* Set to 1 if you have */ -#undef HAVE_GETOPT_H - -/* Set to 1 if you have */ -#undef HAVE_HISTORY_H - -/* Set to 1 if you have */ -#undef HAVE_IEEEFP_H - -/* Set to 1 if you have */ -#undef HAVE_NETINET_TCP_H - -/* Set to 1 if you have */ -#undef HAVE_READLINE_H - -/* Set to 1 if you have */ -#undef HAVE_READLINE_HISTORY_H - -/* Set to 1 if you have */ -#undef HAVE_READLINE_READLINE_H - -/* Set to 1 if you have */ -#undef HAVE_SYS_IPC_H - -/* Set to 1 if you have */ -#undef HAVE_SYS_SELECT_H - -/* Set to 1 if you have */ -#undef HAVE_SYS_UN_H - -/* Set to 1 if you have */ -#undef HAVE_SYS_SEM_H - -/* Set to 1 if you have */ -#undef HAVE_SYS_SHM_H - -/* Set to 1 if you have */ -#undef HAVE_KERNEL_OS_H - -/* Set to 1 if you have */ -#undef HAVE_SUPPORTDEFS_H - -/* Set to 1 if you have */ -#undef HAVE_KERNEL_IMAGE_H - -/* Set to 1 if you have */ -#undef HAVE_TERMIOS_H - -/* Set to 1 if you have */ -#undef HAVE_SYS_PSTAT_H - -/* Define if string.h and strings.h may both be included */ -#undef STRING_H_WITH_STRINGS_H - -/* Define if you have the setproctitle function. */ -#undef HAVE_SETPROCTITLE - -/* Define if you have the pstat function. */ -#undef HAVE_PSTAT - -/* Define if the PS_STRINGS thing exists. */ -#undef HAVE_PS_STRINGS - -/* Define if you have the stricmp function. */ -#undef HAVE_STRICMP - -/* Set to 1 if you have history functions (either in libhistory or libreadline) */ -#undef HAVE_HISTORY_FUNCTIONS - -/* Set to 1 if you have */ -#undef HAVE_PWD_H - -/* Set to 1 if you have gettimeofday(a) instead of gettimeofday(a,b) */ -#undef GETTIMEOFDAY_1ARG -#ifdef GETTIMEOFDAY_1ARG -# define gettimeofday(a,b) gettimeofday(a) -#endif - -/* Set to 1 if you have snprintf() in the C library */ -#undef HAVE_SNPRINTF - -/* Set to 1 if your standard system headers declare snprintf() */ -#undef HAVE_SNPRINTF_DECL - -/* Set to 1 if you have vsnprintf() in the C library */ -#undef HAVE_VSNPRINTF - -/* Set to 1 if your standard system headers declare vsnprintf() */ -#undef HAVE_VSNPRINTF_DECL - -/* Set to 1 if you have strerror() */ -#undef HAVE_STRERROR - -/* Set to 1 if you have isinf() */ -#undef HAVE_ISINF -#ifndef HAVE_ISINF -extern int isinf(double x); -#endif - -/* - * These are all related to port/isinf.c - */ -#undef HAVE_FPCLASS -#undef HAVE_FP_CLASS -#undef HAVE_FP_CLASS_H -#undef HAVE_FP_CLASS_D -#undef HAVE_CLASS - -/* Set to 1 if you have gethostname() */ -#undef HAVE_GETHOSTNAME -#ifndef HAVE_GETHOSTNAME -extern int gethostname(char *name, int namelen); -#endif - -/* Set to 1 if struct tm has a tm_zone member */ -#undef HAVE_TM_ZONE - -/* Set to 1 if you have int timezone. - * NOTE: if both tm_zone and a global timezone variable exist, - * using the tm_zone field should probably be preferred, - * since global variables are inherently not thread-safe. - */ -#undef HAVE_INT_TIMEZONE - -/* Set to 1 if you have cbrt() */ -#undef HAVE_CBRT - -/* Set to 1 if you have inet_aton() */ -#undef HAVE_INET_ATON - -#ifndef HAVE_INET_ATON -# include -# include -# include -extern int inet_aton(const char *cp, struct in_addr * addr); -#endif - -/* Set to 1 if you have fcvt() */ -#undef HAVE_FCVT - -/* Set to 1 if you have rint() */ -#undef HAVE_RINT - -/* Set to 1 if you have finite() */ -#undef HAVE_FINITE - -/* Set to 1 if you have memmove() */ -#undef HAVE_MEMMOVE - -/* Set to 1 if you have sigsetjmp() */ -#undef HAVE_SIGSETJMP - -/* - * When there is no sigsetjmp, its functionality is provided by plain - * setjmp. Incidentally, nothing provides setjmp's functionality in - * that case. - */ -#ifndef HAVE_SIGSETJMP -# define sigjmp_buf jmp_buf -# define sigsetjmp(x,y) setjmp(x) -# define siglongjmp longjmp -#endif - -/* Set to 1 if you have sysconf() */ -#undef HAVE_SYSCONF - -/* Set to 1 if you have getrusage() */ -#undef HAVE_GETRUSAGE - -/* Set to 1 if you have waitpid() */ -#undef HAVE_WAITPID - -/* Set to 1 if you have setsid() */ -#undef HAVE_SETSID - -/* Set to 1 if you have sigprocmask() */ -#undef HAVE_SIGPROCMASK - -/* Set to 1 if you have sigprocmask() */ -#undef HAVE_STRCASECMP -#ifndef HAVE_STRCASECMP -extern int strcasecmp(char *s1, char *s2); -#endif - -/* Set to 1 if you have strtol() */ -#undef HAVE_STRTOL - -/* Set to 1 if you have strtoul() */ -#undef HAVE_STRTOUL - -/* Set to 1 if you have strdup() */ -#undef HAVE_STRDUP -#ifndef HAVE_STRDUP -extern char *strdup(char const *); -#endif - -/* Set to 1 if you have random() */ -#undef HAVE_RANDOM -#ifndef HAVE_RANDOM -extern long random(void); -#endif - -/* Set to 1 if you have srandom() */ -#undef HAVE_SRANDOM -#ifndef HAVE_SRANDOM -extern void srandom(unsigned int seed); -#endif - -/* The random() function is expected to yield values 0 .. MAX_RANDOM_VALUE */ -/* Currently, all known implementations yield 0..2^31-1, so we just hardwire - * this constant. We could do a configure test if it proves to be necessary. - * CAUTION: Think not to replace this with RAND_MAX. RAND_MAX defines the - * maximum value of the older rand() function, which is often different from - * --- and considerably inferior to --- random(). - */ -#define MAX_RANDOM_VALUE (0x7FFFFFFF) - -/* Define if you have dlopen() */ -#undef HAVE_DLOPEN - -/* Define if you have fdatasync() */ -#undef HAVE_FDATASYNC - -/* Define if the standard header unistd.h declares fdatasync() */ -#undef HAVE_FDATASYNC_DECL - -#if defined(HAVE_FDATASYNC) && !defined(HAVE_FDATASYNC_DECL) -extern int fdatasync(int fildes); -#endif - -/* Set to 1 if you have libz.a */ -#undef HAVE_LIBZ - -/* Set to 1 if you have libreadline.a */ -#undef HAVE_LIBREADLINE - -/* Set to 1 if you have libhistory.a */ -#undef HAVE_LIBHISTORY - -/* Set to 1 if your libreadline defines rl_completion_append_character */ -#undef HAVE_RL_COMPLETION_APPEND_CHARACTER - -/* Set to 1 if you have rl_completion_matches */ -#undef HAVE_RL_COMPLETION_MATCHES - -/* Set to 1 if you have rl_filename_completion_function */ -#undef HAVE_RL_FILENAME_COMPLETION_FUNCTION - -/* Set to 1 if you have getopt_long() (GNU long options) */ -#undef HAVE_GETOPT_LONG - -/* Set to 1 if you have union semun */ -#undef HAVE_UNION_SEMUN - -/* Set to 1 if you have struct sockaddr_un */ -#undef HAVE_STRUCT_SOCKADDR_UN - -/* Set to 1 if type "long int" works and is 64 bits */ -#undef HAVE_LONG_INT_64 - -/* Set to 1 if type "long long int" works and is 64 bits */ -#undef HAVE_LONG_LONG_INT_64 - -/* Set to 1 if type "long long int" constants should be suffixed by LL */ -#undef HAVE_LL_CONSTANTS - -/* Define this as the appropriate snprintf format for 64-bit ints, if any */ -#undef INT64_FORMAT - -/* - * We need a #define symbol for sizeof(Datum) for use in some #if tests. - */ -#undef SIZEOF_DATUM - -/* - * These must be defined as the alignment requirement (NOT the size) of - * each of the basic C data types (except char, which we assume has align 1). - * MAXIMUM_ALIGNOF is the largest alignment requirement for any C data type. - * ALIGNOF_LONG_LONG_INT need only be defined if HAVE_LONG_LONG_INT_64 is. - */ -#undef ALIGNOF_SHORT -#undef ALIGNOF_INT -#undef ALIGNOF_LONG -#undef ALIGNOF_LONG_LONG_INT -#undef ALIGNOF_DOUBLE -#undef MAXIMUM_ALIGNOF - -/* Define as the type of the 3rd argument to accept() */ -#undef ACCEPT_TYPE_ARG3 - -/* Define if POSIX signal interface is available */ -#undef HAVE_POSIX_SIGNALS - -/* Define if C++ compiler accepts "using namespace std" */ -#undef HAVE_NAMESPACE_STD - -/* Define if C++ compiler accepts "#include " */ -#undef HAVE_CXX_STRING_HEADER - -/* Define if you have the optreset variable */ -#undef HAVE_INT_OPTRESET - -/* Define if you have strtoll() */ -#undef HAVE_STRTOLL - -/* Define if you have strtoq() */ -#undef HAVE_STRTOQ - -/* If strtoq() exists, rename it to the more standard strtoll() */ -#if defined(HAVE_LONG_LONG_INT_64) && !defined(HAVE_STRTOLL) && defined(HAVE_STRTOQ) -# define strtoll strtoq -# define HAVE_STRTOLL 1 -#endif - -/* Define if you have strtoull() */ -#undef HAVE_STRTOULL - -/* Define if you have strtouq() */ -#undef HAVE_STRTOUQ - -/* If strtouq() exists, rename it to the more standard strtoull() */ -#if defined(HAVE_LONG_LONG_INT_64) && !defined(HAVE_STRTOULL) && defined(HAVE_STRTOUQ) -# define strtoull strtouq -# define HAVE_STRTOULL 1 -#endif - -/* Define if you have atexit() */ -#undef HAVE_ATEXIT - -/* Define if you have on_exit() */ -#undef HAVE_ON_EXIT - -/* - *------------------------------------------------------------------------ - * Part 4: pull in system-specific declarations. - * - * This is still configure's responsibility, because it picks where - * the "os.h" symlink points... - *------------------------------------------------------------------------ - */ - -/* - * Pull in OS-specific declarations (using link created by configure) - */ - -#include "os.h" - -/* - * The following is used as the arg list for signal handlers. Any ports - * that take something other than an int argument should override this in - * the port-specific os.h file. Note that variable names are required - * because it is used in both the prototypes as well as the definitions. - * Note also the long name. We expect that this won't collide with - * other names causing compiler warnings. - */ - -#ifndef SIGNAL_ARGS -#define SIGNAL_ARGS int postgres_signal_arg -#endif - - -#endif /* CONFIG_H */ diff --git a/src/include/config.h.win32 b/src/include/config.h.win32 deleted file mode 100644 index e8323b77364..00000000000 --- a/src/include/config.h.win32 +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Parts of config.h that you get with autoconf on other systems - */ -#define PG_VERSION "7.2.0" -#define PG_VERSION_STR "7.2.0 (win32)" - -#define SYSCONFDIR "" - -#define DEF_PGPORT 5432 -#define DEF_PGPORT_STR "5432" - -#define MAXIMUM_ALIGNOF 4 -#define ACCEPT_TYPE_ARG3 int - -#define MAXPGPATH 1024 - -#define BLCKSZ 8192 - -#define INDEX_MAX_KEYS 16 - -#define HAVE_ATEXIT -#define HAVE_MEMMOVE - -#define HAVE_CXX_STRING_HEADER -#define HAVE_NAMESPACE_STD diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in new file mode 100644 index 00000000000..c0984313e1e --- /dev/null +++ b/src/include/pg_config.h.in @@ -0,0 +1,717 @@ +/* + * PostgreSQL configuration-settings file. + * + * pg_config.h.in is processed by configure to produce pg_config.h. + * + * If you want to modify any of the tweakable settings in Part 2 + * of this file, you can do it in pg_config.h.in before running configure, + * or in pg_config.h afterwards. Of course, if you edit pg_config.h, then your + * changes will be overwritten the next time you run configure. + * + * $Id: pg_config.h.in,v 1.1 2001/08/24 14:07:49 petere Exp $ + */ + +#ifndef PG_CONFIG_H +#define PG_CONFIG_H + + +/* + *------------------------------------------------------------------------ + * Part 1: feature symbols and limits that are set by configure based on + * user-supplied switches. This is first so that stuff in Part 2 can + * depend on these values. + * + * Beware of "fixing" configure-time mistakes by editing these values, + * since configure may have inserted the settings in other files as well + * as here. Best to rerun configure if you forgot --enable-multibyte + * or whatever. + *------------------------------------------------------------------------ + */ + +/* The version number is actually hard-coded into configure.in */ +#undef PG_VERSION +/* A canonical string containing the version number, platform, and C compiler */ +#undef PG_VERSION_STR + +/* Set to 1 if you want LOCALE support (--enable-locale) */ +#undef USE_LOCALE + +/* Set to 1 if you want cyrillic recode (--enable-recode) */ +#undef CYR_RECODE + +/* Set to 1 if you want to use multibyte characters (--enable-multibyte) */ +#undef MULTIBYTE + +/* Set to 1 if you want Unicode conversion support (--enable-uniconv) */ +#undef UNICODE_CONVERSION + +/* Set to 1 if you want ASSERT checking (--enable-cassert) */ +#undef USE_ASSERT_CHECKING + +/* Set to 1 to use syslog() to write postmaster log (--enable-syslog) */ +#undef ENABLE_SYSLOG + +/* Define to build with Kerberos 4 support (--with-krb4[=DIR]) */ +#undef KRB4 + +/* Define to build with Kerberos 5 support (--with-krb5[=DIR]) */ +#undef KRB5 + +/* Kerberos name of the Postgres service principal (--with-krb-srvnam=NAME) */ +#undef PG_KRB_SRVNAM + +/* Define to build with (Open)SSL support (--with-openssl[=DIR]) */ +#undef USE_SSL + +/* + * DEF_PGPORT is the TCP port number on which the Postmaster listens and + * which clients will try to connect to. This is just a default value; + * it can be overridden at postmaster or client startup. It's awfully + * convenient if your clients have the right default compiled in, though. + * (--with-pgport=PORTNUM) + */ +#undef DEF_PGPORT +/* ... and once more as a string constant instead */ +#undef DEF_PGPORT_STR + +/* + * Default soft limit on number of backend server processes per postmaster; + * this is just the default setting for the postmaster's -N switch. + * (--with-maxbackends=N) + */ +#undef DEF_MAXBACKENDS + +/* --enable-pltcl-unknown */ +#undef ENABLE_PLTCL_UNKNOWN + +/* --enable-nls */ +#undef ENABLE_NLS + +/* location of locale files */ +#undef LOCALEDIR + +/* + *------------------------------------------------------------------------ + * Part 2: feature symbols and limits that are user-configurable, but + * only by editing this file ... there's no configure support for them. + * + * Editing this file and doing a full rebuild (and an initdb if noted) + * should be sufficient to change any of these. + *------------------------------------------------------------------------ + */ + +/* + * Hard limit on number of backend server processes per postmaster. + * Increasing this costs about 32 bytes per process slot as of v 6.5. + */ +#define MAXBACKENDS (DEF_MAXBACKENDS > 1024 ? DEF_MAXBACKENDS : 1024) + +/* + * Default number of buffers in shared buffer pool (each of size BLCKSZ). + * This is just the default setting for the postmaster's -B switch. + * Perhaps it ought to be configurable from a configure switch. + * NOTE: default setting corresponds to the minimum number of buffers + * that postmaster.c will allow for the default MaxBackends value. + */ +#define DEF_NBUFFERS (DEF_MAXBACKENDS > 8 ? DEF_MAXBACKENDS * 2 : 16) + +/* + * Size of a disk block --- this also limits the size of a tuple. + * You can set it bigger if you need bigger tuples (although TOAST + * should reduce the need to have large tuples, since fields can now + * be spread across multiple tuples). + * + * The maximum possible value of BLCKSZ is currently 2^15 (32768). + * This is determined by the 15-bit widths of the lp_off and lp_len + * fields in ItemIdData (see include/storage/itemid.h). + * + * CAUTION: changing BLCKSZ requires an initdb. + */ +#define BLCKSZ 8192 + +/* + * RELSEG_SIZE is the maximum number of blocks allowed in one disk file. + * Thus, the maximum size of a single file is RELSEG_SIZE * BLCKSZ; + * relations bigger than that are divided into multiple files. + * + * CAUTION: RELSEG_SIZE * BLCKSZ must be less than your OS' limit on file + * size. This is typically 2Gb or 4Gb in a 32-bit operating system. By + * default, we make the limit 1Gb to avoid any possible integer-overflow + * problems within the OS. A limit smaller than necessary only means we + * divide a large relation into more chunks than necessary, so it seems + * best to err in the direction of a small limit. (Besides, a power-of-2 + * value saves a few cycles in md.c.) + * + * CAUTION: changing RELSEG_SIZE requires an initdb. + */ +#define RELSEG_SIZE (0x40000000 / BLCKSZ) + +/* + * Maximum number of columns in an index and maximum number of arguments + * to a function. They must be the same value. + * + * The minimum value is 8 (index creation uses 8-argument functions). + * There is no specific upper limit, although large values will waste + * system-table space and processing time. + * + * CAUTION: changing these requires an initdb. + * + * BTW: if you need to call dynamically-loaded old-style C functions that + * have more than 16 arguments, you will also need to add cases to the + * switch statement in fmgr_oldstyle() in src/backend/utils/fmgr/fmgr.c. + * But consider converting such functions to new-style instead... + */ +#define INDEX_MAX_KEYS 16 +#define FUNC_MAX_ARGS INDEX_MAX_KEYS + +/* + * System default value for pg_attribute.attstattarget + */ +#define DEFAULT_ATTSTATTARGET 10 + +/* + * Define this to make libpgtcl's "pg_result -assign" command process C-style + * backslash sequences in returned tuple data and convert Postgres array + * attributes into Tcl lists. CAUTION: this conversion is *wrong* unless + * you install the routines in contrib/string/string_io to make the backend + * produce C-style backslash sequences in the first place. + */ +/* #define TCL_ARRAYS */ + +/* + * User locks are handled totally on the application side as long term + * cooperative locks which extend beyond the normal transaction boundaries. + * Their purpose is to indicate to an application that someone is `working' + * on an item. Define this flag to enable user locks. You will need the + * loadable module user-locks.c to use this feature. + */ +#define USER_LOCKS + +/* + * Define this if you want psql to _always_ ask for a username and a password + * for password authentication. + */ +/* #define PSQL_ALWAYS_GET_PASSWORDS */ + +/* + * Define this if you want to allow the lo_import and lo_export SQL functions + * to be executed by ordinary users. By default these functions are only + * available to the Postgres superuser. CAUTION: these functions are + * SECURITY HOLES since they can read and write any file that the Postgres + * backend has permission to access. If you turn this on, don't say we + * didn't warn you. + */ +/* #define ALLOW_DANGEROUS_LO_FUNCTIONS */ + +/* + * Use btree bulkload code: + * this code is moderately slow (~10% slower) compared to the regular + * btree (insertion) build code on sorted or well-clustered data. on + * random data, however, the insertion build code is unusable -- the + * difference on a 60MB heap is a factor of 15 because the random + * probes into the btree thrash the buffer pool. + * + * Great thanks to Paul M. Aoki (aoki@CS.Berkeley.EDU) + */ +#define FASTBUILD /* access/nbtree/nbtsort.c */ + +/* + * MAXPGPATH: standard size of a pathname buffer in Postgres (hence, + * maximum usable pathname length is one less). + * + * We'd use a standard system header symbol for this, if there weren't + * so many to choose from: MAXPATHLEN, _POSIX_PATH_MAX, MAX_PATH, PATH_MAX + * are all defined by different "standards", and often have different + * values on the same platform! So we just punt and use a reasonably + * generous setting here. + */ +#define MAXPGPATH 1024 + +/* + * DEFAULT_MAX_EXPR_DEPTH: default value of max_expr_depth SET variable. + */ +#define DEFAULT_MAX_EXPR_DEPTH 10000 + +/* + * PG_SOMAXCONN: maximum accept-queue length limit passed to listen(2). + * You'd think we should use SOMAXCONN from , but on many + * systems that symbol is much smaller than the kernel's actual limit. + * In any case, this symbol need be twiddled only if you have a kernel + * that refuses large limit values, rather than silently reducing the + * value to what it can handle (which is what most if not all Unixen do). + */ +#define PG_SOMAXCONN 10000 + +/* + * You can try changing this if you have a machine with bytes of another + * size, but no guarantee... + */ +#define BITS_PER_BYTE 8 + +/* + * Define this if your operating system supports AF_UNIX family sockets. + */ +#if !defined(__QNX__) && !defined(__BEOS__) +# define HAVE_UNIX_SOCKETS 1 +#endif + +/* + * This is the default directory in which AF_UNIX socket files are placed. + * Caution: changing this risks breaking your existing client applications, + * which are likely to continue to look in the old directory. But if you + * just hate the idea of sockets in /tmp, here's where to twiddle it. + * You can also override this at runtime with the postmaster's -k switch. + */ +#define DEFAULT_PGSOCKET_DIR "/tmp" + + +/* + *------------------------------------------------------------------------ + * These hand-configurable symbols are for enabling debugging code, + * not for controlling user-visible features or resource limits. + *------------------------------------------------------------------------ + */ + +/* Define this to cause pfree()'d memory to be cleared immediately, + * to facilitate catching bugs that refer to already-freed values. + * XXX For 7.1 development, define this automatically if --enable-cassert. + * In the long term it probably doesn't need to be on by default. + */ +#ifdef USE_ASSERT_CHECKING +#define CLOBBER_FREED_MEMORY +#endif + +/* Define this to check memory allocation errors (scribbling on more + * bytes than were allocated). + * XXX For 7.1 development, define this automatically if --enable-cassert. + * In the long term it probably doesn't need to be on by default. + */ +#ifdef USE_ASSERT_CHECKING +#define MEMORY_CONTEXT_CHECKING +#endif + +/* Define this to force all parse and plan trees to be passed through + * copyObject(), to facilitate catching errors and omissions in copyObject(). + */ +/* #define COPY_PARSE_PLAN_TREES */ + +/* Enable debugging print statements in the date/time support routines. */ +/* #define DATEDEBUG */ + +/* Enable debugging print statements for lock-related operations. */ +/* #define LOCK_DEBUG */ + +/* + * Other debug #defines (documentation, anyone?) + */ +/* #define IPORTAL_DEBUG */ +/* #define HEAPDEBUGALL */ +/* #define ISTRATDEBUG */ +/* #define ACLDEBUG */ +/* #define RTDEBUG */ +/* #define GISTDEBUG */ + +/* + * defining unsafe floats will make float4 and float8 ops faster + * by suppressing overflow/underflow checks. + */ +/* #define UNSAFE_FLOATS */ + + +/* + *------------------------------------------------------------------------ + * Part 3: system configuration information that is auto-detected by + * configure. In theory you shouldn't have to touch any of this stuff + * by hand. In the real world, configure might get it wrong... + *------------------------------------------------------------------------ + */ + +/* Define const as empty if your compiler doesn't grok const. */ +#undef const + +/* Define as your compiler's spelling of "inline", or empty if no inline. */ +#undef inline + +/* Define as empty if the C compiler doesn't understand "signed". */ +#undef signed + +/* Define as empty if the C compiler doesn't understand "volatile". */ +#undef volatile + +/* Define if your cpp understands the ANSI stringizing operators in macros */ +#undef HAVE_STRINGIZE + +/* Set to 1 if you have */ +#undef HAVE_CRYPT_H + +/* Set to 1 if you have */ +#undef HAVE_DLD_H + +/* Set to 1 if you have */ +#undef HAVE_ENDIAN_H + +/* Set to 1 if you have */ +#undef HAVE_FP_CLASS_H + +/* Set to 1 if you have */ +#undef HAVE_GETOPT_H + +/* Set to 1 if you have */ +#undef HAVE_HISTORY_H + +/* Set to 1 if you have */ +#undef HAVE_IEEEFP_H + +/* Set to 1 if you have */ +#undef HAVE_NETINET_TCP_H + +/* Set to 1 if you have */ +#undef HAVE_READLINE_H + +/* Set to 1 if you have */ +#undef HAVE_READLINE_HISTORY_H + +/* Set to 1 if you have */ +#undef HAVE_READLINE_READLINE_H + +/* Set to 1 if you have */ +#undef HAVE_SYS_IPC_H + +/* Set to 1 if you have */ +#undef HAVE_SYS_SELECT_H + +/* Set to 1 if you have */ +#undef HAVE_SYS_UN_H + +/* Set to 1 if you have */ +#undef HAVE_SYS_SEM_H + +/* Set to 1 if you have */ +#undef HAVE_SYS_SHM_H + +/* Set to 1 if you have */ +#undef HAVE_KERNEL_OS_H + +/* Set to 1 if you have */ +#undef HAVE_SUPPORTDEFS_H + +/* Set to 1 if you have */ +#undef HAVE_KERNEL_IMAGE_H + +/* Set to 1 if you have */ +#undef HAVE_TERMIOS_H + +/* Set to 1 if you have */ +#undef HAVE_SYS_PSTAT_H + +/* Define if string.h and strings.h may both be included */ +#undef STRING_H_WITH_STRINGS_H + +/* Define if you have the setproctitle function. */ +#undef HAVE_SETPROCTITLE + +/* Define if you have the pstat function. */ +#undef HAVE_PSTAT + +/* Define if the PS_STRINGS thing exists. */ +#undef HAVE_PS_STRINGS + +/* Define if you have the stricmp function. */ +#undef HAVE_STRICMP + +/* Set to 1 if you have history functions (either in libhistory or libreadline) */ +#undef HAVE_HISTORY_FUNCTIONS + +/* Set to 1 if you have */ +#undef HAVE_PWD_H + +/* Set to 1 if you have gettimeofday(a) instead of gettimeofday(a,b) */ +#undef GETTIMEOFDAY_1ARG +#ifdef GETTIMEOFDAY_1ARG +# define gettimeofday(a,b) gettimeofday(a) +#endif + +/* Set to 1 if you have snprintf() in the C library */ +#undef HAVE_SNPRINTF + +/* Set to 1 if your standard system headers declare snprintf() */ +#undef HAVE_SNPRINTF_DECL + +/* Set to 1 if you have vsnprintf() in the C library */ +#undef HAVE_VSNPRINTF + +/* Set to 1 if your standard system headers declare vsnprintf() */ +#undef HAVE_VSNPRINTF_DECL + +/* Set to 1 if you have strerror() */ +#undef HAVE_STRERROR + +/* Set to 1 if you have isinf() */ +#undef HAVE_ISINF +#ifndef HAVE_ISINF +extern int isinf(double x); +#endif + +/* + * These are all related to port/isinf.c + */ +#undef HAVE_FPCLASS +#undef HAVE_FP_CLASS +#undef HAVE_FP_CLASS_H +#undef HAVE_FP_CLASS_D +#undef HAVE_CLASS + +/* Set to 1 if you have gethostname() */ +#undef HAVE_GETHOSTNAME +#ifndef HAVE_GETHOSTNAME +extern int gethostname(char *name, int namelen); +#endif + +/* Set to 1 if struct tm has a tm_zone member */ +#undef HAVE_TM_ZONE + +/* Set to 1 if you have int timezone. + * NOTE: if both tm_zone and a global timezone variable exist, + * using the tm_zone field should probably be preferred, + * since global variables are inherently not thread-safe. + */ +#undef HAVE_INT_TIMEZONE + +/* Set to 1 if you have cbrt() */ +#undef HAVE_CBRT + +/* Set to 1 if you have inet_aton() */ +#undef HAVE_INET_ATON + +#ifndef HAVE_INET_ATON +# include +# include +# include +extern int inet_aton(const char *cp, struct in_addr * addr); +#endif + +/* Set to 1 if you have fcvt() */ +#undef HAVE_FCVT + +/* Set to 1 if you have rint() */ +#undef HAVE_RINT + +/* Set to 1 if you have finite() */ +#undef HAVE_FINITE + +/* Set to 1 if you have memmove() */ +#undef HAVE_MEMMOVE + +/* Set to 1 if you have sigsetjmp() */ +#undef HAVE_SIGSETJMP + +/* + * When there is no sigsetjmp, its functionality is provided by plain + * setjmp. Incidentally, nothing provides setjmp's functionality in + * that case. + */ +#ifndef HAVE_SIGSETJMP +# define sigjmp_buf jmp_buf +# define sigsetjmp(x,y) setjmp(x) +# define siglongjmp longjmp +#endif + +/* Set to 1 if you have sysconf() */ +#undef HAVE_SYSCONF + +/* Set to 1 if you have getrusage() */ +#undef HAVE_GETRUSAGE + +/* Set to 1 if you have waitpid() */ +#undef HAVE_WAITPID + +/* Set to 1 if you have setsid() */ +#undef HAVE_SETSID + +/* Set to 1 if you have sigprocmask() */ +#undef HAVE_SIGPROCMASK + +/* Set to 1 if you have sigprocmask() */ +#undef HAVE_STRCASECMP +#ifndef HAVE_STRCASECMP +extern int strcasecmp(char *s1, char *s2); +#endif + +/* Set to 1 if you have strtol() */ +#undef HAVE_STRTOL + +/* Set to 1 if you have strtoul() */ +#undef HAVE_STRTOUL + +/* Set to 1 if you have strdup() */ +#undef HAVE_STRDUP +#ifndef HAVE_STRDUP +extern char *strdup(char const *); +#endif + +/* Set to 1 if you have random() */ +#undef HAVE_RANDOM +#ifndef HAVE_RANDOM +extern long random(void); +#endif + +/* Set to 1 if you have srandom() */ +#undef HAVE_SRANDOM +#ifndef HAVE_SRANDOM +extern void srandom(unsigned int seed); +#endif + +/* The random() function is expected to yield values 0 .. MAX_RANDOM_VALUE */ +/* Currently, all known implementations yield 0..2^31-1, so we just hardwire + * this constant. We could do a configure test if it proves to be necessary. + * CAUTION: Think not to replace this with RAND_MAX. RAND_MAX defines the + * maximum value of the older rand() function, which is often different from + * --- and considerably inferior to --- random(). + */ +#define MAX_RANDOM_VALUE (0x7FFFFFFF) + +/* Define if you have dlopen() */ +#undef HAVE_DLOPEN + +/* Define if you have fdatasync() */ +#undef HAVE_FDATASYNC + +/* Define if the standard header unistd.h declares fdatasync() */ +#undef HAVE_FDATASYNC_DECL + +#if defined(HAVE_FDATASYNC) && !defined(HAVE_FDATASYNC_DECL) +extern int fdatasync(int fildes); +#endif + +/* Set to 1 if you have libz.a */ +#undef HAVE_LIBZ + +/* Set to 1 if you have libreadline.a */ +#undef HAVE_LIBREADLINE + +/* Set to 1 if you have libhistory.a */ +#undef HAVE_LIBHISTORY + +/* Set to 1 if your libreadline defines rl_completion_append_character */ +#undef HAVE_RL_COMPLETION_APPEND_CHARACTER + +/* Set to 1 if you have rl_completion_matches */ +#undef HAVE_RL_COMPLETION_MATCHES + +/* Set to 1 if you have rl_filename_completion_function */ +#undef HAVE_RL_FILENAME_COMPLETION_FUNCTION + +/* Set to 1 if you have getopt_long() (GNU long options) */ +#undef HAVE_GETOPT_LONG + +/* Set to 1 if you have union semun */ +#undef HAVE_UNION_SEMUN + +/* Set to 1 if you have struct sockaddr_un */ +#undef HAVE_STRUCT_SOCKADDR_UN + +/* Set to 1 if type "long int" works and is 64 bits */ +#undef HAVE_LONG_INT_64 + +/* Set to 1 if type "long long int" works and is 64 bits */ +#undef HAVE_LONG_LONG_INT_64 + +/* Set to 1 if type "long long int" constants should be suffixed by LL */ +#undef HAVE_LL_CONSTANTS + +/* Define this as the appropriate snprintf format for 64-bit ints, if any */ +#undef INT64_FORMAT + +/* + * We need a #define symbol for sizeof(Datum) for use in some #if tests. + */ +#undef SIZEOF_DATUM + +/* + * These must be defined as the alignment requirement (NOT the size) of + * each of the basic C data types (except char, which we assume has align 1). + * MAXIMUM_ALIGNOF is the largest alignment requirement for any C data type. + * ALIGNOF_LONG_LONG_INT need only be defined if HAVE_LONG_LONG_INT_64 is. + */ +#undef ALIGNOF_SHORT +#undef ALIGNOF_INT +#undef ALIGNOF_LONG +#undef ALIGNOF_LONG_LONG_INT +#undef ALIGNOF_DOUBLE +#undef MAXIMUM_ALIGNOF + +/* Define as the type of the 3rd argument to accept() */ +#undef ACCEPT_TYPE_ARG3 + +/* Define if POSIX signal interface is available */ +#undef HAVE_POSIX_SIGNALS + +/* Define if C++ compiler accepts "using namespace std" */ +#undef HAVE_NAMESPACE_STD + +/* Define if C++ compiler accepts "#include " */ +#undef HAVE_CXX_STRING_HEADER + +/* Define if you have the optreset variable */ +#undef HAVE_INT_OPTRESET + +/* Define if you have strtoll() */ +#undef HAVE_STRTOLL + +/* Define if you have strtoq() */ +#undef HAVE_STRTOQ + +/* If strtoq() exists, rename it to the more standard strtoll() */ +#if defined(HAVE_LONG_LONG_INT_64) && !defined(HAVE_STRTOLL) && defined(HAVE_STRTOQ) +# define strtoll strtoq +# define HAVE_STRTOLL 1 +#endif + +/* Define if you have strtoull() */ +#undef HAVE_STRTOULL + +/* Define if you have strtouq() */ +#undef HAVE_STRTOUQ + +/* If strtouq() exists, rename it to the more standard strtoull() */ +#if defined(HAVE_LONG_LONG_INT_64) && !defined(HAVE_STRTOULL) && defined(HAVE_STRTOUQ) +# define strtoull strtouq +# define HAVE_STRTOULL 1 +#endif + +/* Define if you have atexit() */ +#undef HAVE_ATEXIT + +/* Define if you have on_exit() */ +#undef HAVE_ON_EXIT + +/* + *------------------------------------------------------------------------ + * Part 4: pull in system-specific declarations. + * + * This is still configure's responsibility, because it picks where + * the "pg_config_os.h" symlink points... + *------------------------------------------------------------------------ + */ + +/* + * Pull in OS-specific declarations (using link created by configure) + */ + +#include "pg_config_os.h" + +/* + * The following is used as the arg list for signal handlers. Any ports + * that take something other than an int argument should override this in + * the port-specific pg_config_os.h file. Note that variable names are required + * because it is used in both the prototypes as well as the definitions. + * Note also the long name. We expect that this won't collide with + * other names causing compiler warnings. + */ + +#ifndef SIGNAL_ARGS +#define SIGNAL_ARGS int postgres_signal_arg +#endif + + +#endif /* PG_CONFIG_H */ diff --git a/src/include/pg_config.h.win32 b/src/include/pg_config.h.win32 new file mode 100644 index 00000000000..b3977e90c24 --- /dev/null +++ b/src/include/pg_config.h.win32 @@ -0,0 +1,25 @@ +/* + * Parts of pg_config.h that you get with autoconf on other systems + */ +#define PG_VERSION "7.2" +#define PG_VERSION_STR "7.2 (win32)" + +#define SYSCONFDIR "" + +#define DEF_PGPORT 5432 +#define DEF_PGPORT_STR "5432" + +#define MAXIMUM_ALIGNOF 4 +#define ACCEPT_TYPE_ARG3 int + +#define MAXPGPATH 1024 + +#define BLCKSZ 8192 + +#define INDEX_MAX_KEYS 16 + +#define HAVE_ATEXIT +#define HAVE_MEMMOVE + +#define HAVE_CXX_STRING_HEADER +#define HAVE_NAMESPACE_STD diff --git a/src/interfaces/ecpg/lib/connect.c b/src/interfaces/ecpg/lib/connect.c index 2618cc37ed8..e70299dc5f4 100644 --- a/src/interfaces/ecpg/lib/connect.c +++ b/src/interfaces/ecpg/lib/connect.c @@ -1,3 +1,7 @@ +/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/connect.c,v 1.11 2001/08/24 14:07:49 petere Exp $ */ + +#include "postgres_fe.h" + #include "ecpgtype.h" #include "ecpglib.h" #include "ecpgerrno.h" diff --git a/src/interfaces/ecpg/lib/data.c b/src/interfaces/ecpg/lib/data.c index 50640ba1a46..1f6a86f16c9 100644 --- a/src/interfaces/ecpg/lib/data.c +++ b/src/interfaces/ecpg/lib/data.c @@ -1,4 +1,6 @@ -#include "config.h" +/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/data.c,v 1.14 2001/08/24 14:07:49 petere Exp $ */ + +#include "postgres_fe.h" #include #include diff --git a/src/interfaces/ecpg/lib/descriptor.c b/src/interfaces/ecpg/lib/descriptor.c index 07f12c5f2e2..1312b22e474 100644 --- a/src/interfaces/ecpg/lib/descriptor.c +++ b/src/interfaces/ecpg/lib/descriptor.c @@ -1,4 +1,6 @@ -#include "config.h" +/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/descriptor.c,v 1.15 2001/08/24 14:07:49 petere Exp $ */ + +#include "postgres_fe.h" #include "ecpgtype.h" #include "ecpglib.h" diff --git a/src/interfaces/ecpg/lib/error.c b/src/interfaces/ecpg/lib/error.c index 72b005bb9ac..c16fb8395a0 100644 --- a/src/interfaces/ecpg/lib/error.c +++ b/src/interfaces/ecpg/lib/error.c @@ -1,3 +1,7 @@ +/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/error.c,v 1.9 2001/08/24 14:07:49 petere Exp $ */ + +#include "postgres_fe.h" + #include #include "ecpgerrno.h" diff --git a/src/interfaces/ecpg/lib/execute.c b/src/interfaces/ecpg/lib/execute.c index c9b66bb36f0..3238fd59bb9 100644 --- a/src/interfaces/ecpg/lib/execute.c +++ b/src/interfaces/ecpg/lib/execute.c @@ -1,4 +1,5 @@ -/* Copyright comment */ +/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/execute.c,v 1.22 2001/08/24 14:07:49 petere Exp $ */ + /* * The aim is to get a simpler inteface to the database routines. * All the tidieous messing around with tuples is supposed to be hidden @@ -12,7 +13,7 @@ /* Taken over as part of PostgreSQL by Michael Meskes on Feb. 5th, 1998 */ -#include "config.h" +#include "postgres_fe.h" #include #include @@ -1035,7 +1036,7 @@ ECPGdo(int lineno, const char *connection_name, char *query,...) * * Copyright (c) 2000, Christof Petig * - * $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/execute.c,v 1.21 2001/08/19 09:21:44 meskes Exp $ + * $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/execute.c,v 1.22 2001/08/24 14:07:49 petere Exp $ */ PGconn *ECPG_internal_get_connection(char *name); diff --git a/src/interfaces/ecpg/lib/memory.c b/src/interfaces/ecpg/lib/memory.c index e6ef531128d..d7ff8799635 100644 --- a/src/interfaces/ecpg/lib/memory.c +++ b/src/interfaces/ecpg/lib/memory.c @@ -1,3 +1,7 @@ +/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/memory.c,v 1.4 2001/08/24 14:07:49 petere Exp $ */ + +#include "postgres_fe.h" + #include "ecpgtype.h" #include "ecpglib.h" #include "ecpgerrno.h" diff --git a/src/interfaces/ecpg/lib/misc.c b/src/interfaces/ecpg/lib/misc.c index c0b585cf1db..4a93be4b905 100644 --- a/src/interfaces/ecpg/lib/misc.c +++ b/src/interfaces/ecpg/lib/misc.c @@ -1,3 +1,7 @@ +/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/misc.c,v 1.4 2001/08/24 14:07:49 petere Exp $ */ + +#include "postgres_fe.h" + #include #include "ecpgtype.h" #include "ecpglib.h" diff --git a/src/interfaces/ecpg/lib/prepare.c b/src/interfaces/ecpg/lib/prepare.c index 50900048752..f1c164c7f45 100644 --- a/src/interfaces/ecpg/lib/prepare.c +++ b/src/interfaces/ecpg/lib/prepare.c @@ -1,3 +1,7 @@ +/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/prepare.c,v 1.6 2001/08/24 14:07:49 petere Exp $ */ + +#include "postgres_fe.h" + #include #include "ecpgtype.h" diff --git a/src/interfaces/ecpg/lib/typename.c b/src/interfaces/ecpg/lib/typename.c index a27aea47438..d41ca583909 100644 --- a/src/interfaces/ecpg/lib/typename.c +++ b/src/interfaces/ecpg/lib/typename.c @@ -1,4 +1,6 @@ -#include "config.h" +/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/typename.c,v 1.18 2001/08/24 14:07:49 petere Exp $ */ + +#include "postgres_fe.h" #include #include "ecpgtype.h" diff --git a/src/interfaces/libpq++/pgconnection.h b/src/interfaces/libpq++/pgconnection.h index 379f8d023e7..7d8ca2c52bf 100644 --- a/src/interfaces/libpq++/pgconnection.h +++ b/src/interfaces/libpq++/pgconnection.h @@ -13,7 +13,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pgconnection.h,v 1.12 2001/07/11 22:12:43 momjian Exp $ + * $Id: pgconnection.h,v 1.13 2001/08/24 14:07:49 petere Exp $ * *------------------------------------------------------------------------- */ @@ -22,11 +22,11 @@ #define PGCONNECTION_H extern "C" { -#include "config.h" +#include "pg_config.h" } /* We assume that the C++ compiler will have these keywords, even though - * config.h may have #define'd them to empty because C compiler doesn't. + * pg_config.h may have #define'd them to empty because C compiler doesn't. */ #undef const #undef inline diff --git a/src/interfaces/odbc/bind.c b/src/interfaces/odbc/bind.c index 469edb6c2ce..2fc340907a3 100644 --- a/src/interfaces/odbc/bind.c +++ b/src/interfaces/odbc/bind.c @@ -13,11 +13,8 @@ *------- */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "bind.h" + #include "environ.h" #include "statement.h" #include "qresult.h" diff --git a/src/interfaces/odbc/columninfo.c b/src/interfaces/odbc/columninfo.c index 1c635945074..d9a22a163a1 100644 --- a/src/interfaces/odbc/columninfo.c +++ b/src/interfaces/odbc/columninfo.c @@ -13,6 +13,7 @@ */ #include "columninfo.h" + #include "connection.h" #include "socket.h" #include diff --git a/src/interfaces/odbc/connection.c b/src/interfaces/odbc/connection.c index 54e448892bb..3e6c89863ce 100644 --- a/src/interfaces/odbc/connection.c +++ b/src/interfaces/odbc/connection.c @@ -14,12 +14,9 @@ */ /* Multibyte support Eiji Tokuya 2001-03-15 */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include "connection.h" #include "environ.h" -#include "connection.h" #include "socket.h" #include "statement.h" #include "qresult.h" diff --git a/src/interfaces/odbc/connection.h b/src/interfaces/odbc/connection.h index 11379e4f2ff..4da6a7b7a85 100644 --- a/src/interfaces/odbc/connection.h +++ b/src/interfaces/odbc/connection.h @@ -9,15 +9,11 @@ #ifndef __CONNECTION_H__ #define __CONNECTION_H__ +#include "psqlodbc.h" + #include #include -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "psqlodbc.h" - #ifndef WIN32 #include "iodbc.h" #include "isql.h" diff --git a/src/interfaces/odbc/convert.c b/src/interfaces/odbc/convert.c index 12d5ddf1b8a..59dffbdcf9e 100644 --- a/src/interfaces/odbc/convert.c +++ b/src/interfaces/odbc/convert.c @@ -17,16 +17,12 @@ */ /* Multibyte support Eiji Tokuya 2001-03-15 */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include "convert.h" #include #include #include -#include "psqlodbc.h" - #ifdef MULTIBYTE #include "multibyte.h" #endif @@ -44,7 +40,6 @@ #include #include #include -#include "convert.h" #include "statement.h" #include "qresult.h" #include "bind.h" diff --git a/src/interfaces/odbc/convert.h b/src/interfaces/odbc/convert.h index fed2239e3b1..4a142db3d5c 100644 --- a/src/interfaces/odbc/convert.h +++ b/src/interfaces/odbc/convert.h @@ -11,6 +11,8 @@ #include "psqlodbc.h" +#include "isql.h" + /* copy_and_convert results */ #define COPY_OK 0 #define COPY_UNSUPPORTED_TYPE 1 diff --git a/src/interfaces/odbc/dlg_specific.c b/src/interfaces/odbc/dlg_specific.c index c465f3fc280..d28fcf966c4 100644 --- a/src/interfaces/odbc/dlg_specific.c +++ b/src/interfaces/odbc/dlg_specific.c @@ -17,9 +17,7 @@ */ /* Multibyte support Eiji Tokuya 2001-03-15 */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include "psqlodbc.h" #ifndef WIN32 #include diff --git a/src/interfaces/odbc/dlg_specific.h b/src/interfaces/odbc/dlg_specific.h index 884fe2e85ce..67f99449754 100644 --- a/src/interfaces/odbc/dlg_specific.h +++ b/src/interfaces/odbc/dlg_specific.h @@ -9,10 +9,6 @@ #ifndef __DLG_SPECIFIC_H__ #define __DLG_SPECIFIC_H__ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "psqlodbc.h" #include "connection.h" diff --git a/src/interfaces/odbc/drvconn.c b/src/interfaces/odbc/drvconn.c index 6a8c563fafb..e224cbda5e7 100644 --- a/src/interfaces/odbc/drvconn.c +++ b/src/interfaces/odbc/drvconn.c @@ -12,14 +12,11 @@ *------- */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include "psqlodbc.h" #include #include -#include "psqlodbc.h" #include "connection.h" #ifndef WIN32 diff --git a/src/interfaces/odbc/environ.c b/src/interfaces/odbc/environ.c index 2ea5f28ef45..d21c0540cac 100644 --- a/src/interfaces/odbc/environ.c +++ b/src/interfaces/odbc/environ.c @@ -14,6 +14,7 @@ */ #include "environ.h" + #include "connection.h" #include "dlg_specific.h" #include "statement.h" diff --git a/src/interfaces/odbc/environ.h b/src/interfaces/odbc/environ.h index cc7950ae5ee..6d50fa6b48f 100644 --- a/src/interfaces/odbc/environ.h +++ b/src/interfaces/odbc/environ.h @@ -9,10 +9,6 @@ #ifndef __ENVIRON_H__ #define __ENVIRON_H__ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "psqlodbc.h" #ifndef WIN32 diff --git a/src/interfaces/odbc/execute.c b/src/interfaces/odbc/execute.c index 38eabfea6eb..374d700193d 100644 --- a/src/interfaces/odbc/execute.c +++ b/src/interfaces/odbc/execute.c @@ -13,10 +13,6 @@ *------- */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "psqlodbc.h" #include #include diff --git a/src/interfaces/odbc/gpps.c b/src/interfaces/odbc/gpps.c index 248f8e0fcd3..4b13fbe62e5 100644 --- a/src/interfaces/odbc/gpps.c +++ b/src/interfaces/odbc/gpps.c @@ -21,9 +21,7 @@ #ifndef WIN32 -#if HAVE_CONFIG_H -#include "config.h" /* produced by configure */ -#endif +#include "gpps.h" #include #include @@ -36,7 +34,6 @@ #include #include #include "misc.h" -#include "gpps.h" #include "dlg_specific.h" #ifndef TRUE @@ -286,7 +283,7 @@ WritePrivateProfileString(char *theSection, /* section name */ } -#if 0 +#if NOT_USED /* * Ok. What the hell's the default behaviour for a null input buffer, and null * section name. For now if either are null I ignore the request, until @@ -449,7 +446,7 @@ if (!keyFound) return aReturnLength > 0 ? aReturnLength - 1 : 0; } -#endif +#endif /* NOT_USED */ -#endif +#endif /* not WIN32 */ diff --git a/src/interfaces/odbc/gpps.h b/src/interfaces/odbc/gpps.h index 5bbe10374b2..9dc9d64210a 100644 --- a/src/interfaces/odbc/gpps.h +++ b/src/interfaces/odbc/gpps.h @@ -4,9 +4,7 @@ #ifndef GPPS_H #define GPPS_H -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include "psqlodbc.h" #ifndef WIN32 #include diff --git a/src/interfaces/odbc/info.c b/src/interfaces/odbc/info.c index 79854d6cd2e..1bc96ac888c 100644 --- a/src/interfaces/odbc/info.c +++ b/src/interfaces/odbc/info.c @@ -16,13 +16,10 @@ *-------- */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include "psqlodbc.h" #include #include -#include "psqlodbc.h" #ifndef WIN32 #include "iodbc.h" diff --git a/src/interfaces/odbc/misc.c b/src/interfaces/odbc/misc.c index ae75320bb53..1bfb877cbf7 100644 --- a/src/interfaces/odbc/misc.c +++ b/src/interfaces/odbc/misc.c @@ -12,12 +12,12 @@ *------- */ +#include "psqlodbc.h" + #include #include #include -#include "psqlodbc.h" - #ifndef WIN32 #if HAVE_PWD_H #include @@ -120,10 +120,6 @@ qlog(char *fmt,...) /* Undefine these because windows.h will redefine and cause a warning */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #ifdef WIN32 #undef va_start #undef va_end diff --git a/src/interfaces/odbc/misc.h b/src/interfaces/odbc/misc.h index 5172e491f5d..dc2ef0d5bea 100644 --- a/src/interfaces/odbc/misc.h +++ b/src/interfaces/odbc/misc.h @@ -9,9 +9,7 @@ #ifndef __MISC_H__ #define __MISC_H__ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include "psqlodbc.h" #ifndef WIN32 #include "gpps.h" diff --git a/src/interfaces/odbc/multibyte.c b/src/interfaces/odbc/multibyte.c index 4d25c0bb1ad..a9c9c2f83bb 100644 --- a/src/interfaces/odbc/multibyte.c +++ b/src/interfaces/odbc/multibyte.c @@ -7,8 +7,8 @@ *-------- */ -#include #include "multibyte.h" +#include int multibyte_client_encoding; /* Multibyte Client Encoding. */ int multibyte_status; /* Multibyte Odds and ends character. */ diff --git a/src/interfaces/odbc/multibyte.h b/src/interfaces/odbc/multibyte.h index c7d8b20d951..43870458e0d 100644 --- a/src/interfaces/odbc/multibyte.h +++ b/src/interfaces/odbc/multibyte.h @@ -3,6 +3,7 @@ * Multibyte library header ( psqlODBC Only ) * */ +#include "psqlodbc.h" /* PostgreSQL client encoding */ #define SQL_ASCII 0 /* SQL/ASCII */ diff --git a/src/interfaces/odbc/odbcapi.c b/src/interfaces/odbc/odbcapi.c index a69c3d1a944..60205c011b6 100644 --- a/src/interfaces/odbc/odbcapi.c +++ b/src/interfaces/odbc/odbcapi.c @@ -26,10 +26,6 @@ *------- */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "psqlodbc.h" #ifdef WIN32 #undef ODBCVER diff --git a/src/interfaces/odbc/odbcapi30.c b/src/interfaces/odbc/odbcapi30.c index 9902be746df..cee57934df2 100644 --- a/src/interfaces/odbc/odbcapi30.c +++ b/src/interfaces/odbc/odbcapi30.c @@ -18,10 +18,6 @@ *------- */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "psqlodbc.h" #undef ODBCVER #define ODBCVER 0x0300 diff --git a/src/interfaces/odbc/options.c b/src/interfaces/odbc/options.c index 82b651cdc58..77421b63ebd 100644 --- a/src/interfaces/odbc/options.c +++ b/src/interfaces/odbc/options.c @@ -13,10 +13,6 @@ *-------- */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "psqlodbc.h" #include diff --git a/src/interfaces/odbc/parse.c b/src/interfaces/odbc/parse.c index 8916db2072d..eb0589e4c4b 100644 --- a/src/interfaces/odbc/parse.c +++ b/src/interfaces/odbc/parse.c @@ -22,9 +22,7 @@ */ /* Multibyte support Eiji Tokuya 2001-03-15 */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include "psqlodbc.h" #include #include diff --git a/src/interfaces/odbc/pgapifunc.h b/src/interfaces/odbc/pgapifunc.h index fda018f61f9..a4aca5f323d 100644 --- a/src/interfaces/odbc/pgapifunc.h +++ b/src/interfaces/odbc/pgapifunc.h @@ -5,9 +5,6 @@ */ #ifndef _PG_API_FUNC_H__ #define _PG_API_FUNC_H__ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif #include "psqlodbc.h" #include diff --git a/src/interfaces/odbc/pgtypes.c b/src/interfaces/odbc/pgtypes.c index ff640776f8b..fdc38d62a19 100644 --- a/src/interfaces/odbc/pgtypes.c +++ b/src/interfaces/odbc/pgtypes.c @@ -16,13 +16,9 @@ *-------- */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include "pgtypes.h" -#include "psqlodbc.h" #include "dlg_specific.h" -#include "pgtypes.h" #include "statement.h" #include "connection.h" #include "qresult.h" diff --git a/src/interfaces/odbc/psqlodbc.c b/src/interfaces/odbc/psqlodbc.c index 4eabeae5ff3..9851af2ee66 100644 --- a/src/interfaces/odbc/psqlodbc.c +++ b/src/interfaces/odbc/psqlodbc.c @@ -13,10 +13,6 @@ *-------- */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "psqlodbc.h" #include "dlg_specific.h" diff --git a/src/interfaces/odbc/psqlodbc.h b/src/interfaces/odbc/psqlodbc.h index df077106512..542fe7ff596 100644 --- a/src/interfaces/odbc/psqlodbc.h +++ b/src/interfaces/odbc/psqlodbc.h @@ -5,7 +5,7 @@ * * Comments: See "notice.txt" for copyright and license information. * - * $Id: psqlodbc.h,v 1.45 2001/08/18 04:30:47 inoue Exp $ + * $Id: psqlodbc.h,v 1.46 2001/08/24 14:07:50 petere Exp $ * */ @@ -13,7 +13,7 @@ #define __PSQLODBC_H__ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "pg_config.h" #endif #include /* for FILE* pointers: see GLOBAL_VALUES */ diff --git a/src/interfaces/odbc/qresult.h b/src/interfaces/odbc/qresult.h index 7da2a0201ec..29e171bad80 100644 --- a/src/interfaces/odbc/qresult.h +++ b/src/interfaces/odbc/qresult.h @@ -9,11 +9,12 @@ #ifndef __QRESULT_H__ #define __QRESULT_H__ +#include "psqlodbc.h" + #include "connection.h" #include "socket.h" #include "columninfo.h" #include "tuplelist.h" -#include "psqlodbc.h" #include "tuple.h" enum QueryResultCode_ diff --git a/src/interfaces/odbc/results.c b/src/interfaces/odbc/results.c index 098c5581d62..bb1f2975df6 100644 --- a/src/interfaces/odbc/results.c +++ b/src/interfaces/odbc/results.c @@ -15,12 +15,9 @@ *------- */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include "psqlodbc.h" #include -#include "psqlodbc.h" #include "dlg_specific.h" #include "environ.h" #include "connection.h" diff --git a/src/interfaces/odbc/socket.c b/src/interfaces/odbc/socket.c index 243df4a5014..ed3fd2913c6 100644 --- a/src/interfaces/odbc/socket.c +++ b/src/interfaces/odbc/socket.c @@ -12,10 +12,6 @@ *------- */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "socket.h" #ifndef WIN32 diff --git a/src/interfaces/odbc/socket.h b/src/interfaces/odbc/socket.h index b4a55e57db6..b24be9504d4 100644 --- a/src/interfaces/odbc/socket.h +++ b/src/interfaces/odbc/socket.h @@ -9,9 +9,7 @@ #ifndef __SOCKET_H__ #define __SOCKET_H__ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include "psqlodbc.h" #ifndef WIN32 #include diff --git a/src/interfaces/odbc/statement.c b/src/interfaces/odbc/statement.c index 3ab683d4a04..891f47df831 100644 --- a/src/interfaces/odbc/statement.c +++ b/src/interfaces/odbc/statement.c @@ -12,10 +12,6 @@ *------- */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "statement.h" #include "bind.h" #include "connection.h" diff --git a/src/interfaces/odbc/statement.h b/src/interfaces/odbc/statement.h index 6250a934a5a..571d13edaca 100644 --- a/src/interfaces/odbc/statement.h +++ b/src/interfaces/odbc/statement.h @@ -9,10 +9,6 @@ #ifndef __STATEMENT_H__ #define __STATEMENT_H__ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "psqlodbc.h" #include "bind.h" diff --git a/src/interfaces/odbc/tuplelist.c b/src/interfaces/odbc/tuplelist.c index 06fd2d44ff8..284ee8ed440 100644 --- a/src/interfaces/odbc/tuplelist.c +++ b/src/interfaces/odbc/tuplelist.c @@ -13,8 +13,8 @@ *-------- */ -#include #include "tuplelist.h" +#include #include "tuple.h" diff --git a/src/interfaces/python/GNUmakefile b/src/interfaces/python/GNUmakefile index e405cf3a9f4..2be8fe1d186 100644 --- a/src/interfaces/python/GNUmakefile +++ b/src/interfaces/python/GNUmakefile @@ -1,4 +1,4 @@ -# $Header: /cvsroot/pgsql/src/interfaces/python/Attic/GNUmakefile,v 1.10 2001/07/10 16:33:02 petere Exp $ +# $Header: /cvsroot/pgsql/src/interfaces/python/Attic/GNUmakefile,v 1.11 2001/08/24 14:07:50 petere Exp $ subdir = src/interfaces/python top_builddir = ../../.. @@ -17,7 +17,6 @@ endif include $(top_srcdir)/src/Makefile.shlib -# (Python also has a config.h file. Be sure to use ours.) override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS) $(python_includespec) all: all-lib diff --git a/src/tools/pginclude/pgrminclude b/src/tools/pginclude/pgrminclude index 60839c15dca..6504aad82a0 100755 --- a/src/tools/pginclude/pgrminclude +++ b/src/tools/pginclude/pgrminclude @@ -4,7 +4,7 @@ trap "rm -f /tmp/$$.c /tmp/$$.o /tmp/$$ /tmp/$$a /tmp/$$b" 0 1 2 3 15 find . \( -name CVS -a -prune \) -o -type f -print | grep -v '\./postgres.h' | -grep -v '\./config.h' | +grep -v '\./pg_config.h' | grep -v '\./c.h' | while read FILE do -- cgit v1.2.3