diff options
| author | Peter Eisentraut | 2000-10-20 21:04:27 +0000 |
|---|---|---|
| committer | Peter Eisentraut | 2000-10-20 21:04:27 +0000 |
| commit | fcc245f58c3bcb792123b0b56255b81cbca815b6 (patch) | |
| tree | 64eca871492345333e716d1176ebab953b720e25 | |
| parent | b481b9f2a532cc6f1b7e2a30c8e70f62e875ee54 (diff) | |
Add support for VPATH builds, that is, building somewhere else than in the
source directory. This involves mostly makefiles using $(srcdir) when they
might have used ".". (Regression tests don't work with this, yet.)
Sort out usage of CPPFLAGS, CFLAGS (and CXXFLAGS). Add "override" keyword
in most places, to preserve necessary flags even when the user overrode the
flags.
57 files changed, 615 insertions, 559 deletions
diff --git a/config/prep_buildtree b/config/prep_buildtree new file mode 100644 index 0000000000..4e35b51813 --- /dev/null +++ b/config/prep_buildtree @@ -0,0 +1,33 @@ +#! /bin/sh + +# This script prepares a PostgreSQL build tree. It is intended +# to be run by the configure script. + +set -e +me=`basename $0` + +help="\ +Usage: $me sourcetree [buildtree]" + +if test -z "$1"; then + echo "$help" 1>&2 + exit 1 +elif test x"$1" = x"--help"; then + echo "$help" + exit 0 +fi +sourcetree=$1 + +buildtree=${2:-'.'} + +for item in `find "$sourcetree" -type d -\( -name CVS -prune -o -print -\)`; do + subdir=`expr "$item" : "$sourcetree\(.*\)"` || true + mkdir -p "$buildtree/$subdir" +done + +for item in `find "$sourcetree" -name Makefile -o -name GNUmakefile`; do + subdir=`expr "$item" : "$sourcetree\(.*\)"` || true + if test ! -e "${item}.in"; then + ln -fs "$item" "$buildtree/$subdir" + fi +done @@ -606,6 +606,11 @@ cat >> confdefs.h <<EOF EOF +abs_top_srcdir=`cd $srcdir && pwd` + +abs_top_builddir=`pwd` + + # Make sure we can run config.sub. if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then : @@ -613,7 +618,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:617: checking host system type" >&5 +echo "configure:622: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -639,7 +644,7 @@ echo "$ac_t""$host" 1>&6 template= echo $ac_n "checking which template to use""... $ac_c" 1>&6 -echo "configure:643: checking which template to use" >&5 +echo "configure:648: checking which template to use" >&5 # Check whether --with-template was given if test x"${with_template+set}" = xset; then @@ -802,7 +807,7 @@ fi # Locale (--enable-locale) # echo $ac_n "checking whether to build with locale support""... $ac_c" 1>&6 -echo "configure:806: checking whether to build with locale support" >&5 +echo "configure:811: 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 @@ -831,7 +836,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:835: checking whether to build with recode support" >&5 +echo "configure:840: 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 @@ -861,7 +866,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:865: checking whether to build with multibyte character support" >&5 +echo "configure:870: checking whether to build with multibyte character support" >&5 # Check whether --enable-multibyte was given if test x"${enable_multibyte+set}" = xset; then @@ -914,7 +919,7 @@ fi # Default port number (--with-pgport), default 5432 # echo $ac_n "checking for default port number""... $ac_c" 1>&6 -echo "configure:918: checking for default port number" >&5 +echo "configure:923: checking for default port number" >&5 # Check whether --with-pgport was given if test x"${with_pgport+set}" = xset; then case $with_pgport in @@ -948,7 +953,7 @@ echo "$ac_t""$default_port" 1>&6 # Maximum number of allowed connections (--with-maxbackends), default 32 # echo $ac_n "checking for default soft limit on number of connections""... $ac_c" 1>&6 -echo "configure:952: checking for default soft limit on number of connections" >&5 +echo "configure:957: 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 @@ -998,7 +1003,7 @@ if test "$template" = aix && test -z "$CC" ; then CC=xlc; fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1002: checking for $ac_word" >&5 +echo "configure:1007: 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 @@ -1028,7 +1033,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:1032: checking for $ac_word" >&5 +echo "configure:1037: 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 @@ -1079,7 +1084,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:1083: checking for $ac_word" >&5 +echo "configure:1088: 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 @@ -1111,7 +1116,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1115: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1120: 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. @@ -1122,12 +1127,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1126 "configure" +#line 1131 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1136: \"$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 @@ -1153,12 +1158,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:1157: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1162: 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:1162: checking whether we are using GNU C" >&5 +echo "configure:1167: 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 @@ -1167,7 +1172,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1171: \"$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:1176: \"$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 @@ -1186,7 +1191,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:1190: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1195: 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 @@ -1222,7 +1227,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:1226: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1231: 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. @@ -1233,12 +1238,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1237 "configure" +#line 1242 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1247: \"$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 @@ -1264,17 +1269,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:1268: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1273: 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:1273: checking for Cygwin environment" >&5 +echo "configure:1278: 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 <<EOF -#line 1278 "configure" +#line 1283 "configure" #include "confdefs.h" int main() { @@ -1285,7 +1290,7 @@ int main() { return __CYGWIN__; ; return 0; } EOF -if { (eval echo configure:1289: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1294: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -1302,19 +1307,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:1306: checking for mingw32 environment" >&5 +echo "configure:1311: 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 <<EOF -#line 1311 "configure" +#line 1316 "configure" #include "confdefs.h" int main() { return __MINGW32__; ; return 0; } EOF -if { (eval echo configure:1318: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1323: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -1333,7 +1338,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=yes echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1337: checking for executable suffix" >&5 +echo "configure:1342: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1343,7 +1348,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1352: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -1364,7 +1369,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:1368: checking how to run the C preprocessor" >&5 +echo "configure:1373: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1379,13 +1384,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 1383 "configure" +#line 1388 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1389: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1394: \"$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 : @@ -1396,13 +1401,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 1400 "configure" +#line 1405 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1406: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1411: \"$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 : @@ -1413,13 +1418,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext <<EOF -#line 1417 "configure" +#line 1422 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1423: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1428: \"$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 : @@ -1445,13 +1450,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:1449: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:1454: 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 <<EOF -#line 1455 "configure" +#line 1460 "configure" #include "confdefs.h" #include <sgtty.h> Autoconf TIOCGETP @@ -1469,7 +1474,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext <<EOF -#line 1473 "configure" +#line 1478 "configure" #include "confdefs.h" #include <termio.h> Autoconf TCGETA @@ -1619,7 +1624,7 @@ IFS=$ac_save_IFS # Tcl/Tk # echo $ac_n "checking whether to build with Tcl""... $ac_c" 1>&6 -echo "configure:1623: checking whether to build with Tcl" >&5 +echo "configure:1628: 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 @@ -1643,7 +1648,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:1647: checking whether to build with Tk" >&5 +echo "configure:1652: 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 @@ -1705,7 +1710,7 @@ fi # Optionally build Perl modules (Pg.pm and PL/Perl) # echo $ac_n "checking whether to build Perl modules""... $ac_c" 1>&6 -echo "configure:1709: checking whether to build Perl modules" >&5 +echo "configure:1714: 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 @@ -1732,7 +1737,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:1736: checking whether to build Python modules" >&5 +echo "configure:1741: 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 @@ -1741,7 +1746,7 @@ if test x"${with_python+set}" = xset; then # Extract the first word of "python", so it can be a program name with args. set dummy python; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1745: checking for $ac_word" >&5 +echo "configure:1750: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_PYTHON'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1777,7 +1782,7 @@ if test "${PYTHON+set}" = set ; then python_extmakefile="${python_configdir}/Makefile.pre.in" echo $ac_n "checking for Python extension makefile""... $ac_c" 1>&6 -echo "configure:1781: checking for Python extension makefile" >&5 +echo "configure:1786: checking for Python extension makefile" >&5 if test -f "${python_extmakefile}" ; then echo "$ac_t""found" 1>&6 else @@ -2009,7 +2014,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:2013: checking whether to build the ODBC driver" >&5 +echo "configure:2018: 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 @@ -2062,7 +2067,7 @@ case $host_os in esac cat > conftest.$ac_ext <<EOF -#line 2066 "configure" +#line 2071 "configure" #include "confdefs.h" #if __ELF__ yes @@ -2091,7 +2096,7 @@ rm -f conftest* # Optionally build C++ code (i.e., libpq++) # echo $ac_n "checking whether to build C++ modules""... $ac_c" 1>&6 -echo "configure:2095: checking whether to build C++ modules" >&5 +echo "configure:2100: 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 @@ -2119,7 +2124,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:2123: checking for $ac_word" >&5 +echo "configure:2128: 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 @@ -2151,7 +2156,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:2155: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:2160: 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. @@ -2162,12 +2167,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 2166 "configure" +#line 2171 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:2171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2176: \"$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 @@ -2193,12 +2198,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:2197: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:2202: 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:2202: checking whether we are using GNU C++" >&5 +echo "configure:2207: 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 @@ -2207,7 +2212,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2211: \"$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:2216: \"$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 @@ -2226,7 +2231,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:2230: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:2235: 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 @@ -2258,7 +2263,7 @@ else fi echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:2262: checking how to run the C++ preprocessor" >&5 +echo "configure:2267: 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 @@ -2271,12 +2276,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 -#line 2275 "configure" +#line 2280 "configure" #include "confdefs.h" #include <stdlib.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2280: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2285: \"$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 : @@ -2301,6 +2306,7 @@ CXXCPP="$ac_cv_prog_CXXCPP" echo "$ac_t""$CXXCPP" 1>&6 + ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' @@ -2310,17 +2316,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:2314: checking for string" >&5 +echo "configure:2320: 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 -#line 2319 "configure" +#line 2325 "configure" #include "confdefs.h" #include <string> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2324: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2330: \"$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* @@ -2347,12 +2353,12 @@ fi if test x"$ac_cv_header_string" != xyes ; then echo $ac_n "checking for class string in <string.h>""... $ac_c" 1>&6 -echo "configure:2351: checking for class string in <string.h>" >&5 +echo "configure:2357: checking for class string in <string.h>" >&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 <<EOF -#line 2356 "configure" +#line 2362 "configure" #include "confdefs.h" #include <stdio.h> #include <stdlib.h> @@ -2362,7 +2368,7 @@ int main() { string foo = "test" ; return 0; } EOF -if { (eval echo configure:2366: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2372: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* pgac_cv_class_string_in_string_h=yes else @@ -2389,7 +2395,7 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking for namespace std in C++""... $ac_c" 1>&6 -echo "configure:2393: checking for namespace std in C++" >&5 +echo "configure:2399: 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 @@ -2403,7 +2409,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 2407 "configure" +#line 2413 "configure" #include "confdefs.h" #include <stdio.h> #include <stdlib.h> @@ -2416,7 +2422,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2420: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2426: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* pgac_cv_cxx_namespace_std=yes else @@ -2450,7 +2456,6 @@ fi - CPPFLAGS="$CPPFLAGS $INCLUDES" LDFLAGS="$LDFLAGS $PGSQL_LDFLAGS" @@ -2472,7 +2477,7 @@ echo "using LDFLAGS=$LDFLAGS" # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:2476: checking for a BSD compatible install" >&5 +echo "configure:2481: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2545,12 +2550,12 @@ INSTALL_SHLIB="\${INSTALL} $INSTL_SHLIB_OPTS" -for ac_prog in mawk gawk nawk awk +for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2554: checking for $ac_word" >&5 +echo "configure:2559: 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 @@ -2580,7 +2585,7 @@ test -n "$AWK" && break done echo $ac_n "checking for flex""... $ac_c" 1>&6 -echo "configure:2584: checking for flex" >&5 +echo "configure:2589: checking for flex" >&5 if eval "test \"`echo '$''{'pgac_cv_path_flex'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2648,7 +2653,7 @@ fi echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:2652: checking whether ln -s works" >&5 +echo "configure:2657: 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 @@ -2671,7 +2676,7 @@ fi # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2675: checking for $ac_word" >&5 +echo "configure:2680: 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 @@ -2703,7 +2708,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:2707: checking for $ac_word" >&5 +echo "configure:2712: 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 @@ -2735,7 +2740,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:2739: checking for $ac_word" >&5 +echo "configure:2744: 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 @@ -2772,7 +2777,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:2776: checking for $ac_word" >&5 +echo "configure:2781: 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 @@ -2806,7 +2811,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:2810: checking for $ac_word" >&5 +echo "configure:2815: 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 @@ -2841,7 +2846,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:2845: checking for $ac_word" >&5 +echo "configure:2850: 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 @@ -2882,7 +2887,7 @@ fi ## echo $ac_n "checking for main in -lsfio""... $ac_c" 1>&6 -echo "configure:2886: checking for main in -lsfio" >&5 +echo "configure:2891: checking for main in -lsfio" >&5 ac_lib_var=`echo sfio'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2890,14 +2895,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lsfio $LIBS" cat > conftest.$ac_ext <<EOF -#line 2894 "configure" +#line 2899 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:2901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2906: \"$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 @@ -2925,7 +2930,7 @@ else fi echo $ac_n "checking for main in -lncurses""... $ac_c" 1>&6 -echo "configure:2929: checking for main in -lncurses" >&5 +echo "configure:2934: checking for main in -lncurses" >&5 ac_lib_var=`echo ncurses'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2933,14 +2938,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lncurses $LIBS" cat > conftest.$ac_ext <<EOF -#line 2937 "configure" +#line 2942 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:2944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2949: \"$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 @@ -2966,7 +2971,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for main in -lcurses""... $ac_c" 1>&6 -echo "configure:2970: checking for main in -lcurses" >&5 +echo "configure:2975: checking for main in -lcurses" >&5 ac_lib_var=`echo curses'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2974,14 +2979,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lcurses $LIBS" cat > conftest.$ac_ext <<EOF -#line 2978 "configure" +#line 2983 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:2985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2990: \"$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 @@ -3011,7 +3016,7 @@ fi fi echo $ac_n "checking for main in -ltermcap""... $ac_c" 1>&6 -echo "configure:3015: checking for main in -ltermcap" >&5 +echo "configure:3020: checking for main in -ltermcap" >&5 ac_lib_var=`echo termcap'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3019,14 +3024,14 @@ else ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS" cat > conftest.$ac_ext <<EOF -#line 3023 "configure" +#line 3028 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3035: \"$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 @@ -3054,7 +3059,7 @@ else fi echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6 -echo "configure:3058: checking for readline in -lreadline" >&5 +echo "configure:3063: checking for readline in -lreadline" >&5 ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3062,7 +3067,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lreadline $LIBS" cat > conftest.$ac_ext <<EOF -#line 3066 "configure" +#line 3071 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3073,7 +3078,7 @@ int main() { readline() ; return 0; } EOF -if { (eval echo configure:3077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3082: \"$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 @@ -3102,14 +3107,14 @@ fi echo $ac_n "checking for library containing using_history""... $ac_c" 1>&6 -echo "configure:3106: checking for library containing using_history" >&5 +echo "configure:3111: 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 <<EOF -#line 3113 "configure" +#line 3118 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3120,7 +3125,7 @@ int main() { using_history() ; return 0; } EOF -if { (eval echo configure:3124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3129: \"$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 @@ -3131,7 +3136,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 <<EOF -#line 3135 "configure" +#line 3140 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3142,7 +3147,7 @@ int main() { using_history() ; return 0; } EOF -if { (eval echo configure:3146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3151: \"$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 @@ -3169,7 +3174,7 @@ fi if test "$PORTNAME" != "aix" -a "$PORTNAME" != "alpha" then echo $ac_n "checking for main in -lbsd""... $ac_c" 1>&6 -echo "configure:3173: checking for main in -lbsd" >&5 +echo "configure:3178: 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 @@ -3177,14 +3182,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lbsd $LIBS" cat > conftest.$ac_ext <<EOF -#line 3181 "configure" +#line 3186 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3193: \"$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 @@ -3213,7 +3218,7 @@ fi fi echo $ac_n "checking for setproctitle in -lutil""... $ac_c" 1>&6 -echo "configure:3217: checking for setproctitle in -lutil" >&5 +echo "configure:3222: 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 @@ -3221,7 +3226,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lutil $LIBS" cat > conftest.$ac_ext <<EOF -#line 3225 "configure" +#line 3230 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3232,7 +3237,7 @@ int main() { setproctitle() ; return 0; } EOF -if { (eval echo configure:3236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3241: \"$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 @@ -3260,7 +3265,7 @@ else fi echo $ac_n "checking for main in -lm""... $ac_c" 1>&6 -echo "configure:3264: checking for main in -lm" >&5 +echo "configure:3269: 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 @@ -3268,14 +3273,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <<EOF -#line 3272 "configure" +#line 3277 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3284: \"$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 @@ -3303,7 +3308,7 @@ else fi echo $ac_n "checking for main in -ldl""... $ac_c" 1>&6 -echo "configure:3307: checking for main in -ldl" >&5 +echo "configure:3312: 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 @@ -3311,14 +3316,14 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <<EOF -#line 3315 "configure" +#line 3320 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3327: \"$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 @@ -3346,7 +3351,7 @@ else fi echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6 -echo "configure:3350: checking for main in -lsocket" >&5 +echo "configure:3355: 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 @@ -3354,14 +3359,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <<EOF -#line 3358 "configure" +#line 3363 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3370: \"$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 @@ -3389,7 +3394,7 @@ else fi echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6 -echo "configure:3393: checking for main in -lnsl" >&5 +echo "configure:3398: 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 @@ -3397,14 +3402,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <<EOF -#line 3401 "configure" +#line 3406 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3413: \"$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 @@ -3432,7 +3437,7 @@ else fi echo $ac_n "checking for main in -lipc""... $ac_c" 1>&6 -echo "configure:3436: checking for main in -lipc" >&5 +echo "configure:3441: 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 @@ -3440,14 +3445,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <<EOF -#line 3444 "configure" +#line 3449 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3456: \"$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 @@ -3475,7 +3480,7 @@ else fi echo $ac_n "checking for main in -lIPC""... $ac_c" 1>&6 -echo "configure:3479: checking for main in -lIPC" >&5 +echo "configure:3484: 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 @@ -3483,14 +3488,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lIPC $LIBS" cat > conftest.$ac_ext <<EOF -#line 3487 "configure" +#line 3492 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3499: \"$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 @@ -3518,7 +3523,7 @@ else fi echo $ac_n "checking for main in -llc""... $ac_c" 1>&6 -echo "configure:3522: checking for main in -llc" >&5 +echo "configure:3527: 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 @@ -3526,14 +3531,14 @@ else ac_save_LIBS="$LIBS" LIBS="-llc $LIBS" cat > conftest.$ac_ext <<EOF -#line 3530 "configure" +#line 3535 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3542: \"$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 @@ -3561,7 +3566,7 @@ else fi echo $ac_n "checking for main in -ldld""... $ac_c" 1>&6 -echo "configure:3565: checking for main in -ldld" >&5 +echo "configure:3570: 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 @@ -3569,14 +3574,14 @@ else ac_save_LIBS="$LIBS" LIBS="-ldld $LIBS" cat > conftest.$ac_ext <<EOF -#line 3573 "configure" +#line 3578 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3585: \"$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 @@ -3604,7 +3609,7 @@ else fi echo $ac_n "checking for main in -lln""... $ac_c" 1>&6 -echo "configure:3608: checking for main in -lln" >&5 +echo "configure:3613: checking for main in -lln" >&5 ac_lib_var=`echo ln'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3612,14 +3617,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lln $LIBS" cat > conftest.$ac_ext <<EOF -#line 3616 "configure" +#line 3621 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3628: \"$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 @@ -3647,7 +3652,7 @@ else fi echo $ac_n "checking for main in -lld""... $ac_c" 1>&6 -echo "configure:3651: checking for main in -lld" >&5 +echo "configure:3656: 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 @@ -3655,14 +3660,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lld $LIBS" cat > conftest.$ac_ext <<EOF -#line 3659 "configure" +#line 3664 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3671: \"$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 @@ -3690,7 +3695,7 @@ else fi echo $ac_n "checking for main in -lcompat""... $ac_c" 1>&6 -echo "configure:3694: checking for main in -lcompat" >&5 +echo "configure:3699: 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 @@ -3698,14 +3703,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lcompat $LIBS" cat > conftest.$ac_ext <<EOF -#line 3702 "configure" +#line 3707 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3714: \"$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 @@ -3733,7 +3738,7 @@ else fi echo $ac_n "checking for main in -lBSD""... $ac_c" 1>&6 -echo "configure:3737: checking for main in -lBSD" >&5 +echo "configure:3742: 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 @@ -3741,14 +3746,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lBSD $LIBS" cat > conftest.$ac_ext <<EOF -#line 3745 "configure" +#line 3750 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3757: \"$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 @@ -3776,7 +3781,7 @@ else fi echo $ac_n "checking for main in -lgen""... $ac_c" 1>&6 -echo "configure:3780: checking for main in -lgen" >&5 +echo "configure:3785: 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 @@ -3784,14 +3789,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lgen $LIBS" cat > conftest.$ac_ext <<EOF -#line 3788 "configure" +#line 3793 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3800: \"$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 @@ -3819,7 +3824,7 @@ else fi echo $ac_n "checking for main in -lPW""... $ac_c" 1>&6 -echo "configure:3823: checking for main in -lPW" >&5 +echo "configure:3828: 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 @@ -3827,14 +3832,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lPW $LIBS" cat > conftest.$ac_ext <<EOF -#line 3831 "configure" +#line 3836 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3843: \"$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 @@ -3863,14 +3868,14 @@ fi echo $ac_n "checking for library containing crypt""... $ac_c" 1>&6 -echo "configure:3867: checking for library containing crypt" >&5 +echo "configure:3872: 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 <<EOF -#line 3874 "configure" +#line 3879 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3881,7 +3886,7 @@ int main() { crypt() ; return 0; } EOF -if { (eval echo configure:3885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3890: \"$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 @@ -3892,7 +3897,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 <<EOF -#line 3896 "configure" +#line 3901 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3903,7 +3908,7 @@ int main() { crypt() ; return 0; } EOF -if { (eval echo configure:3907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3912: \"$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 @@ -3924,7 +3929,7 @@ else : fi echo $ac_n "checking for inflate in -lz""... $ac_c" 1>&6 -echo "configure:3928: checking for inflate in -lz" >&5 +echo "configure:3933: 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 @@ -3932,7 +3937,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <<EOF -#line 3936 "configure" +#line 3941 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3943,7 +3948,7 @@ int main() { inflate() ; return 0; } EOF -if { (eval echo configure:3947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3952: \"$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 @@ -3972,14 +3977,14 @@ fi echo $ac_n "checking for library containing __inet_ntoa""... $ac_c" 1>&6 -echo "configure:3976: checking for library containing __inet_ntoa" >&5 +echo "configure:3981: checking for library containing __inet_ntoa" >&5 if eval "test \"`echo '$''{'ac_cv_search___inet_ntoa'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_func_search_save_LIBS="$LIBS" ac_cv_search___inet_ntoa="no" cat > conftest.$ac_ext <<EOF -#line 3983 "configure" +#line 3988 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3990,7 +3995,7 @@ int main() { __inet_ntoa() ; return 0; } EOF -if { (eval echo configure:3994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3999: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search___inet_ntoa="none required" else @@ -4001,7 +4006,7 @@ rm -f conftest* test "$ac_cv_search___inet_ntoa" = "no" && for i in bind; do LIBS="-l$i $ac_func_search_save_LIBS" cat > conftest.$ac_ext <<EOF -#line 4005 "configure" +#line 4010 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4012,7 +4017,7 @@ int main() { __inet_ntoa() ; return 0; } EOF -if { (eval echo configure:4016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search___inet_ntoa="-l$i" break @@ -4036,7 +4041,7 @@ fi if test "$with_krb4" = yes ; then echo $ac_n "checking for des_encrypt in -ldes""... $ac_c" 1>&6 -echo "configure:4040: checking for des_encrypt in -ldes" >&5 +echo "configure:4045: 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 @@ -4044,7 +4049,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldes $LIBS" cat > conftest.$ac_ext <<EOF -#line 4048 "configure" +#line 4053 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4055,7 +4060,7 @@ int main() { des_encrypt() ; return 0; } EOF -if { (eval echo configure:4059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4064: \"$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 @@ -4084,7 +4089,7 @@ else fi echo $ac_n "checking for krb_sendauth in -lkrb""... $ac_c" 1>&6 -echo "configure:4088: checking for krb_sendauth in -lkrb" >&5 +echo "configure:4093: 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 @@ -4092,7 +4097,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lkrb $LIBS" cat > conftest.$ac_ext <<EOF -#line 4096 "configure" +#line 4101 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4103,7 +4108,7 @@ int main() { krb_sendauth() ; return 0; } EOF -if { (eval echo configure:4107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4112: \"$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 @@ -4135,7 +4140,7 @@ fi if test "$with_krb5" = yes ; then echo $ac_n "checking for main in -lcom_err""... $ac_c" 1>&6 -echo "configure:4139: checking for main in -lcom_err" >&5 +echo "configure:4144: checking for main in -lcom_err" >&5 ac_lib_var=`echo com_err'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4143,14 +4148,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lcom_err $LIBS" cat > conftest.$ac_ext <<EOF -#line 4147 "configure" +#line 4152 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:4154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4159: \"$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 @@ -4179,7 +4184,7 @@ else fi echo $ac_n "checking for main in -lcrypto""... $ac_c" 1>&6 -echo "configure:4183: checking for main in -lcrypto" >&5 +echo "configure:4188: checking for main in -lcrypto" >&5 ac_lib_var=`echo crypto'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4187,14 +4192,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lcrypto $LIBS" cat > conftest.$ac_ext <<EOF -#line 4191 "configure" +#line 4196 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:4198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4203: \"$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 @@ -4223,7 +4228,7 @@ else fi echo $ac_n "checking for main in -lkrb5""... $ac_c" 1>&6 -echo "configure:4227: checking for main in -lkrb5" >&5 +echo "configure:4232: checking for main in -lkrb5" >&5 ac_lib_var=`echo krb5'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4231,14 +4236,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lkrb5 $LIBS" cat > conftest.$ac_ext <<EOF -#line 4235 "configure" +#line 4240 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:4242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4247: \"$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 +4275,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:4274: checking for CRYPTO_new_ex_data in -lcrypto" >&5 +echo "configure:4279: 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 @@ -4278,7 +4283,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcrypto $LIBS" cat > conftest.$ac_ext <<EOF -#line 4282 "configure" +#line 4287 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4289,7 +4294,7 @@ int main() { CRYPTO_new_ex_data() ; return 0; } EOF -if { (eval echo configure:4293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4298: \"$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 +4323,7 @@ else fi echo $ac_n "checking for SSL_library_init in -lssl""... $ac_c" 1>&6 -echo "configure:4322: checking for SSL_library_init in -lssl" >&5 +echo "configure:4327: 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 @@ -4326,7 +4331,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lssl $LIBS" cat > conftest.$ac_ext <<EOF -#line 4330 "configure" +#line 4335 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4337,7 +4342,7 @@ int main() { SSL_library_init() ; return 0; } EOF -if { (eval echo configure:4341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4346: \"$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 @@ -4375,17 +4380,17 @@ for ac_hdr in crypt.h dld.h endian.h fp_class.h getopt.h ieeefp.h xti.h netinet/ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4379: checking for $ac_hdr" >&5 +echo "configure:4384: 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 -#line 4384 "configure" +#line 4389 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4389: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4394: \"$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* @@ -4416,17 +4421,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:4420: checking for $ac_hdr" >&5 +echo "configure:4425: 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 -#line 4425 "configure" +#line 4430 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4430: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4435: \"$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* @@ -4456,17 +4461,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:4460: checking for $ac_hdr" >&5 +echo "configure:4465: 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 -#line 4465 "configure" +#line 4470 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4470: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4475: \"$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* @@ -4496,17 +4501,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:4500: checking for krb.h" >&5 +echo "configure:4505: 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 -#line 4505 "configure" +#line 4510 "configure" #include "confdefs.h" #include <krb.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4510: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4515: \"$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* @@ -4533,17 +4538,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:4537: checking for krb5.h" >&5 +echo "configure:4542: 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 -#line 4542 "configure" +#line 4547 "configure" #include "confdefs.h" #include <krb5.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4547: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4552: \"$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* @@ -4567,17 +4572,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:4571: checking for com_err.h" >&5 +echo "configure:4576: 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 -#line 4576 "configure" +#line 4581 "configure" #include "confdefs.h" #include <com_err.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4581: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4586: \"$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* @@ -4604,17 +4609,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:4608: checking for openssl/ssl.h" >&5 +echo "configure:4613: 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 -#line 4613 "configure" +#line 4618 "configure" #include "confdefs.h" #include <openssl/ssl.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4618: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4623: \"$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* @@ -4638,17 +4643,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:4642: checking for openssl/err.h" >&5 +echo "configure:4647: 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 -#line 4647 "configure" +#line 4652 "configure" #include "confdefs.h" #include <openssl/err.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4652: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4657: \"$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* @@ -4677,12 +4682,12 @@ fi ## Types, structures, compiler characteristics ## echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:4681: checking for working const" >&5 +echo "configure:4686: 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 <<EOF -#line 4686 "configure" +#line 4691 "configure" #include "confdefs.h" int main() { @@ -4731,7 +4736,7 @@ ccp = (char const *const *) p; ; return 0; } EOF -if { (eval echo configure:4735: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4740: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -4752,21 +4757,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:4756: checking for inline" >&5 +echo "configure:4761: 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 <<EOF -#line 4763 "configure" +#line 4768 "configure" #include "confdefs.h" int main() { } $ac_kw foo() { ; return 0; } EOF -if { (eval echo configure:4770: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4775: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -4794,12 +4799,12 @@ esac echo $ac_n "checking for preprocessor stringizing operator""... $ac_c" 1>&6 -echo "configure:4798: checking for preprocessor stringizing operator" >&5 +echo "configure:4803: 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 <<EOF -#line 4803 "configure" +#line 4808 "configure" #include "confdefs.h" #define x(y) #y @@ -4829,19 +4834,19 @@ fi echo "$ac_t""${ac_cv_c_stringize}" 1>&6 echo $ac_n "checking for signed types""... $ac_c" 1>&6 -echo "configure:4833: checking for signed types" >&5 +echo "configure:4838: 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 <<EOF -#line 4838 "configure" +#line 4843 "configure" #include "confdefs.h" int main() { signed char c; signed short s; signed int i; ; return 0; } EOF -if { (eval echo configure:4845: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4850: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* pgac_cv_c_signed=yes else @@ -4861,19 +4866,19 @@ EOF fi echo $ac_n "checking for volatile""... $ac_c" 1>&6 -echo "configure:4865: checking for volatile" >&5 +echo "configure:4870: 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 <<EOF -#line 4870 "configure" +#line 4875 "configure" #include "confdefs.h" int main() { extern volatile int i; ; return 0; } EOF -if { (eval echo configure:4877: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4882: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* pgac_cv_c_volatile=yes else @@ -4893,12 +4898,12 @@ EOF fi echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:4897: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:4902: 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 <<EOF -#line 4902 "configure" +#line 4907 "configure" #include "confdefs.h" #include <sys/types.h> #include <time.h> @@ -4906,7 +4911,7 @@ int main() { struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:4910: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4915: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -4927,12 +4932,12 @@ EOF fi echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6 -echo "configure:4931: checking for tm_zone in struct tm" >&5 +echo "configure:4936: 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 <<EOF -#line 4936 "configure" +#line 4941 "configure" #include "confdefs.h" #include <sys/types.h> #include <$ac_cv_struct_tm> @@ -4940,7 +4945,7 @@ int main() { struct tm tm; tm.tm_zone; ; return 0; } EOF -if { (eval echo configure:4944: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4949: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm_zone=yes else @@ -4960,12 +4965,12 @@ EOF else echo $ac_n "checking for tzname""... $ac_c" 1>&6 -echo "configure:4964: checking for tzname" >&5 +echo "configure:4969: 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 <<EOF -#line 4969 "configure" +#line 4974 "configure" #include "confdefs.h" #include <time.h> #ifndef tzname /* For SGI. */ @@ -4975,7 +4980,7 @@ int main() { atoi(*tzname); ; return 0; } EOF -if { (eval echo configure:4979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_var_tzname=yes else @@ -4997,12 +5002,12 @@ EOF fi echo $ac_n "checking for union semun""... $ac_c" 1>&6 -echo "configure:5001: checking for union semun" >&5 +echo "configure:5006: 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 <<EOF -#line 5006 "configure" +#line 5011 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/ipc.h> @@ -5011,7 +5016,7 @@ int main() { union semun semun; ; return 0; } EOF -if { (eval echo configure:5015: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5020: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* pgac_cv_union_semun=yes else @@ -5031,12 +5036,12 @@ EOF fi echo $ac_n "checking for struct sockaddr_un""... $ac_c" 1>&6 -echo "configure:5035: checking for struct sockaddr_un" >&5 +echo "configure:5040: 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 <<EOF -#line 5040 "configure" +#line 5045 "configure" #include "confdefs.h" #include <sys/types.h> #ifdef HAVE_SYS_UN_H @@ -5046,7 +5051,7 @@ int main() { struct sockaddr_un un; ; return 0; } EOF -if { (eval echo configure:5050: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5055: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* pgac_cv_struct_sockaddr_un=yes else @@ -5070,19 +5075,19 @@ fi ## Functions, global variables ## echo $ac_n "checking for int timezone""... $ac_c" 1>&6 -echo "configure:5074: checking for int timezone" >&5 +echo "configure:5079: 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 <<EOF -#line 5079 "configure" +#line 5084 "configure" #include "confdefs.h" #include <time.h> int main() { int res = timezone / 60; ; return 0; } EOF -if { (eval echo configure:5086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5091: \"$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 @@ -5102,7 +5107,7 @@ EOF fi echo $ac_n "checking types of arguments for accept()""... $ac_c" 1>&6 -echo "configure:5106: checking types of arguments for accept()" >&5 +echo "configure:5111: 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 @@ -5116,7 +5121,7 @@ else for ac_cv_func_accept_arg2 in 'struct sockaddr *' 'const struct sockaddr *' 'void *'; do for ac_cv_func_accept_arg3 in 'int' 'size_t' 'socklen_t' 'unsigned int'; do cat > conftest.$ac_ext <<EOF -#line 5120 "configure" +#line 5125 "configure" #include "confdefs.h" #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> @@ -5129,7 +5134,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:5133: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5138: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_not_found=no; break 3 else @@ -5166,12 +5171,12 @@ EOF echo $ac_n "checking whether gettimeofday takes only one argument""... $ac_c" 1>&6 -echo "configure:5170: checking whether gettimeofday takes only one argument" >&5 +echo "configure:5175: 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 <<EOF -#line 5175 "configure" +#line 5180 "configure" #include "confdefs.h" #include <sys/time.h> int main() { @@ -5180,7 +5185,7 @@ struct timezone *tzp; gettimeofday(tp,tzp); ; return 0; } EOF -if { (eval echo configure:5184: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5189: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* pgac_cv_func_gettimeofday_1arg=no else @@ -5201,12 +5206,12 @@ EOF fi echo $ac_n "checking for fcntl(F_SETLK)""... $ac_c" 1>&6 -echo "configure:5205: checking for fcntl(F_SETLK)" >&5 +echo "configure:5210: checking for fcntl(F_SETLK)" >&5 case $host_os in linux*) echo "$ac_t""broken on Linux" 1>&6 ;; *) cat > conftest.$ac_ext <<EOF -#line 5210 "configure" +#line 5215 "configure" #include "confdefs.h" #include <stdio.h> #include <fcntl.h> @@ -5218,7 +5223,7 @@ lck.l_type = F_WRLCK; fcntl(0, F_SETLK, &lck); ; return 0; } EOF -if { (eval echo configure:5222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_FCNTL_SETLK 1 @@ -5237,12 +5242,12 @@ esac for ac_func in fcvt getopt_long memmove pstat setproctitle setsid sigprocmask sysconf waitpid dlopen do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5241: checking for $ac_func" >&5 +echo "configure:5246: 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 <<EOF -#line 5246 "configure" +#line 5251 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5265,7 +5270,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:5269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5274: \"$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 @@ -5291,12 +5296,12 @@ done echo $ac_n "checking for PS_STRINGS""... $ac_c" 1>&6 -echo "configure:5295: checking for PS_STRINGS" >&5 +echo "configure:5300: 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 <<EOF -#line 5300 "configure" +#line 5305 "configure" #include "confdefs.h" #include <machine/vmparam.h> #include <sys/exec.h> @@ -5306,7 +5311,7 @@ PS_STRINGS->ps_nargvstr = 1; PS_STRINGS->ps_argvstr = "foo"; ; return 0; } EOF -if { (eval echo configure:5310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5315: \"$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 @@ -5328,12 +5333,12 @@ fi SNPRINTF='' echo $ac_n "checking for snprintf""... $ac_c" 1>&6 -echo "configure:5332: checking for snprintf" >&5 +echo "configure:5337: 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 <<EOF -#line 5337 "configure" +#line 5342 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char snprintf(); below. */ @@ -5356,7 +5361,7 @@ snprintf(); ; return 0; } EOF -if { (eval echo configure:5360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5365: \"$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 @@ -5380,12 +5385,12 @@ SNPRINTF='snprintf.o' fi echo $ac_n "checking for vsnprintf""... $ac_c" 1>&6 -echo "configure:5384: checking for vsnprintf" >&5 +echo "configure:5389: 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 <<EOF -#line 5389 "configure" +#line 5394 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char vsnprintf(); below. */ @@ -5408,7 +5413,7 @@ vsnprintf(); ; return 0; } EOF -if { (eval echo configure:5412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5417: \"$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 @@ -5433,7 +5438,7 @@ fi cat > conftest.$ac_ext <<EOF -#line 5437 "configure" +#line 5442 "configure" #include "confdefs.h" #include <stdio.h> EOF @@ -5448,7 +5453,7 @@ fi rm -f conftest* cat > conftest.$ac_ext <<EOF -#line 5452 "configure" +#line 5457 "configure" #include "confdefs.h" #include <stdio.h> EOF @@ -5465,12 +5470,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:5469: checking for isinf" >&5 +echo "configure:5474: 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 <<EOF -#line 5474 "configure" +#line 5479 "configure" #include "confdefs.h" #include <math.h> @@ -5478,7 +5483,7 @@ int main() { double x = 0.0; int res = isinf(x); ; return 0; } EOF -if { (eval echo configure:5482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5487: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_isinf=yes else @@ -5504,12 +5509,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:5508: checking for $ac_func" >&5 +echo "configure:5513: 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 <<EOF -#line 5513 "configure" +#line 5518 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5532,7 +5537,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:5536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5541: \"$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 @@ -5560,12 +5565,12 @@ fi echo $ac_n "checking for getrusage""... $ac_c" 1>&6 -echo "configure:5564: checking for getrusage" >&5 +echo "configure:5569: 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 <<EOF -#line 5569 "configure" +#line 5574 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char getrusage(); below. */ @@ -5588,7 +5593,7 @@ getrusage(); ; return 0; } EOF -if { (eval echo configure:5592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5597: \"$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 @@ -5613,12 +5618,12 @@ fi echo $ac_n "checking for srandom""... $ac_c" 1>&6 -echo "configure:5617: checking for srandom" >&5 +echo "configure:5622: 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 <<EOF -#line 5622 "configure" +#line 5627 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char srandom(); below. */ @@ -5641,7 +5646,7 @@ srandom(); ; return 0; } EOF -if { (eval echo configure:5645: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_srandom=yes" else @@ -5666,12 +5671,12 @@ fi echo $ac_n "checking for gethostname""... $ac_c" 1>&6 -echo "configure:5670: checking for gethostname" >&5 +echo "configure:5675: 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 <<EOF -#line 5675 "configure" +#line 5680 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gethostname(); below. */ @@ -5694,7 +5699,7 @@ gethostname(); ; return 0; } EOF -if { (eval echo configure:5698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostname=yes" else @@ -5719,12 +5724,12 @@ fi echo $ac_n "checking for random""... $ac_c" 1>&6 -echo "configure:5723: checking for random" >&5 +echo "configure:5728: 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 <<EOF -#line 5728 "configure" +#line 5733 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char random(); below. */ @@ -5747,7 +5752,7 @@ random(); ; return 0; } EOF -if { (eval echo configure:5751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_random=yes" else @@ -5772,12 +5777,12 @@ fi echo $ac_n "checking for inet_aton""... $ac_c" 1>&6 -echo "configure:5776: checking for inet_aton" >&5 +echo "configure:5781: 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 <<EOF -#line 5781 "configure" +#line 5786 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char inet_aton(); below. */ @@ -5800,7 +5805,7 @@ inet_aton(); ; return 0; } EOF -if { (eval echo configure:5804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_inet_aton=yes" else @@ -5825,12 +5830,12 @@ fi echo $ac_n "checking for strerror""... $ac_c" 1>&6 -echo "configure:5829: checking for strerror" >&5 +echo "configure:5834: 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 <<EOF -#line 5834 "configure" +#line 5839 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char strerror(); below. */ @@ -5853,7 +5858,7 @@ strerror(); ; return 0; } EOF -if { (eval echo configure:5857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_strerror=yes" else @@ -5879,12 +5884,12 @@ fi echo $ac_n "checking for strdup""... $ac_c" 1>&6 -echo "configure:5883: checking for strdup" >&5 +echo "configure:5888: 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 <<EOF -#line 5888 "configure" +#line 5893 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char strdup(); below. */ @@ -5907,7 +5912,7 @@ strdup(); ; return 0; } EOF -if { (eval echo configure:5911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_strdup=yes" else @@ -5932,12 +5937,12 @@ fi echo $ac_n "checking for strtol""... $ac_c" 1>&6 -echo "configure:5936: checking for strtol" >&5 +echo "configure:5941: 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 <<EOF -#line 5941 "configure" +#line 5946 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char strtol(); below. */ @@ -5960,7 +5965,7 @@ strtol(); ; return 0; } EOF -if { (eval echo configure:5964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5969: \"$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 @@ -5985,12 +5990,12 @@ fi echo $ac_n "checking for strtoul""... $ac_c" 1>&6 -echo "configure:5989: checking for strtoul" >&5 +echo "configure:5994: 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 <<EOF -#line 5994 "configure" +#line 5999 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char strtoul(); below. */ @@ -6013,7 +6018,7 @@ strtoul(); ; return 0; } EOF -if { (eval echo configure:6017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6022: \"$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 @@ -6038,12 +6043,12 @@ fi echo $ac_n "checking for strcasecmp""... $ac_c" 1>&6 -echo "configure:6042: checking for strcasecmp" >&5 +echo "configure:6047: 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 <<EOF -#line 6047 "configure" +#line 6052 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char strcasecmp(); below. */ @@ -6066,7 +6071,7 @@ strcasecmp(); ; return 0; } EOF -if { (eval echo configure:6070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6075: \"$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 @@ -6091,12 +6096,12 @@ fi echo $ac_n "checking for cbrt""... $ac_c" 1>&6 -echo "configure:6095: checking for cbrt" >&5 +echo "configure:6100: 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 <<EOF -#line 6100 "configure" +#line 6105 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char cbrt(); below. */ @@ -6119,7 +6124,7 @@ cbrt(); ; return 0; } EOF -if { (eval echo configure:6123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6128: \"$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 @@ -6140,7 +6145,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for cbrt in -lm""... $ac_c" 1>&6 -echo "configure:6144: checking for cbrt in -lm" >&5 +echo "configure:6149: 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 @@ -6148,7 +6153,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <<EOF -#line 6152 "configure" +#line 6157 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6159,7 +6164,7 @@ int main() { cbrt() ; return 0; } EOF -if { (eval echo configure:6163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6168: \"$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 @@ -6197,12 +6202,12 @@ esac echo $ac_n "checking for rint""... $ac_c" 1>&6 -echo "configure:6201: checking for rint" >&5 +echo "configure:6206: 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 <<EOF -#line 6206 "configure" +#line 6211 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char rint(); below. */ @@ -6225,7 +6230,7 @@ rint(); ; return 0; } EOF -if { (eval echo configure:6229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6234: \"$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 @@ -6246,7 +6251,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for rint in -lm""... $ac_c" 1>&6 -echo "configure:6250: checking for rint in -lm" >&5 +echo "configure:6255: 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 @@ -6254,7 +6259,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $HPUXMATHLIB $LIBS" cat > conftest.$ac_ext <<EOF -#line 6258 "configure" +#line 6263 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6265,7 +6270,7 @@ int main() { rint() ; return 0; } EOF -if { (eval echo configure:6269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6274: \"$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 @@ -6294,9 +6299,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:6298: checking for rl_completion_append_character" >&5 +echo "configure:6303: checking for rl_completion_append_character" >&5 cat > conftest.$ac_ext <<EOF -#line 6300 "configure" +#line 6305 "configure" #include "confdefs.h" #include <stdio.h> #ifdef HAVE_READLINE_H @@ -6309,7 +6314,7 @@ int main() { rl_completion_append_character = 'x'; ; return 0; } EOF -if { (eval echo configure:6313: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6318: \"$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 @@ -6330,7 +6335,7 @@ rm -f conftest* # with earlier Cygwins don't have this declared, although it's in the # library. echo $ac_n "checking whether filename_completion_function is declared""... $ac_c" 1>&6 -echo "configure:6334: checking whether filename_completion_function is declared" >&5 +echo "configure:6339: checking whether filename_completion_function is declared" >&5 if test "$ac_cv_header_readline_h" = yes; then _readline_header='readline.h' elif test "$ac_cv_header_readline_readline_h" = yes; then @@ -6339,7 +6344,7 @@ else _readline_header='xxx' fi cat > conftest.$ac_ext <<EOF -#line 6343 "configure" +#line 6348 "configure" #include "confdefs.h" #include <$_readline_header> EOF @@ -6361,16 +6366,16 @@ rm -f conftest* echo $ac_n "checking for finite""... $ac_c" 1>&6 -echo "configure:6365: checking for finite" >&5 +echo "configure:6370: checking for finite" >&5 cat > conftest.$ac_ext <<EOF -#line 6367 "configure" +#line 6372 "configure" #include "confdefs.h" #include <math.h> int main() { int dummy=finite(1.0); ; return 0; } EOF -if { (eval echo configure:6374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6379: \"$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 @@ -6385,16 +6390,16 @@ fi rm -f conftest* echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6 -echo "configure:6389: checking for sigsetjmp" >&5 +echo "configure:6394: checking for sigsetjmp" >&5 cat > conftest.$ac_ext <<EOF -#line 6391 "configure" +#line 6396 "configure" #include "confdefs.h" #include <setjmp.h> int main() { sigjmp_buf x; sigsetjmp(x, 1); ; return 0; } EOF -if { (eval echo configure:6398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6403: \"$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 @@ -6414,12 +6419,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:6418: checking for syslog" >&5 +echo "configure:6423: 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 <<EOF -#line 6423 "configure" +#line 6428 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char syslog(); below. */ @@ -6442,7 +6447,7 @@ syslog(); ; return 0; } EOF -if { (eval echo configure:6446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6451: \"$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 @@ -6482,7 +6487,7 @@ fi echo $ac_n "checking whether long int is 64 bits""... $ac_c" 1>&6 -echo "configure:6486: checking whether long int is 64 bits" >&5 +echo "configure:6491: 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 @@ -6491,7 +6496,7 @@ else echo "configure: warning: 64 bit arithmetic disabled when cross-compiling" 1>&2 else cat > conftest.$ac_ext <<EOF -#line 6495 "configure" +#line 6500 "configure" #include "confdefs.h" typedef long int int64; @@ -6520,7 +6525,7 @@ main() { exit(! does_int64_work()); } EOF -if { (eval echo configure:6524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6529: \"$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 @@ -6547,7 +6552,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:6551: checking whether long long int is 64 bits" >&5 +echo "configure:6556: 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 @@ -6556,7 +6561,7 @@ else echo "configure: warning: 64 bit arithmetic disabled when cross-compiling" 1>&2 else cat > conftest.$ac_ext <<EOF -#line 6560 "configure" +#line 6565 "configure" #include "confdefs.h" typedef long long int int64; @@ -6585,7 +6590,7 @@ main() { exit(! does_int64_work()); } EOF -if { (eval echo configure:6589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6594: \"$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 @@ -6616,7 +6621,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:6620: checking whether snprintf handles 'long long int' as %lld" >&5 +echo "configure:6625: 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 @@ -6625,7 +6630,7 @@ echo "configure:6620: checking whether snprintf handles 'long long int' as %lld" else cat > conftest.$ac_ext <<EOF -#line 6629 "configure" +#line 6634 "configure" #include "confdefs.h" #include <stdio.h> typedef long long int int64; @@ -6652,7 +6657,7 @@ main() { exit(! does_int64_snprintf_work()); } EOF -if { (eval echo configure:6656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6661: \"$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"' @@ -6663,7 +6668,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:6667: checking whether snprintf handles 'long long int' as %qd" >&5 +echo "configure:6672: 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 @@ -6672,7 +6677,7 @@ echo "configure:6667: checking whether snprintf handles 'long long int' as %qd" else cat > conftest.$ac_ext <<EOF -#line 6676 "configure" +#line 6681 "configure" #include "confdefs.h" #include <stdio.h> typedef long long int int64; @@ -6699,7 +6704,7 @@ main() { exit(! does_int64_snprintf_work()); } EOF -if { (eval echo configure:6703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6708: \"$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"' @@ -6738,7 +6743,7 @@ EOF echo $ac_n "checking alignment of short""... $ac_c" 1>&6 -echo "configure:6742: checking alignment of short" >&5 +echo "configure:6747: 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 @@ -6746,7 +6751,7 @@ else pgac_cv_alignof_short='sizeof(short)' else cat > conftest.$ac_ext <<EOF -#line 6750 "configure" +#line 6755 "configure" #include "confdefs.h" #include <stdio.h> struct { char filler; short field; } mystruct; @@ -6758,7 +6763,7 @@ main() exit(0); } EOF -if { (eval echo configure:6762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6767: \"$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 @@ -6778,7 +6783,7 @@ EOF echo $ac_n "checking alignment of int""... $ac_c" 1>&6 -echo "configure:6782: checking alignment of int" >&5 +echo "configure:6787: 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 @@ -6786,7 +6791,7 @@ else pgac_cv_alignof_int='sizeof(int)' else cat > conftest.$ac_ext <<EOF -#line 6790 "configure" +#line 6795 "configure" #include "confdefs.h" #include <stdio.h> struct { char filler; int field; } mystruct; @@ -6798,7 +6803,7 @@ main() exit(0); } EOF -if { (eval echo configure:6802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6807: \"$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 @@ -6818,7 +6823,7 @@ EOF echo $ac_n "checking alignment of long""... $ac_c" 1>&6 -echo "configure:6822: checking alignment of long" >&5 +echo "configure:6827: 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 @@ -6826,7 +6831,7 @@ else pgac_cv_alignof_long='sizeof(long)' else cat > conftest.$ac_ext <<EOF -#line 6830 "configure" +#line 6835 "configure" #include "confdefs.h" #include <stdio.h> struct { char filler; long field; } mystruct; @@ -6838,7 +6843,7 @@ main() exit(0); } EOF -if { (eval echo configure:6842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6847: \"$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 @@ -6859,7 +6864,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:6863: checking alignment of long long int" >&5 +echo "configure:6868: 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 @@ -6867,7 +6872,7 @@ else pgac_cv_alignof_long_long_int='sizeof(long long int)' else cat > conftest.$ac_ext <<EOF -#line 6871 "configure" +#line 6876 "configure" #include "confdefs.h" #include <stdio.h> struct { char filler; long long int field; } mystruct; @@ -6879,7 +6884,7 @@ main() exit(0); } EOF -if { (eval echo configure:6883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6888: \"$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 @@ -6900,7 +6905,7 @@ EOF fi echo $ac_n "checking alignment of double""... $ac_c" 1>&6 -echo "configure:6904: checking alignment of double" >&5 +echo "configure:6909: 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 @@ -6908,7 +6913,7 @@ else pgac_cv_alignof_double='sizeof(double)' else cat > conftest.$ac_ext <<EOF -#line 6912 "configure" +#line 6917 "configure" #include "confdefs.h" #include <stdio.h> struct { char filler; double field; } mystruct; @@ -6920,7 +6925,7 @@ main() exit(0); } EOF -if { (eval echo configure:6924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6929: \"$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 @@ -6958,12 +6963,12 @@ EOF echo $ac_n "checking for POSIX signal interface""... $ac_c" 1>&6 -echo "configure:6962: checking for POSIX signal interface" >&5 +echo "configure:6967: 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 <<EOF -#line 6967 "configure" +#line 6972 "configure" #include "confdefs.h" #include <signal.h> @@ -6974,7 +6979,7 @@ act.sa_flags = SA_RESTART; sigaction(0, &act, &oact); ; return 0; } EOF -if { (eval echo configure:6978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6983: \"$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 @@ -7004,7 +7009,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:7008: checking for $ac_word" >&5 +echo "configure:7013: 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 @@ -7040,7 +7045,7 @@ test -n "$TCLSH" && break done echo $ac_n "checking for tclConfig.sh""... $ac_c" 1>&6 -echo "configure:7044: checking for tclConfig.sh" >&5 +echo "configure:7049: checking for tclConfig.sh" >&5 # Let user override test if test -z "$TCL_CONFIG_SH"; then pgac_test_dirs="$with_tclconfig" @@ -7073,7 +7078,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:7077: checking for tkConfig.sh" >&5 +echo "configure:7082: checking for tkConfig.sh" >&5 # Let user override test if test -z "$TK_CONFIG_SH"; then pgac_test_dirs="$with_tkconfig $with_tclconfig" @@ -7106,6 +7111,13 @@ fi # Finally ready to produce output files ... +if test x"$abs_top_srcdir" != x"$abs_top_builddir"; then + echo $ac_n "preparing build tree... $ac_c" 1>&6 + /bin/sh "$srcdir/config/prep_buildtree" "$abs_top_srcdir" "$abs_top_builddir" \ + || { echo "configure: error: failed" 1>&2; exit 1; } + echo "$ac_t""done" 1>&6 +fi + trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure @@ -7245,6 +7257,8 @@ s%@oldincludedir@%$oldincludedir%g s%@docdir@%$docdir%g s%@mandir@%$mandir%g s%@VERSION@%$VERSION%g +s%@abs_top_srcdir@%$abs_top_srcdir%g +s%@abs_top_builddir@%$abs_top_builddir%g s%@host@%$host%g s%@host_alias@%$host_alias%g s%@host_cpu@%$host_cpu%g @@ -7284,6 +7298,7 @@ s%@odbcinst_ini_dir@%$odbcinst_ini_dir%g s%@ELF_SYS@%$ELF_SYS%g s%@CXX@%$CXX%g s%@CXXCPP@%$CXXCPP%g +s%@GXX@%$GXX%g s%@with_CXX@%$with_CXX%g s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g diff --git a/configure.in b/configure.in index 81e007391d..35e6582129 100644 --- a/configure.in +++ b/configure.in @@ -32,6 +32,11 @@ VERSION='7.1devel' AC_SUBST(VERSION) AC_DEFINE_UNQUOTED(PG_VERSION, "$VERSION") +abs_top_srcdir=`cd $srcdir && pwd` +AC_SUBST(abs_top_srcdir) +abs_top_builddir=`pwd` +AC_SUBST(abs_top_builddir) + AC_CANONICAL_HOST AC_SUBST(host) AC_SUBST(host_cpu) @@ -546,13 +551,13 @@ PGAC_ARG_OPTARG(with, CXX, [ --with-CXX build C++ modules (libpq++ AC_MSG_RESULT(yes) AC_PROG_CXX AC_PROG_CXXCPP + AC_SUBST(GXX) PGAC_CLASS_STRING PGAC_CXX_NAMESPACE_STD ], [AC_MSG_RESULT(no)]) AC_SUBST(with_CXX) - CPPFLAGS="$CPPFLAGS $INCLUDES" LDFLAGS="$LDFLAGS $PGSQL_LDFLAGS" @@ -1042,6 +1047,13 @@ fi # Finally ready to produce output files ... +if test x"$abs_top_srcdir" != x"$abs_top_builddir"; then + echo $ac_n "preparing build tree... $ac_c" 1>&6 + /bin/sh "$srcdir/config/prep_buildtree" "$abs_top_srcdir" "$abs_top_builddir" \ + || AC_MSG_ERROR(failed) + AC_MSG_RESULT(done) +fi + AC_OUTPUT( [ GNUmakefile diff --git a/contrib/array/Makefile b/contrib/array/Makefile index 6708cc1584..a686d76106 100644 --- a/contrib/array/Makefile +++ b/contrib/array/Makefile @@ -4,12 +4,13 @@ subdir = contrib/array top_builddir = ../.. -include ../../src/Makefile.global +include $(top_builddir)/src/Makefile.global NAME := array_iterator SONAME := $(NAME)$(DLSUFFIX) -CFLAGS += -I. $(CFLAGS_SL) +override CPPFLAGS += -I$(srcdir) +override CFLAGS += $(CFLAGS_SL) all: $(SONAME) $(NAME).sql diff --git a/contrib/earthdistance/Makefile b/contrib/earthdistance/Makefile index 9981ca753a..d0a45a41f0 100644 --- a/contrib/earthdistance/Makefile +++ b/contrib/earthdistance/Makefile @@ -9,7 +9,8 @@ include ../../src/Makefile.global NAME := earthdistance SONAME := $(NAME)$(DLSUFFIX) -CFLAGS += -I. $(CFLAGS_SL) +override CPPFLAGS += -I$(srcdir) +override CFLAGS += $(CFLAGS_SL) all: $(SONAME) $(NAME).sql diff --git a/contrib/findoidjoins/Makefile b/contrib/findoidjoins/Makefile index 3b40c83eb8..80e068c4c4 100644 --- a/contrib/findoidjoins/Makefile +++ b/contrib/findoidjoins/Makefile @@ -4,10 +4,10 @@ subdir = contrib/findoidjoins top_builddir = ../.. -include ../../src/Makefile.global +include $(top_builddir)/src/Makefile.global -CFLAGS += -I$(libpgeasy_srcdir) -I$(libpq_srcdir) -LIBS += $(libpgeasy) +override CPPFLAGS += -I$(libpgeasy_srcdir) -I$(libpq_srcdir) +override LIBS += $(libpgeasy) all: findoidjoins diff --git a/contrib/fulltextindex/Makefile b/contrib/fulltextindex/Makefile index ce4071e871..37ab9a96ed 100644 --- a/contrib/fulltextindex/Makefile +++ b/contrib/fulltextindex/Makefile @@ -9,7 +9,8 @@ include ../../src/Makefile.global NAME := fti SONAME := $(NAME)$(DLSUFFIX) -CFLAGS += -I. $(CFLAGS_SL) +override CPPFLAGS += -I$(srcdir) +override CFLAGS += $(CFLAGS_SL) all: $(SONAME) $(NAME).sql diff --git a/contrib/isbn_issn/Makefile b/contrib/isbn_issn/Makefile index 8b70beddec..5ab19ca72f 100644 --- a/contrib/isbn_issn/Makefile +++ b/contrib/isbn_issn/Makefile @@ -4,12 +4,13 @@ subdir = contrib/isbn_issn top_builddir = ../.. -include ../../src/Makefile.global +include $(top_builddir)/src/Makefile.global NAME := isbn_issn SONAME := $(NAME)$(DLSUFFIX) -CFLAGS += -I. $(CFLAGS_SL) +override CPPFLAGS += -I$(srcdir) +override CFLAGS += $(CFLAGS_SL) all: $(SONAME) $(NAME).sql diff --git a/contrib/lo/Makefile b/contrib/lo/Makefile index cfeeec276d..b1793873ed 100644 --- a/contrib/lo/Makefile +++ b/contrib/lo/Makefile @@ -4,7 +4,7 @@ subdir = contrib/lo top_builddir = ../.. -include ../../src/Makefile.global +include $(top_builddir)/src/Makefile.global NAME := lo SONAME := $(NAME)$(DLSUFFIX) @@ -12,10 +12,11 @@ SONAME := $(NAME)$(DLSUFFIX) SQLS = $(NAME).sql lo_drop.sql lo_test.sql MODS = $(NAME)$(DLSUFFIX) -CFLAGS += -I. $(CFLAGS_SL) +override CPPFLAGS += -I$(srcdir) +override CFLAGS += $(CFLAGS_SL) ifdef REFINT_VERBOSE -CFLAGS+= -DREFINT_VERBOSE +override CPPFLAGS+= -DREFINT_VERBOSE endif all: $(SONAME) $(NAME).sql diff --git a/contrib/mSQL-interface/Makefile b/contrib/mSQL-interface/Makefile index 358d293b98..c00e3bfeca 100644 --- a/contrib/mSQL-interface/Makefile +++ b/contrib/mSQL-interface/Makefile @@ -11,7 +11,7 @@ SO_MAJOR_VERSION := 0 SO_MINOR_VERSION := 0 OBJS := mpgsql.o -CFLAGS += -I$(libpq_srcdir) +override CPPFLAGS += -I$(libpq_srcdir) include $(top_srcdir)/src/Makefile.shlib diff --git a/contrib/miscutil/Makefile b/contrib/miscutil/Makefile index b9ba326601..07cc1ea837 100644 --- a/contrib/miscutil/Makefile +++ b/contrib/miscutil/Makefile @@ -4,12 +4,13 @@ subdir = contrib/miscutil top_builddir = ../.. -include ../../src/Makefile.global +include $(top_builddir)/src/Makefile.global NAME := misc_utils SONAME := $(NAME)$(DLSUFFIX) -CFLAGS += -I. $(CFLAGS_SL) +override CPPFLAGS += -I$(srcdir) +override CFLAGS += $(CFLAGS_SL) all: $(SONAME) $(NAME).sql diff --git a/contrib/noupdate/Makefile b/contrib/noupdate/Makefile index 7ba0025cc3..2b0e95d7a3 100644 --- a/contrib/noupdate/Makefile +++ b/contrib/noupdate/Makefile @@ -4,12 +4,13 @@ subdir = contrib/noupdate top_builddir = ../.. -include ../../src/Makefile.global +include $(top_builddir)/src/Makefile.global NAME := noup SONAME := $(NAME)$(DLSUFFIX) -CFLAGS += -I. $(CFLAGS_SL) +override CPPFLAGS += -I$(srcdir) +override CFLAGS += $(CFLAGS_SL) all: $(SONAME) $(NAME).sql diff --git a/contrib/pg_dumplo/Makefile b/contrib/pg_dumplo/Makefile index fa7a4559ae..d712b52a89 100644 --- a/contrib/pg_dumplo/Makefile +++ b/contrib/pg_dumplo/Makefile @@ -4,15 +4,15 @@ subdir = contrib/pg_dumplo top_builddir = ../.. -include ../../src/Makefile.global +include $(top_builddir)/src/Makefile.global OBJS = main.o lo_export.o lo_import.o utils.o -CFLAGS += -I$(libpq_srcdir) +override CPPFLAGS += -I$(libpq_srcdir) all: pg_dumplo pg_dumplo: $(OBJS) $(libpq_builddir)/libpq.a - $(CC) $(CFLAGS) -o $@ $(OBJS) $(libpq) + $(CC) -o $@ $(OBJS) $(libpq) $(CFLAGS) $(LDFLAGS) install: all installdirs $(INSTALL_PROGRAM) pg_dumplo$(X) $(bindir) diff --git a/contrib/pgbench/Makefile b/contrib/pgbench/Makefile index d7a7259a0c..38efe681f7 100644 --- a/contrib/pgbench/Makefile +++ b/contrib/pgbench/Makefile @@ -4,10 +4,10 @@ subdir = contrib/pgbench top_builddir = ../.. -include ../../src/Makefile.global +include $(top_builddir)/src/Makefile.global -CFLAGS += -I$(libpq_srcdir) -LIBS += $(libpq) +override CPPFLAGS += -I$(libpq_srcdir) +override LIBS += $(libpq) all: pgbench diff --git a/contrib/soundex/Makefile b/contrib/soundex/Makefile index 758f384329..c076a89edc 100644 --- a/contrib/soundex/Makefile +++ b/contrib/soundex/Makefile @@ -9,7 +9,8 @@ include $(top_builddir)/src/Makefile.global NAME := soundex SONAME := $(NAME)$(DLSUFFIX) -CFLAGS += -I. $(CFLAGS_SL) +override CPPFLAGS += -I$(srcdir) +override CFLAGS += $(CFLAGS_SL) all: $(SONAME) $(NAME).sql diff --git a/contrib/spi/Makefile b/contrib/spi/Makefile index ff8ae18b71..e27a06c9e7 100644 --- a/contrib/spi/Makefile +++ b/contrib/spi/Makefile @@ -4,7 +4,7 @@ subdir = contrib/spi top_builddir = ../.. -include ../../src/Makefile.global +include $(top_builddir)/src/Makefile.global OBJS = autoinc.o insert_username.o moddatetime.o refint.o timetravel.o DOCS = README.spi @@ -12,10 +12,11 @@ SQLS = $(OBJS:.o=.sql) EXAMPLES= $(OBJS:.o=.example) MODS = $(OBJS:.o=$(DLSUFFIX)) -CFLAGS += -I. $(CFLAGS_SL) +override CPPFLAGS += -I$(srcdir) +override CFLAGS += $(CFLAGS_SL) ifdef REFINT_VERBOSE -CFLAGS+= -DREFINT_VERBOSE +override CPPFLAGS+= -DREFINT_VERBOSE endif all: $(MODS) $(SQLS) diff --git a/contrib/string/Makefile b/contrib/string/Makefile index 4e7103196e..0999701b60 100644 --- a/contrib/string/Makefile +++ b/contrib/string/Makefile @@ -4,12 +4,13 @@ subdir = contrib/string top_builddir = ../.. -include ../../src/Makefile.global +include $(top_builddir)/src/Makefile.global NAME := string_io SONAME := $(NAME)$(DLSUFFIX) -CFLAGS += -I. $(CFLAGS_SL) +override CPPFLAGS += -I$(srcdir) +override CFLAGS += $(CFLAGS_SL) all: $(SONAME) $(NAME).sql diff --git a/contrib/userlock/Makefile b/contrib/userlock/Makefile index a14fb415a8..855654d39b 100644 --- a/contrib/userlock/Makefile +++ b/contrib/userlock/Makefile @@ -4,12 +4,13 @@ subdir = contrib/userlock top_builddir = ../.. -include ../../src/Makefile.global +include $(top_builddir)/src/Makefile.global NAME := user_locks SONAME := $(NAME)$(DLSUFFIX) -CFLAGS += -I. $(CFLAGS_SL) +override CPPFLAGS += -I$(srcdir) +override CFLAGS += $(CFLAGS_SL) all: $(SONAME) $(NAME).sql diff --git a/contrib/vacuumlo/Makefile b/contrib/vacuumlo/Makefile index 137bd36614..ec533515cf 100644 --- a/contrib/vacuumlo/Makefile +++ b/contrib/vacuumlo/Makefile @@ -4,10 +4,10 @@ subdir = contrib/vacuumlo top_builddir = ../.. -include ../../src/Makefile.global +include $(top_builddir)/src/Makefile.global -CPPFLAGS += -I$(libpq_srcdir) -LIBS += $(libpq) +override CPPFLAGS += -I$(libpq_srcdir) +override LIBS += $(libpq) all: vacuumlo diff --git a/src/Makefile.global.in b/src/Makefile.global.in index 5a1edaa2e8..9a1a7b7d30 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -18,7 +18,7 @@ # # Meta configuration -.PHONY: all install installdirs uninstall dep depend clean distclean maintainer-clean distprep check installcheck +.PHONY: all install installdirs uninstall clean distclean maintainer-clean distprep check installcheck .SILENT: installdirs # make `all' the default target @@ -31,15 +31,18 @@ all: # PostgreSQL version number VERSION = @VERSION@ -# This should be changed once we have separate build dirs. -top_srcdir = $(top_builddir) +# Support for VPATH builds +abs_top_srcdir = @abs_top_srcdir@ +abs_top_builddir = @abs_top_builddir@ -ifeq ($(top_builddir), $(top_srcdir)) +ifeq ($(abs_top_builddir), $(abs_top_srcdir)) +top_srcdir = $(top_builddir) srcdir = . else +top_srcdir = $(abs_top_srcdir) srcdir = $(top_srcdir)/$(subdir) -endif VPATH = $(srcdir) +endif ########################################################################## @@ -127,19 +130,25 @@ TK_CONFIG_SH = @TK_CONFIG_SH@ # Compilers -CC = @CC@ CPP = @CPP@ -GCC = @GCC@ CPPFLAGS = @CPPFLAGS@ -CFLAGS = -I$(top_srcdir)/src/include $(CPPFLAGS) @CFLAGS@ -CFLAGS_SL = @SHARED_LIB@ -CXX = @CXX@ -CXXFLAGS = @CXXFLAGS@ @INCLUDES@ +override CPPFLAGS += $(sort -I$(top_srcdir)/src/include -I$(top_builddir)/src/include) +CC = @CC@ +GCC = @GCC@ +CFLAGS = @CFLAGS@ +CFLAGS_SL = @SHARED_LIB@ ifeq ($(GCC), yes) CFLAGS += -Wall -Wmissing-prototypes -Wmissing-declarations endif +CXX = @CXX@ +GXX = @GXX@ +CXXFLAGS = @CXXFLAGS@ +ifeq ($(GXX), yes) + CXXFLAGS += -Wall +endif + # Kind-of compilers YACC = @YACC@ @@ -220,7 +229,7 @@ libpq_builddir = $(top_builddir)/src/interfaces/libpq libpq = -L$(libpq_builddir) -lpq libpgeasy_srcdir = $(top_srcdir)/src/interfaces/libpgeasy -libpgeasy_builddir = $(top_builddir/src/interfaces/libpgeasy +libpgeasy_builddir = $(top_builddir)/src/interfaces/libpgeasy libpgeasy = -L$(libpgeasy_builddir) -lpgeasy diff --git a/src/Makefile.shlib b/src/Makefile.shlib index 7bcc0acb90..943c2dbc0e 100644 --- a/src/Makefile.shlib +++ b/src/Makefile.shlib @@ -78,7 +78,7 @@ ifeq ($(PORTNAME), openbsd) else LDFLAGS_SL := -x -Bshareable -Bforcearchive endif - CFLAGS += $(CFLAGS_SL) + override CFLAGS += $(CFLAGS_SL) endif endif @@ -87,13 +87,13 @@ ifeq ($(PORTNAME), bsdi) ifeq ($(DLSUFFIX), .so) shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) LDFLAGS_SL += -shared -soname $(shlib) - CFLAGS += $(CFLAGS_SL) + override CFLAGS += $(CFLAGS_SL) endif ifeq ($(DLSUFFIX), .o) shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) LD := shlicc LDFLAGS_SL += -O $(LDREL) - CFLAGS += $(CFLAGS_SL) + override CFLAGS += $(CFLAGS_SL) endif endif endif @@ -107,7 +107,7 @@ ifeq ($(PORTNAME), freebsd) shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) LDFLAGS_SL := -x -Bshareable -Bforcearchive endif - CFLAGS += $(CFLAGS_SL) + override CFLAGS += $(CFLAGS_SL) endif endif @@ -124,7 +124,7 @@ ifeq ($(PORTNAME), netbsd) else LDFLAGS_SL := -x -Bshareable -Bforcearchive endif - CFLAGS += $(CFLAGS_SL) + override CFLAGS += $(CFLAGS_SL) endif endif @@ -132,13 +132,13 @@ ifeq ($(PORTNAME), hpux) # HPUX doesn't believe in version numbers for shlibs shlib := lib$(NAME)$(DLSUFFIX) LDFLAGS_SL := -b - CFLAGS += $(CFLAGS_SL) + override CFLAGS += $(CFLAGS_SL) endif ifeq ($(PORTNAME), irix5) shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION) LDFLAGS_SL := -shared -rpath $(libdir) -set_version sgi$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) - CFLAGS += $(CFLAGS_SL) + override CFLAGS += $(CFLAGS_SL) endif ifeq ($(PORTNAME), linux) @@ -146,14 +146,14 @@ ifeq ($(PORTNAME), linux) LD := $(CC) LDFLAGS_SL := -shared -Wl,-soname,$(shlib) LDFLAGS_ODBC := -lm - CFLAGS += $(CFLAGS_SL) + override CFLAGS += $(CFLAGS_SL) endif ifeq ($(PORTNAME), solaris) shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) LDFLAGS_SL := -G SHLIB_LINK += -ldl -lsocket -lresolv -lnsl -lm -lc - CFLAGS += $(CFLAGS_SL) + override CFLAGS += $(CFLAGS_SL) endif ifeq ($(PORTNAME), osf) @@ -164,15 +164,15 @@ endif ifeq ($(PORTNAME), svr4) shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) LDFLAGS_SL := -G - CFLAGS += $(CFLAGS_SL) + override CFLAGS += $(CFLAGS_SL) endif ifeq ($(PORTNAME), univel) shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) LDFLAGS_SL := -G -z text - CFLAGS += $(CFLAGS_SL) + override CFLAGS += $(CFLAGS_SL) ifeq ($(CXX), CC) - CXXFLAGS += -Xw + override CXXFLAGS += -Xw COMPILE.cc = $(CXX) $(CXXFLAGS:ll,alloca=ll) $(CPPFLAGS) $(TARGET_ARCH) -c endif endif @@ -180,9 +180,9 @@ endif ifeq ($(PORTNAME), unixware) shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) LDFLAGS_SL := -G -z text - CFLAGS += $(CFLAGS_SL) + override CFLAGS += $(CFLAGS_SL) ifeq ($(CXX), CC) - CXXFLAGS += -Xw + override CXXFLAGS += -Xw COMPILE.cc = $(CXX) $(CXXFLAGS:ll,alloca=ll) $(CPPFLAGS) $(TARGET_ARCH) -c endif endif diff --git a/src/backend/Makefile b/src/backend/Makefile index c2461402e3..517f3822ef 100644 --- a/src/backend/Makefile +++ b/src/backend/Makefile @@ -58,7 +58,7 @@ $(OBJS): $(DIRS:%=%-recursive) .PHONY: $(DIRS:%=%-recursive) # Update the commonly used headers before building the subdirectories -$(DIRS:%=%-recursive): $(top_srcdir)/src/include/parser/parse.h $(top_builddir)/src/include/utils/fmgroids.h +$(DIRS:%=%-recursive): $(top_builddir)/src/include/parser/parse.h $(top_builddir)/src/include/utils/fmgroids.h $(MAKE) -C $(subst -recursive,,$@) all @@ -98,8 +98,9 @@ utils/fmgroids.h: utils/Gen_fmgrtab.sh $(top_srcdir)/src/include/catalog/pg_proc # up to date when we update the base file. $(top_builddir)/src/include/parser/parse.h: $(srcdir)/parser/parse.h - cd $(dir $@) && rm -f $(notdir $@) && \ - $(LN_S) ../../../$(subdir)/parser/parse.h . + prereqdir=`cd $(dir $<) && pwd` && \ + cd $(dir $@) && rm -f $(notdir $@) && \ + $(LN_S) $$prereqdir/$(notdir $<) . $(top_builddir)/src/include/utils/fmgroids.h: utils/fmgroids.h cd $(dir $@) && rm -f $(notdir $@) && \ @@ -123,9 +124,9 @@ ifeq ($(MAKE_DLL), true) endif endif $(MAKE) -C catalog install-bki - $(INSTALL_DATA) libpq/pg_hba.conf.sample $(DESTDIR)$(datadir)/pg_hba.conf.sample - $(INSTALL_DATA) libpq/pg_ident.conf.sample $(DESTDIR)$(datadir)/pg_ident.conf.sample - $(INSTALL_DATA) utils/misc/postgresql.conf.sample $(DESTDIR)$(datadir)/postgresql.conf.sample + $(INSTALL_DATA) $(srcdir)/libpq/pg_hba.conf.sample $(DESTDIR)$(datadir)/pg_hba.conf.sample + $(INSTALL_DATA) $(srcdir)/libpq/pg_ident.conf.sample $(DESTDIR)$(datadir)/pg_ident.conf.sample + $(INSTALL_DATA) $(srcdir)/utils/misc/postgresql.conf.sample $(DESTDIR)$(datadir)/postgresql.conf.sample installdirs: $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(libdir) $(DESTDIR)$(datadir) diff --git a/src/backend/bootstrap/Makefile b/src/backend/bootstrap/Makefile index 12fdb9faf0..a89aa121e5 100644 --- a/src/backend/bootstrap/Makefile +++ b/src/backend/bootstrap/Makefile @@ -11,7 +11,7 @@ top_builddir = ../../.. include $(top_builddir)/src/Makefile.global ifeq ($(GCC), yes) -CFLAGS+= -Wno-error +override CFLAGS+= -Wno-error endif # qnx4's wlink currently crashes with bootstrap.o diff --git a/src/backend/catalog/Makefile b/src/backend/catalog/Makefile index 8809a092d8..62389eca1f 100644 --- a/src/backend/catalog/Makefile +++ b/src/backend/catalog/Makefile @@ -34,12 +34,15 @@ TEMPLATE1_BKI_SRCS := $(addprefix $(top_srcdir)/src/include/catalog/,\ pg_rewrite.h pg_listener.h pg_description.h indexing.h \ ) +pg_includes := $(sort -I$(top_srcdir)/src/include -I$(top_builddir)/src/include) -global.bki global.description: genbki.sh $(GLOBAL_BKI_SRCS) $(top_srcdir)/src/include/catalog/indexing.h - CPP='$(CPP)' AWK='$(AWK)' $(SHELL) $< $(BKIOPTS) -o global -I$(top_srcdir)/src/include $(GLOBAL_BKI_SRCS) +global.bki global.description: genbki.sh $(GLOBAL_BKI_SRCS) $(top_srcdir)/src/include/catalog/indexing.h \ + $(top_srcdir)/src/include/postgres_ext.h $(top_builddir)/src/include/config.h + CPP='$(CPP)' AWK='$(AWK)' $(SHELL) $< $(BKIOPTS) -o global $(pg_includes) $(GLOBAL_BKI_SRCS) -template1.bki template1.description: genbki.sh $(TEMPLATE1_BKI_SRCS) - CPP='$(CPP)' AWK='$(AWK)' $(SHELL) $< $(BKIOPTS) -o template1 -I$(top_srcdir)/src/include $(TEMPLATE1_BKI_SRCS) +template1.bki template1.description: genbki.sh $(TEMPLATE1_BKI_SRCS) \ + $(top_srcdir)/src/include/postgres_ext.h $(top_builddir)/src/include/config.h + CPP='$(CPP)' AWK='$(AWK)' $(SHELL) $< $(BKIOPTS) -o template1 $(pg_includes) $(TEMPLATE1_BKI_SRCS) .PHONY: install-bki install-bki: $(BKIFILES) installdirs diff --git a/src/backend/catalog/genbki.sh b/src/backend/catalog/genbki.sh index b2ee63256c..23ed07e873 100644 --- a/src/backend/catalog/genbki.sh +++ b/src/backend/catalog/genbki.sh @@ -25,7 +25,7 @@ CMDNAME=`basename $0` BKIOPTS= -INCLUDE_DIR= +INCLUDE_DIRS= OUTPUT_PREFIX= INFILES= @@ -42,10 +42,11 @@ do BKIOPTS="$BKIOPTS $1" ;; -I) - INCLUDE_DIR="$2" + INCLUDE_DIRS="$INCLUDE_DIRS $2" shift;; -I*) - INCLUDE_DIR=`echo $1 | sed -e 's/^-I//'` + arg=`echo $1 | sed -e 's/^-I//'` + INCLUDE_DIRS="$INCLUDE_DIRS $arg" ;; -o) OUTPUT_PREFIX="$2" @@ -91,7 +92,7 @@ if [ x"$OUTPUT_PREFIX" = x"" ] ; then exit 1 fi -if [ x"$INCLUDE_DIR" = x"" ] ; then +if [ x"$INCLUDE_DIRS" = x"" ] ; then echo "$CMDNAME: path to include directory unknown" 1>&2 exit 1 fi @@ -113,17 +114,27 @@ trap "rm -f $TMPFILE" 0 1 2 3 15 # Get NAMEDATALEN from postgres_ext.h -NAMEDATALEN=`grep '#define[ ]*NAMEDATALEN' $INCLUDE_DIR/postgres_ext.h | awk '{ print $3 }'` +for dir in $INCLUDE_DIRS; do + if [ -f "$dir/postgres_ext.h" ]; then + NAMEDATALEN=`grep '#define[ ]*NAMEDATALEN' $dir/postgres_ext.h | $AWK '{ print $3 }'` + break + fi +done # Get INDEX_MAX_KEYS from config.h (who needs consistency?) -INDEXMAXKEYS=`grep '#define[ ]*INDEX_MAX_KEYS' $INCLUDE_DIR/config.h | awk '{ print $3 }'` +for dir in $INCLUDE_DIRS; do + if [ -f "$dir/config.h" ]; then + INDEXMAXKEYS=`grep '#define[ ]*INDEX_MAX_KEYS' $dir/config.h | $AWK '{ print $3 }'` + break + fi +done # 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 # must be equal to the length of oidvector. -INDEXMAXKEYS2=`expr $INDEXMAXKEYS '*' 2` -INDEXMAXKEYS4=`expr $INDEXMAXKEYS '*' 4` +INDEXMAXKEYS2=`expr $INDEXMAXKEYS '*' 2` || exit +INDEXMAXKEYS4=`expr $INDEXMAXKEYS '*' 4` || exit # ---------------- # strip comments and trash from .h before we generate diff --git a/src/backend/parser/Makefile b/src/backend/parser/Makefile index cd753d69ec..0d537ba0d4 100644 --- a/src/backend/parser/Makefile +++ b/src/backend/parser/Makefile @@ -11,7 +11,7 @@ top_builddir = ../../.. include $(top_builddir)/src/Makefile.global ifeq ($(GCC), yes) -CFLAGS+= -Wno-error +override CFLAGS+= -Wno-error endif OBJS= analyze.o gram.o keywords.o parser.o parse_agg.o parse_clause.o \ diff --git a/src/backend/port/Makefile.in b/src/backend/port/Makefile.in index ec59fdc510..e9d0a2d566 100644 --- a/src/backend/port/Makefile.in +++ b/src/backend/port/Makefile.in @@ -46,7 +46,7 @@ beos.dir: $(MAKE) -C beos all tas.o: tas.s - $(CC) $(CFLAGS) -c tas.s + $(CC) $(CFLAGS) -c $< distclean clean: rm -f SUBSYS.o $(OBJS) diff --git a/src/backend/regex/Makefile b/src/backend/regex/Makefile index b550eba6dd..7828c12168 100644 --- a/src/backend/regex/Makefile +++ b/src/backend/regex/Makefile @@ -12,7 +12,7 @@ subdir = src/backend/regex top_builddir = ../../.. include $(top_builddir)/src/Makefile.global -CPPFLAGS += -DPOSIX_MISTAKE +override CPPFLAGS += -DPOSIX_MISTAKE DEBUGOBJ = @@ -28,7 +28,7 @@ SUBSYS.o: $(OBJS) $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS) retest: retest.o SUBSYS.o $(DEBUGOBJ) - $(CC) $(CFLAGS) -o retest retest.o SUBSYS.o $(DEBUGOBJ) + $(CC) -o $@ $^ $(CFLAGS) $(LDFLAGS) depend dep: $(CC) -MM $(CFLAGS) *.c >depend diff --git a/src/backend/storage/ipc/Makefile b/src/backend/storage/ipc/Makefile index ed9ec201cc..ec1b4e2905 100644 --- a/src/backend/storage/ipc/Makefile +++ b/src/backend/storage/ipc/Makefile @@ -11,7 +11,7 @@ include $(top_builddir)/src/Makefile.global # seems to be required 1999/07/22 bjm ifeq "$(findstring alpha,$(host_cpu))" "alpha" ifeq "$(GCC)" "yes" -CFLAGS+= -fno-inline +override CFLAGS+= -fno-inline endif endif diff --git a/src/backend/tioga/Makefile b/src/backend/tioga/Makefile index 846fb1a545..a9310e4ddd 100644 --- a/src/backend/tioga/Makefile +++ b/src/backend/tioga/Makefile @@ -13,7 +13,7 @@ top_builddir = ../../.. include $(top_builddir)/src/Makefile.global OBJS = tgRecipe.o Varray.o -CPPFLAGS += -I$(srcdir) +override CPPFLAGS += -I$(srcdir) all: SUBSYS.o diff --git a/src/backend/utils/adt/Makefile b/src/backend/utils/adt/Makefile index bc638577c1..b1c8d68b85 100644 --- a/src/backend/utils/adt/Makefile +++ b/src/backend/utils/adt/Makefile @@ -11,7 +11,7 @@ include $(top_builddir)/src/Makefile.global # seems to be required for some date/time stuff 1999/07/22 bjm ifeq "$(findstring alpha,$(host_cpu))" "alpha" ifeq "$(GCC)" "yes" -CFLAGS+= -mieee +override CFLAGS+= -mieee endif endif diff --git a/src/backend/utils/mb/Makefile b/src/backend/utils/mb/Makefile index e32c5b9018..c0ede2e3fc 100644 --- a/src/backend/utils/mb/Makefile +++ b/src/backend/utils/mb/Makefile @@ -20,48 +20,22 @@ all: SUBSYS.o SUBSYS.o: $(OBJS) $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS) -palloc.o: palloc.c - $(CC) -c $(CFLAGS) palloc.c - -sjistest.o: sjistest.c - $(CC) -c $(CFLAGS) sjistest.c - -liketest.o: liketest.c - $(CC) -c $(CFLAGS) liketest.c - -uconv.o: uconv.c - $(CC) -c $(CFLAGS) uconv.c - -uconv2.o: uconv2.c - $(CC) -c $(CFLAGS) uconv2.c - utftest.o: utftest.c conv.c wchar.c mbutils.c - $(CC) -c $(CFLAGS) utftest.c -sjistest: $(OBJS) sjistest.o palloc.o - $(CC) -o sjistest sjistest.o palloc.o \ - common.o mbutils.o wchar.o wstrcmp.o wstrncmp.o variable.o \ - big5.o $(LDFLAGS) +sjistest: sjistest.o palloc.o common.o mbutils.o wchar.o wstrcmp.o wstrncmp.o variable.o big5.o + $(CC) -o $@ $^ $(CFLAGS) $(LDFLAGS) -liketest: $(OBJS) liketest.o palloc.o - $(CC) -o liketest liketest.o palloc.o conv.o \ - common.o mbutils.o wchar.o wstrcmp.o wstrncmp.o variable.o \ - big5.o $(LDFLAGS) +liketest: liketest.o palloc.o $(OBJS) + $(CC) -o $@ $^ $(CFLAGS) $(LDFLAGS) -utftest: $(OBJS) utftest.o palloc.o - $(CC) -o utftest utftest.o palloc.o \ - common.o wstrcmp.o wstrncmp.o variable.o \ - big5.o $(LDFLAGS) +utftest: utftest.o palloc.o common.o wstrcmp.o wstrncmp.o variable.o big5.o + $(CC) -o $@ $^ $(CFLAGS) $(LDFLAGS) -uconv: uconv.o palloc.o - $(CC) -o uconv uconv.o palloc.o \ - common.o conv.o wchar.o \ - big5.o mbutils.o $(LDFLAGS) +uconv: uconv.o palloc.o common.o conv.o wchar.o big5.o mbutils.o + $(CC) -o $@ $^ $(CFLAGS) $(LDFLAGS) -uconv2: uconv2.o palloc.o - $(CC) -o uconv2 uconv2.o palloc.o \ - common.o conv.o wchar.o \ - big5.o mbutils.o $(LDFLAGS) +uconv2: uconv2.o palloc.o common.o conv.o wchar.o big5.o mbutils.o + $(CC) -o $@ $^ $(CFLAGS) $(LDFLAGS) depend dep: $(CC) -MM $(CFLAGS) *.c >depend diff --git a/src/backend/utils/misc/Makefile b/src/backend/utils/misc/Makefile index 719df8e142..d35b0ed834 100644 --- a/src/backend/utils/misc/Makefile +++ b/src/backend/utils/misc/Makefile @@ -9,7 +9,7 @@ OBJS = database.o superuser.o guc.o guc-file.o ps_status.o # This location might depend on the installation directories. Therefore # we can't subsitute it into config.h. ifdef krb_srvtab -CPPFLAGS += -DPG_KRB_SRVTAB='"$(krb_srvtab)"' +override CPPFLAGS += -DPG_KRB_SRVTAB='"$(krb_srvtab)"' endif @@ -18,7 +18,7 @@ all: SUBSYS.o SUBSYS.o: $(OBJS) $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS) -guc-file.c: guc-file.l +$(srcdir)/guc-file.c: guc-file.l ifdef FLEX $(FLEX) $(FLEXFLAGS) $< sed -e 's/^yy/GUC_yy/g' -e 's/\([^a-zA-Z0-9_]\)yy/\1GUC_yy/g' lex.yy.c > $@ diff --git a/src/bin/pg_dump/Makefile b/src/bin/pg_dump/Makefile index 1cb345ddbf..fdb779d285 100644 --- a/src/bin/pg_dump/Makefile +++ b/src/bin/pg_dump/Makefile @@ -15,8 +15,7 @@ include $(top_builddir)/src/Makefile.global OBJS= pg_backup_archiver.o pg_backup_db.o pg_backup_custom.o pg_backup_files.o \ pg_backup_null.o pg_backup_tar.o $(STRDUP) -CPPFLAGS+= -I$(libpq_srcdir) -LIBS+= -lz +override CPPFLAGS+= -I$(libpq_srcdir) all: submake pg_dump pg_restore pg_dumpall @@ -44,7 +43,7 @@ install: all installdirs $(INSTALL_PROGRAM) pg_dump$(X) $(DESTDIR)$(bindir)/pg_dump$(X) $(INSTALL_PROGRAM) pg_restore$(X) $(DESTDIR)$(bindir)/pg_restore$(X) $(INSTALL_SCRIPT) pg_dumpall $(DESTDIR)$(bindir)/pg_dumpall - $(INSTALL_SCRIPT) pg_upgrade $(DESTDIR)$(bindir)/pg_upgrade + $(INSTALL_SCRIPT) $(srcdir)/pg_upgrade $(DESTDIR)$(bindir)/pg_upgrade installdirs: $(mkinstalldirs) $(DESTDIR)$(bindir) diff --git a/src/bin/pgaccess/Makefile b/src/bin/pgaccess/Makefile index 6b94736e1d..70bd7024d9 100644 --- a/src/bin/pgaccess/Makefile +++ b/src/bin/pgaccess/Makefile @@ -24,11 +24,11 @@ pgaccess: pgaccess.sh $(top_builddir)/src/Makefile.global install: all installdirs $(INSTALL_SCRIPT) pgaccess $(DESTDIR)$(bindir)/pgaccess - $(INSTALL_SCRIPT) main.tcl $(DESTDIR)$(pgaccessdir) - for i in lib/*.tcl; do $(INSTALL_DATA) $$i $(DESTDIR)$(pgaccessdir)/lib || exit 1; done - for i in lib/help/*.hlp; do $(INSTALL_DATA) $$i $(DESTDIR)$(pgaccessdir)/lib/help || exit 1; done - for i in lib/languages/[a-z]*; do $(INSTALL_DATA) $$i $(DESTDIR)$(pgaccessdir)/lib/languages || exit 1; done - for i in images/*.gif; do $(INSTALL_DATA) $$i $(DESTDIR)$(pgaccessdir)/images || exit 1; done + $(INSTALL_SCRIPT) $(srcdir)/main.tcl $(DESTDIR)$(pgaccessdir) + for i in $(srcdir)/lib/*.tcl; do $(INSTALL_DATA) $$i $(DESTDIR)$(pgaccessdir)/lib || exit 1; done + for i in $(srcdir)/lib/help/*.hlp; do $(INSTALL_DATA) $$i $(DESTDIR)$(pgaccessdir)/lib/help || exit 1; done + for i in $(srcdir)/lib/languages/[a-z]*; do $(INSTALL_DATA) $$i $(DESTDIR)$(pgaccessdir)/lib/languages || exit 1; done + for i in $(srcdir)/images/*.gif; do $(INSTALL_DATA) $$i $(DESTDIR)$(pgaccessdir)/images || exit 1; done installdirs: $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(pgaccessdir)/lib/help $(DESTDIR)$(pgaccessdir)/lib/languages $(DESTDIR)$(pgaccessdir)/images diff --git a/src/bin/pgtclsh/Makefile b/src/bin/pgtclsh/Makefile index 4137e63cdc..b25246a4e9 100644 --- a/src/bin/pgtclsh/Makefile +++ b/src/bin/pgtclsh/Makefile @@ -25,7 +25,7 @@ libpgtcl_srcdir = $(top_srcdir)/src/interfaces/libpgtcl libpgtcl_builddir = $(top_builddir)/src/interfaces/libpgtcl libpgtcl = -L$(libpgtcl_builddir) -lpgtcl -CPPFLAGS += -I$(libpgtcl_srcdir) $(TK_XINCLUDES) +override CPPFLAGS += -I$(libpgtcl_srcdir) $(TK_XINCLUDES) # If we are here then Tcl is available diff --git a/src/bin/psql/Makefile b/src/bin/psql/Makefile index e0a289339e..3e97b8d746 100644 --- a/src/bin/psql/Makefile +++ b/src/bin/psql/Makefile @@ -14,7 +14,7 @@ include $(top_builddir)/src/Makefile.global REFDOCDIR= $(top_srcdir)/doc/src/sgml/ref -CPPFLAGS+= -I$(libpq_srcdir) +override CPPFLAGS+= -I$(libpq_srcdir) OBJS=command.o common.o help.o input.o stringutils.o mainloop.o \ copy.o startup.o prompt.o variables.o large_obj.o print.o describe.o \ @@ -83,7 +83,7 @@ clean distclean: rm -f psql$(X) $(OBJS) maintainer-clean: distclean - rm -f sql_help.h + rm -f $(srcdir)/sql_help.h ifeq (depend,$(wildcard depend)) include depend diff --git a/src/bin/scripts/Makefile b/src/bin/scripts/Makefile index f241a33759..8c50ed8ca5 100644 --- a/src/bin/scripts/Makefile +++ b/src/bin/scripts/Makefile @@ -23,7 +23,10 @@ createlang: createlang.sh chmod a+x $@ install: all installdirs - for i in $(SCRIPTS); do $(INSTALL_SCRIPT) $$i $(DESTDIR)$(bindir)/$$i || exit; done + for i in $(filter-out createlang, $(SCRIPTS)); do \ + $(INSTALL_SCRIPT) $(srcdir)/$$i $(DESTDIR)$(bindir)/$$i || exit; \ + done + $(INSTALL_SCRIPT) createlang $(DESTDIR)$(bindir)/createlang installdirs: $(mkinstalldirs) $(DESTDIR)$(bindir) diff --git a/src/include/Makefile b/src/include/Makefile index c54cc1e449..686d44c9b2 100644 --- a/src/include/Makefile +++ b/src/include/Makefile @@ -14,11 +14,15 @@ top_builddir = ../.. include $(top_builddir)/src/Makefile.global -HEADERS := os.h config.h c.h postgres.h postgres_ext.h fmgr.h \ +srcdir_headers := c.h postgres.h postgres_ext.h fmgr.h \ libpq/pqcomm.h libpq/libpq-fs.h lib/dllist.h \ - utils/geo_decls.h utils/elog.h utils/fmgroids.h utils/palloc.h \ + utils/geo_decls.h utils/elog.h utils/palloc.h \ access/attnum.h executor/spi.h commands/trigger.h +builddir_headers := os.h config.h utils/fmgroids.h + +HEADERS = $(srcdir_headers) $(builddir_headers) + all: $(HEADERS) @@ -35,8 +39,11 @@ $(top_builddir)/src/backend/utils/fmgroids.h: $(top_srcdir)/src/backend/utils/Ge install: all installdirs - for i in $(HEADERS); do \ - $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(includedir)/$$i || exit; \ + for file in $(srcdir_headers); do \ + $(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(includedir)/$$file || exit; \ + done + for file in $(builddir_headers); do \ + $(INSTALL_DATA) $$file $(DESTDIR)$(includedir)/$$file || exit; \ done # Automatically pick out the needed subdirectories for the include diff --git a/src/interfaces/ecpg/lib/Makefile b/src/interfaces/ecpg/lib/Makefile index 4fd45514a2..c0f9c0512a 100644 --- a/src/interfaces/ecpg/lib/Makefile +++ b/src/interfaces/ecpg/lib/Makefile @@ -16,7 +16,7 @@ NAME= ecpg SO_MAJOR_VERSION= 3 SO_MINOR_VERSION= 2.0 -CPPFLAGS += -I$(top_srcdir)/src/interfaces/ecpg/include -I$(libpq_srcdir) +override CPPFLAGS += -I$(top_srcdir)/src/interfaces/ecpg/include -I$(libpq_srcdir) OBJS= execute.o typename.o descriptor.o data.o error.o prepare.o memory.o \ diff --git a/src/interfaces/ecpg/preproc/Makefile b/src/interfaces/ecpg/preproc/Makefile index b2ab66ef34..048a13080c 100644 --- a/src/interfaces/ecpg/preproc/Makefile +++ b/src/interfaces/ecpg/preproc/Makefile @@ -6,7 +6,7 @@ MAJOR_VERSION=2 MINOR_VERSION=8 PATCHLEVEL=0 -CPPFLAGS+=-I../include -DMAJOR_VERSION=$(MAJOR_VERSION) \ +override CPPFLAGS+=-I$(srcdir)/../include -DMAJOR_VERSION=$(MAJOR_VERSION) \ -DMINOR_VERSION=$(MINOR_VERSION) -DPATCHLEVEL=$(PATCHLEVEL) \ -DINCLUDE_PATH=\"$(includedir)\" diff --git a/src/interfaces/libpgeasy/Makefile b/src/interfaces/libpgeasy/Makefile index 0d7949f1bf..2e02dad393 100644 --- a/src/interfaces/libpgeasy/Makefile +++ b/src/interfaces/libpgeasy/Makefile @@ -16,7 +16,7 @@ NAME= pgeasy SO_MAJOR_VERSION= 2 SO_MINOR_VERSION= 1 -CPPFLAGS += -I$(libpq_srcdir) +override CPPFLAGS += -I$(libpq_srcdir) OBJS= libpgeasy.o halt.o diff --git a/src/interfaces/libpgtcl/Makefile b/src/interfaces/libpgtcl/Makefile index 98ff116fb7..eea829b7aa 100644 --- a/src/interfaces/libpgtcl/Makefile +++ b/src/interfaces/libpgtcl/Makefile @@ -16,7 +16,7 @@ NAME= pgtcl SO_MAJOR_VERSION= 2 SO_MINOR_VERSION= 1 -CPPFLAGS += -I$(libpq_srcdir) +override CPPFLAGS += -I$(libpq_srcdir) OBJS= pgtcl.o pgtclCmds.o pgtclId.o diff --git a/src/interfaces/libpq++/Makefile b/src/interfaces/libpq++/Makefile index 8fee31b8d3..cb634b5de5 100644 --- a/src/interfaces/libpq++/Makefile +++ b/src/interfaces/libpq++/Makefile @@ -16,8 +16,7 @@ NAME= pq++ SO_MAJOR_VERSION= 3 SO_MINOR_VERSION= 1 -SRCHEADERDIR = $(top_srcdir)/src/include -CXXFLAGS+= -I$(SRCHEADERDIR) -I$(libpq_srcdir) +override CPPFLAGS += -I$(libpq_srcdir) OBJS = pgconnection.o pgdatabase.o pgtransdb.o pgcursordb.o pglobject.o @@ -29,35 +28,29 @@ endif # For CC on IRIX, must use CC as linker/archiver of C++ libraries ifeq ($(PORTNAME), irix5) - ifeq ($(CXX), CC) + ifneq ($(GXX), yes) AR := CC AROPT := -ar -o LD := CC endif endif # Same for Solaris with native compiler -ifeq ($(PORTNAME), solaris_sparc) - ifeq ($(CXX), CC) - AR := CC - AROPT := -xar -o - LD := CC - endif -endif -ifeq ($(PORTNAME), solaris_i386) - ifeq ($(CXX), CC) +ifeq ($(PORTNAME), solaris) + ifneq ($(GXX), yes) AR := CC AROPT := -xar -o LD := CC endif endif + all: all-lib # Shared library stuff -include $(top_builddir)/src/Makefile.shlib +include $(top_srcdir)/src/Makefile.shlib # Pull shared-lib CFLAGS into CXXFLAGS -CXXFLAGS+= $(CFLAGS_SL) +override CXXFLAGS+= $(CFLAGS_SL) .PHONY: examples @@ -88,7 +81,7 @@ clean distclean maintainer-clean: clean-lib dep depend: - $(CXX) -MM $(CXXFLAGS) *.cc >depend + $(CXX) -MM $(CPPFLAGS) $(CXXFLAGS) *.cc >depend ifeq (depend,$(wildcard depend)) include depend diff --git a/src/interfaces/libpq/Makefile b/src/interfaces/libpq/Makefile index 4f2245bf56..395dbe8937 100644 --- a/src/interfaces/libpq/Makefile +++ b/src/interfaces/libpq/Makefile @@ -17,7 +17,7 @@ NAME= pq SO_MAJOR_VERSION= 2 SO_MINOR_VERSION= 1 -CFLAGS += -DFRONTEND -I$(srcdir) -DSYSCONFDIR='"$(sysconfdir)"' +override CPPFLAGS += -DFRONTEND -I$(srcdir) -DSYSCONFDIR='"$(sysconfdir)"' OBJS= fe-auth.o fe-connect.o fe-exec.o fe-misc.o fe-print.o fe-lobj.o \ pqexpbuffer.o dllist.o pqsignal.o $(SNPRINTF) $(INET_ATON) @@ -77,7 +77,7 @@ installdirs: $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) uninstall: uninstall-lib - rm -f $(addprefix ($DESTDIR)$(includedir)/, libpq-fe.h libpq-int.h pqexpbuffer.h) + rm -f $(addprefix $(DESTDIR)$(includedir)/, libpq-fe.h libpq-int.h pqexpbuffer.h) clean distclean maintainer-clean: clean-lib rm -f $(OBJS) dllist.c snprintf.c inet_aton.c common.c wchar.c conv.c big5.c diff --git a/src/interfaces/odbc/GNUmakefile b/src/interfaces/odbc/GNUmakefile index 721f51936d..92e8b2ab57 100644 --- a/src/interfaces/odbc/GNUmakefile +++ b/src/interfaces/odbc/GNUmakefile @@ -15,7 +15,7 @@ NAME = psqlodbc SO_MAJOR_VERSION = 0 SO_MINOR_VERSION = 26 -CPPFLAGS += -I$(srcdir) -DHAVE_CONFIG_H -DODBCINSTDIR='"$(odbcinst_ini_dir)"' +override CPPFLAGS += -I$(srcdir) -DHAVE_CONFIG_H -DODBCINSTDIR='"$(odbcinst_ini_dir)"' OBJS = info.o bind.o columninfo.o connection.o convert.o drvconn.o \ @@ -35,23 +35,15 @@ LDFLAGS_SL+= $(LDFLAGS_ODBC) odbc_headers = isql.h isqlext.h iodbc.h odbc_includedir = $(includedir)/iodbc -install: all installdirs install-headers install-ini install-lib install-data +install: all installdirs + for i in $(odbc_headers); do $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(odbc_includedir)/$$i || exit 1; done + $(INSTALL_DATA) $(srcdir)/odbcinst.ini $(DESTDIR)$(odbcinst_ini_dir)/odbcinst.ini + $(INSTALL_DATA) $(srcdir)/odbc.sql $(DESTDIR)$(datadir)/odbc.sql + $(MAKE) install-lib installdirs: $(mkinstalldirs) $(DESTDIR)$(odbc_includedir) $(DESTDIR)$(libdir) $(DESTDIR)$(odbcinst_ini_dir) $(DESTDIR)$(datadir) -.PHONY: install-headers -install-headers: $(odbc_headers) - for i in $^; do $(INSTALL_DATA) $$i $(DESTDIR)$(odbc_includedir)/$$i || exit 1; done - -.PHONY: install-ini -install-ini: odbcinst.ini - $(INSTALL_DATA) $< $(DESTDIR)$(odbcinst_ini_dir)/$< - -.PHONY: install-data -install-data: odbc.sql - $(INSTALL_DATA) $< $(DESTDIR)$(datadir)/$< - uninstall: uninstall-lib rm -f $(addprefix $(DESTDIR)$(odbc_includedir)/, $(odbc_headers)) rm -f $(DESTDIR)$(datadir)/odbc.sql diff --git a/src/makefiles/Makefile.irix5 b/src/makefiles/Makefile.irix5 index 2dec27246b..fcc72602e7 100644 --- a/src/makefiles/Makefile.irix5 +++ b/src/makefiles/Makefile.irix5 @@ -6,4 +6,5 @@ MK_NO_LORDER= true %.so: %.o $(LD) -G -Bdynamic -shared -o $@ $< -CFLAGS+= -U_NO_XOPEN4 -woff 1164,1171,1185,1195,1552 -Wl,-woff,15 -Wl,-woff,84 +override CPPFLAGS += -U_NO_XOPEN4 +override CFLAGS += -woff 1164,1171,1185,1195,1552 -Wl,-woff,15 -Wl,-woff,84 diff --git a/src/makefiles/Makefile.sco b/src/makefiles/Makefile.sco index f2e6108a08..0cc90f9fd9 100644 --- a/src/makefiles/Makefile.sco +++ b/src/makefiles/Makefile.sco @@ -1,4 +1,4 @@ -CFLAGS += -dy +override CFLAGS += -dy export_dynamic = -W l,-Bexport %.so: %.o diff --git a/src/makefiles/Makefile.ultrix4 b/src/makefiles/Makefile.ultrix4 index b56aee6c68..d71b474a24 100644 --- a/src/makefiles/Makefile.ultrix4 +++ b/src/makefiles/Makefile.ultrix4 @@ -1,9 +1,7 @@ -# install creates intermediate directories -NO_BEFOREINSTL= true SHELL=/bin/sh5 # # "-G 0" works for both DEC cc and GNU cc. # %.so: %.c - $(CC) -c -G 0 $(CFLAGS) -o $@ $< + $(CC) -c -G 0 $(CPPFLAGS) $(CFLAGS) -o $@ $< diff --git a/src/makefiles/Makefile.win b/src/makefiles/Makefile.win index 3869d8b605..170bfbdf90 100644 --- a/src/makefiles/Makefile.win +++ b/src/makefiles/Makefile.win @@ -18,5 +18,5 @@ LIBS:=$(filter-out -lm -lc, $(LIBS)) curdir:=$(shell pwd) ifeq ($(findstring backend,$(curdir)), backend) -CPPFLAGS+= -DBUILDING_DLL=1 +override CPPFLAGS+= -DBUILDING_DLL=1 endif diff --git a/src/pl/plpgsql/src/Makefile b/src/pl/plpgsql/src/Makefile index 8331c05f98..748b3670e3 100644 --- a/src/pl/plpgsql/src/Makefile +++ b/src/pl/plpgsql/src/Makefile @@ -15,7 +15,7 @@ NAME= plpgsql SO_MAJOR_VERSION= 1 SO_MINOR_VERSION= 0 -CPPFLAGS += -I$(srcdir) +override CPPFLAGS += -I$(srcdir) OBJS = pl_parse.o pl_handler.o pl_comp.o pl_exec.o pl_funcs.o diff --git a/src/pl/tcl/Makefile b/src/pl/tcl/Makefile index 4fb7c7c138..c616d2dd08 100644 --- a/src/pl/tcl/Makefile +++ b/src/pl/tcl/Makefile @@ -62,18 +62,15 @@ CC = $(TCL_CC) # Can choose either TCL_CFLAGS_OPTIMIZE or TCL_CFLAGS_DEBUG here, as # needed -CFLAGS= $(TCL_CFLAGS_OPTIMIZE) - -CFLAGS+= $(TCL_SHLIB_CFLAGS) $(TCL_DEFS) - -CFLAGS+= -I$(top_srcdir)/src/include $(INCLUDES) +override CPPFLAGS += $(TCL_DEFS) +override CFLAGS = $(TCL_CFLAGS_OPTIMIZE) $(TCL_SHLIB_CFLAGS) # Uncomment the following to enable the unknown command lookup on the # first of all calls to the call handler. See the doc in the modules # directory about details. -#CFLAGS+= -DPLTCL_UNKNOWN_SUPPORT +#override CPPFLAGS+= -DPLTCL_UNKNOWN_SUPPORT # @@ -90,6 +87,10 @@ ifdef EXPSUFF INFILES+= $(DLOBJS:.o=$(EXPSUFF)) endif +# Prevent removal of pltcl.o, being an intermediate file. This would +# not be wrong in general, but for some reason the next make run will +# not realize this and rebuild it. +.SECONDARY: pltcl.o # Provide dummy targets for the case where we can't build the shared library. diff --git a/src/test/bench/Makefile b/src/test/bench/Makefile index 58b7df2ad8..e8093f251a 100644 --- a/src/test/bench/Makefile +++ b/src/test/bench/Makefile @@ -18,7 +18,8 @@ include $(top_builddir)/src/Makefile.global CREATEFILES= create.sql bench.sql OUTFILES= bench.out bench.out.perquery -CFLAGS+= -I$(libpq_srcdir) $(CFLAGS_SL) +override CPPFLAGS += -I$(libpq_srcdir) +override CFLAGS += $(CFLAGS_SL) all: $(CREATEFILES) diff --git a/src/test/examples/Makefile b/src/test/examples/Makefile index 9dd159e2f2..b07c84efe5 100644 --- a/src/test/examples/Makefile +++ b/src/test/examples/Makefile @@ -6,9 +6,8 @@ subdir = src/test/examples top_builddir = ../../.. include $(top_builddir)/src/Makefile.global -CPPFLAGS+= -I$(libpq_srcdir) - -LDFLAGS+= $(libpq) +override CPPFLAGS+= -I$(libpq_srcdir) +LIBS += $(libpq) # PROGS= testlibpq0 testlibpq1 testlibpq2 testlibpq3 testlibpq4 testlo @@ -16,8 +15,5 @@ PROGS = testlibpq testlibpq2 testlibpq3 testlibpq4 testlo testlo2 all: $(PROGS) -$(PROGS): % : %.c - $(CC) $(CFLAGS) -o $@ [email protected] $(LDFLAGS) - clean: rm -f $(PROGS) diff --git a/src/test/locale/Makefile b/src/test/locale/Makefile index eed94c6bc7..bfdd8e7c64 100644 --- a/src/test/locale/Makefile +++ b/src/test/locale/Makefile @@ -10,9 +10,6 @@ DIRS = koi8-r ISO8859-7 koi8-to-win1251 all: $(PROGS) -$(PROGS): % : %.c - $(CC) $(CFLAGS) -o $@ [email protected] $(LDFLAGS) - clean: rm -f $(PROGS) *.out for d in $(DIRS); do \ diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile index 50f25d1ca9..bf8e2e6f4e 100644 --- a/src/test/regress/GNUmakefile +++ b/src/test/regress/GNUmakefile @@ -17,9 +17,8 @@ include $(top_builddir)/src/Makefile.global contribdir := $(top_builddir)/contrib -CFLAGS+= -I$(libpq_srcdir) $(CFLAGS_SL) - -LDADD+= $(libpq) +override CPPFLAGS += -I$(libpq_srcdir) +override CFLAGS += $(CFLAGS_SL) ## diff --git a/src/tutorial/Makefile b/src/tutorial/Makefile index 500d4e7523..976ace5d19 100644 --- a/src/tutorial/Makefile +++ b/src/tutorial/Makefile @@ -12,7 +12,7 @@ subdir = src/tutorial top_builddir = ../.. include $(top_builddir)/src/Makefile.global -CFLAGS+= $(CFLAGS_SL) +override CFLAGS+= $(CFLAGS_SL) # # DLOBJS is the dynamically-loaded object files. The "funcs" queries |