diff options
39 files changed, 605 insertions, 656 deletions
diff --git a/configure b/configure index 97af299a7e2..6e0318c8de3 100755 --- a/configure +++ b/configure @@ -71,6 +71,10 @@ ac_help="$ac_help ac_help="$ac_help --enable-odbc build the ODBC driver package" ac_help="$ac_help + --with-unixodbc build ODBC driver for unixODBC" +ac_help="$ac_help + --with-iodbc build ODBC driver for iODBC" +ac_help="$ac_help --with-odbcinst=DIR default directory for odbcinst.ini [sysconfdir]" ac_help="$ac_help --with-CXX build C++ modules (libpq++)" @@ -631,7 +635,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:635: checking host system type" >&5 +echo "configure:639: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -657,7 +661,7 @@ echo "$ac_t""$host" 1>&6 template= echo $ac_n "checking which template to use""... $ac_c" 1>&6 -echo "configure:661: checking which template to use" >&5 +echo "configure:665: checking which template to use" >&5 # Check whether --with-template was given if test x"${with_template+set}" = xset; then @@ -820,7 +824,7 @@ fi # Locale (--enable-locale) # echo $ac_n "checking whether to build with locale support""... $ac_c" 1>&6 -echo "configure:824: checking whether to build with locale support" >&5 +echo "configure:828: 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 @@ -849,7 +853,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:853: checking whether to build with recode support" >&5 +echo "configure:857: 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 @@ -879,7 +883,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:883: checking whether to build with multibyte character support" >&5 +echo "configure:887: checking whether to build with multibyte character support" >&5 # Check whether --enable-multibyte was given if test x"${enable_multibyte+set}" = xset; then @@ -931,7 +935,7 @@ fi # NLS # echo $ac_n "checking whether NLS is wanted""... $ac_c" 1>&6 -echo "configure:935: checking whether NLS is wanted" >&5 +echo "configure:939: checking whether NLS is wanted" >&5 # Check whether --enable-nls was given if test x"${enable_nls+set}" = xset; then case $enable_nls in @@ -966,7 +970,7 @@ echo "$ac_t""$enable_nls" 1>&6 # Default port number (--with-pgport), default 5432 # echo $ac_n "checking for default port number""... $ac_c" 1>&6 -echo "configure:970: checking for default port number" >&5 +echo "configure:974: checking for default port number" >&5 # Check whether --with-pgport was given if test x"${with_pgport+set}" = xset; then case $with_pgport in @@ -1000,7 +1004,7 @@ EOF # Maximum number of allowed connections (--with-maxbackends), default 32 # echo $ac_n "checking for default soft limit on number of connections""... $ac_c" 1>&6 -echo "configure:1004: checking for default soft limit on number of connections" >&5 +echo "configure:1008: 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 @@ -1124,7 +1128,7 @@ save_CFLAGS=$CFLAGS # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1128: checking for $ac_word" >&5 +echo "configure:1132: 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 @@ -1154,7 +1158,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:1158: checking for $ac_word" >&5 +echo "configure:1162: 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 @@ -1205,7 +1209,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:1209: checking for $ac_word" >&5 +echo "configure:1213: 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 @@ -1237,7 +1241,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1241: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1245: 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. @@ -1248,12 +1252,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1252 "configure" +#line 1256 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1261: \"$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 @@ -1279,12 +1283,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:1283: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1287: 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:1288: checking whether we are using GNU C" >&5 +echo "configure:1292: 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 @@ -1293,7 +1297,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1297: \"$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:1301: \"$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 @@ -1312,7 +1316,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:1316: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1320: 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 @@ -1355,7 +1359,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:1359: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1363: 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. @@ -1366,12 +1370,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1370 "configure" +#line 1374 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1379: \"$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 @@ -1397,17 +1401,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:1401: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1405: 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:1406: checking for Cygwin environment" >&5 +echo "configure:1410: 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 1411 "configure" +#line 1415 "configure" #include "confdefs.h" int main() { @@ -1418,7 +1422,7 @@ int main() { return __CYGWIN__; ; return 0; } EOF -if { (eval echo configure:1422: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1426: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -1435,19 +1439,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:1439: checking for mingw32 environment" >&5 +echo "configure:1443: 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 1444 "configure" +#line 1448 "configure" #include "confdefs.h" int main() { return __MINGW32__; ; return 0; } EOF -if { (eval echo configure:1451: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1455: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -1466,7 +1470,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=yes echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1470: checking for executable suffix" >&5 +echo "configure:1474: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1476,7 +1480,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1484: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -1497,7 +1501,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:1501: checking how to run the C preprocessor" >&5 +echo "configure:1505: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1512,13 +1516,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 1516 "configure" +#line 1520 "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:1522: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1526: \"$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 : @@ -1529,13 +1533,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 1533 "configure" +#line 1537 "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:1539: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1543: \"$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 : @@ -1546,13 +1550,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext <<EOF -#line 1550 "configure" +#line 1554 "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:1556: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1560: \"$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 : @@ -1578,13 +1582,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:1582: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:1586: 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 1588 "configure" +#line 1592 "configure" #include "confdefs.h" #include <sgtty.h> Autoconf TIOCGETP @@ -1602,7 +1606,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext <<EOF -#line 1606 "configure" +#line 1610 "configure" #include "confdefs.h" #include <termio.h> Autoconf TCGETA @@ -1724,7 +1728,7 @@ IFS=$ac_save_IFS # Tcl/Tk # echo $ac_n "checking whether to build with Tcl""... $ac_c" 1>&6 -echo "configure:1728: checking whether to build with Tcl" >&5 +echo "configure:1732: 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 @@ -1748,7 +1752,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:1752: checking whether to build with Tk" >&5 +echo "configure:1756: 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 @@ -1810,7 +1814,7 @@ fi # If Tcl is enabled (above) then check for pltcl_unknown_support # echo $ac_n "checking whether to build with PL/Tcl unknown support""... $ac_c" 1>&6 -echo "configure:1814: checking whether to build with PL/Tcl unknown support" >&5 +echo "configure:1818: checking whether to build with PL/Tcl unknown support" >&5 if test "$with_tcl" = yes; then # Check whether --enable-pltcl-unknown was given if test x"${enable_pltcl_unknown+set}" = xset; then @@ -1844,7 +1848,7 @@ echo "$ac_t""$enable_pltcl_unknown" 1>&6 # If Tcl is enabled (above) then check for pltcl_utf # echo $ac_n "checking whether to build with PL/Tcl with UTF support""... $ac_c" 1>&6 -echo "configure:1848: checking whether to build with PL/Tcl with UTF support" >&5 +echo "configure:1852: checking whether to build with PL/Tcl with UTF support" >&5 if test "$with_tcl" = yes; then # Check whether --enable-pltcl-utf was given if test x"${enable_pltcl_utf+set}" = xset; then @@ -1878,7 +1882,7 @@ echo "$ac_t""$enable_pltcl_utf" 1>&6 # Optionally build Perl modules (Pg.pm and PL/Perl) # echo $ac_n "checking whether to build Perl modules""... $ac_c" 1>&6 -echo "configure:1882: checking whether to build Perl modules" >&5 +echo "configure:1886: 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 @@ -1904,7 +1908,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:1908: checking whether to build Python modules" >&5 +echo "configure:1912: 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 @@ -1930,7 +1934,7 @@ echo "$ac_t""$with_python" 1>&6 # Optionally build the Java/JDBC tools # echo $ac_n "checking whether to build Java/JDBC tools""... $ac_c" 1>&6 -echo "configure:1934: checking whether to build Java/JDBC tools" >&5 +echo "configure:1938: checking whether to build Java/JDBC tools" >&5 # Check whether --with-java was given if test x"${with_java+set}" = xset; then case $with_java in @@ -1942,7 +1946,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:1946: checking for $ac_word" >&5 +echo "configure:1950: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_ANT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1979,7 +1983,7 @@ done echo $ac_n "checking whether $ANT works""... $ac_c" 1>&6 -echo "configure:1983: checking whether $ANT works" >&5 +echo "configure:1987: checking whether $ANT works" >&5 if eval "test \"`echo '$''{'pgac_cv_prog_ant_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2002,7 +2006,7 @@ EOF EOF pgac_cmd='$ANT -buildfile conftest.xml 1>&2' - { (eval echo configure:2006: \"$pgac_cmd\") 1>&5; (eval $pgac_cmd) 2>&5; } + { (eval echo configure:2010: \"$pgac_cmd\") 1>&5; (eval $pgac_cmd) 2>&5; } pgac_save_status=$? if test $? = 0 && test -f ./conftest.class ; then pgac_cv_prog_ant_works=yes @@ -2168,7 +2172,7 @@ EOF # PAM # echo $ac_n "checking whether to build with PAM support""... $ac_c" 1>&6 -echo "configure:2172: checking whether to build with PAM support" >&5 +echo "configure:2176: checking whether to build with PAM support" >&5 # Check whether --with-pam was given if test x"${with_pam+set}" = xset; then case $with_pam in @@ -2259,7 +2263,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:2263: checking whether to build the ODBC driver" >&5 +echo "configure:2267: 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 @@ -2278,7 +2282,62 @@ else enable_odbc=no fi -echo "$ac_t""$enable_odbc" 1>&6 +# Check whether --with-unixodbc was given +if test x"${with_unixodbc+set}" = xset; then + case $with_unixodbc in + yes) + : + ;; + no) + : + ;; + *) + withval=$with_unixodbc + { echo "configure: error: no argument expected for --with-unixodbc option" 1>&2; exit 1; } + ;; + esac # $with_unixodbc +else + with_unixodbc=no + +fi +# Check whether --with-iodbc was given +if test x"${with_iodbc+set}" = xset; then + case $with_iodbc in + yes) + : + ;; + no) + : + ;; + *) + withval=$with_iodbc + { echo "configure: error: no argument expected for --with-iodbc option" 1>&2; exit 1; } + ;; + esac # $with_iodbc +else + with_iodbc=no + +fi +if test "$with_unixodbc" = yes && test "$with_iodbc" = yes; then + { echo "configure: error: ODBC driver cannot be built for both unixODBC and iODBC" 1>&2; exit 1; } +fi +if test "$with_unixodbc" = yes || test "$with_iodbc" = yes; then + enable_odbc=yes +fi +case $enable_odbc:$with_unixodbc:$with_iodbc in + yes:no:no) echo "$ac_t""yes (stand-alone)" 1>&6;; + yes:yes:no) echo "$ac_t""yes (unixODBC)" 1>&6; cat >> confdefs.h <<\EOF +#define WITH_UNIXODBC 1 +EOF +;; + yes:no:yes) echo "$ac_t""yes (iODBC)" 1>&6; cat >> confdefs.h <<\EOF +#define WITH_IODBC 1 +EOF +;; + no:*) echo "$ac_t""no" 1>&6;; +esac + + @@ -2313,7 +2372,7 @@ case $host_os in esac cat > conftest.$ac_ext <<EOF -#line 2317 "configure" +#line 2376 "configure" #include "confdefs.h" #if __ELF__ yes @@ -2342,7 +2401,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:2346: checking whether to build C++ modules" >&5 +echo "configure:2405: 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 @@ -2375,7 +2434,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:2379: checking for $ac_word" >&5 +echo "configure:2438: 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 @@ -2407,7 +2466,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:2411: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:2470: 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. @@ -2418,12 +2477,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 2422 "configure" +#line 2481 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:2427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2486: \"$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 @@ -2449,12 +2508,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:2453: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:2512: 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:2458: checking whether we are using GNU C++" >&5 +echo "configure:2517: 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 @@ -2463,7 +2522,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2467: \"$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:2526: \"$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 @@ -2482,7 +2541,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:2486: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:2545: 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 @@ -2530,7 +2589,7 @@ fi echo "using CXXFLAGS=$CXXFLAGS" echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:2534: checking how to run the C++ preprocessor" >&5 +echo "configure:2593: 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 @@ -2543,12 +2602,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 2547 "configure" +#line 2606 "configure" #include "confdefs.h" #include <stdlib.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2552: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2611: \"$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 : @@ -2583,17 +2642,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:2587: checking for string" >&5 +echo "configure:2646: 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 2592 "configure" +#line 2651 "configure" #include "confdefs.h" #include <string> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2597: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2656: \"$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* @@ -2620,12 +2679,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:2624: checking for class string in <string.h>" >&5 +echo "configure:2683: 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 2629 "configure" +#line 2688 "configure" #include "confdefs.h" #include <stdio.h> #include <stdlib.h> @@ -2635,7 +2694,7 @@ int main() { string foo = "test" ; return 0; } EOF -if { (eval echo configure:2639: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2698: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* pgac_cv_class_string_in_string_h=yes else @@ -2662,7 +2721,7 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking for namespace std in C++""... $ac_c" 1>&6 -echo "configure:2666: checking for namespace std in C++" >&5 +echo "configure:2725: 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 @@ -2676,7 +2735,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 2680 "configure" +#line 2739 "configure" #include "confdefs.h" #include <stdio.h> #include <stdlib.h> @@ -2689,7 +2748,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2693: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2752: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* pgac_cv_cxx_namespace_std=yes else @@ -2730,12 +2789,12 @@ echo "using CPPFLAGS=$CPPFLAGS" echo "using LDFLAGS=$LDFLAGS" -for ac_prog in gawk mawk nawk awk +for ac_prog in mawk gawk 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:2739: checking for $ac_word" >&5 +echo "configure:2798: 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 @@ -2765,7 +2824,7 @@ test -n "$AWK" && break done echo $ac_n "checking for flex""... $ac_c" 1>&6 -echo "configure:2769: checking for flex" >&5 +echo "configure:2828: checking for flex" >&5 if eval "test \"`echo '$''{'pgac_cv_path_flex'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2830,7 +2889,7 @@ fi echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:2834: checking whether ln -s works" >&5 +echo "configure:2893: 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 @@ -2862,7 +2921,7 @@ ac_prog=ld if test "$ac_cv_prog_gcc" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:2866: checking for ld used by GCC" >&5 +echo "configure:2925: checking for ld used by GCC" >&5 case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -2892,10 +2951,10 @@ echo "configure:2866: checking for ld used by GCC" >&5 esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:2896: checking for GNU ld" >&5 +echo "configure:2955: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:2899: checking for non-GNU ld" >&5 +echo "configure:2958: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2930,7 +2989,7 @@ else fi test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:2934: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:2993: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2950,21 +3009,21 @@ with_gnu_ld=$ac_cv_prog_gnu_ld case $host_os in sysv5*) echo $ac_n "checking whether ld -R works""... $ac_c" 1>&6 -echo "configure:2954: checking whether ld -R works" >&5 +echo "configure:3013: checking whether ld -R works" >&5 if eval "test \"`echo '$''{'pgac_cv_prog_ld_R'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else pgac_save_LDFLAGS=$LDFLAGS; LDFLAGS="$LDFLAGS -Wl,-R/usr/lib" cat > conftest.$ac_ext <<EOF -#line 2961 "configure" +#line 3020 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:2968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* pgac_cv_prog_ld_R=yes else @@ -2985,7 +3044,7 @@ esac # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2989: checking for $ac_word" >&5 +echo "configure:3048: 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 @@ -3017,7 +3076,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:3021: checking for $ac_word" >&5 +echo "configure:3080: 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 @@ -3049,7 +3108,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:3053: checking for $ac_word" >&5 +echo "configure:3112: 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 @@ -3087,7 +3146,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:3091: checking for $ac_word" >&5 +echo "configure:3150: 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 @@ -3132,7 +3191,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:3136: checking for $ac_word" >&5 +echo "configure:3195: 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 @@ -3170,7 +3229,7 @@ fi # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3174: checking for $ac_word" >&5 +echo "configure:3233: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3206,7 +3265,7 @@ if test "$with_perl" = yes; then echo $ac_n "checking Perl installation directories""... $ac_c" 1>&6 -echo "configure:3210: checking Perl installation directories" >&5 +echo "configure:3269: checking Perl installation directories" >&5 # These are the ones we currently need. Others can be added easily. perl_installsitearch=`$PERL -MConfig -e 'print $Config{installsitearch}'` @@ -3222,7 +3281,7 @@ if test "$with_python" = yes; then # Extract the first word of "python", so it can be a program name with args. set dummy python; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3226: checking for $ac_word" >&5 +echo "configure:3285: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3260,7 +3319,7 @@ fi echo $ac_n "checking Python installation directories""... $ac_c" 1>&6 -echo "configure:3264: checking Python installation directories" >&5 +echo "configure:3323: checking Python installation directories" >&5 python_version=`${PYTHON} -c "import sys; print sys.version[:3]"` python_prefix=`${PYTHON} -c "import sys; print sys.prefix"` python_execprefix=`${PYTHON} -c "import sys; print sys.exec_prefix"` @@ -3284,7 +3343,7 @@ fi echo $ac_n "checking how to link an embedded Python application""... $ac_c" 1>&6 -echo "configure:3288: checking how to link an embedded Python application" >&5 +echo "configure:3347: checking how to link an embedded Python application" >&5 _python_libs=`grep '^LIBS=' $python_configdir/Makefile | sed 's/^.*=//'` _python_libc=`grep '^LIBC=' $python_configdir/Makefile | sed 's/^.*=//'` @@ -3307,7 +3366,7 @@ fi echo $ac_n "checking for readline""... $ac_c" 1>&6 -echo "configure:3311: checking for readline" >&5 +echo "configure:3370: checking for readline" >&5 if eval "test \"`echo '$''{'pgac_cv_check_readline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3318,7 +3377,7 @@ for pgac_lib in "" " -ltermcap" " -lncurses" " -lcurses" ; do pgac_save_LIBS=$LIBS LIBS="${pgac_rllib}${pgac_lib} $LIBS" cat > conftest.$ac_ext <<EOF -#line 3322 "configure" +#line 3381 "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 @@ -3329,7 +3388,7 @@ int main() { readline() ; return 0; } EOF -if { (eval echo configure:3333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* # NetBSD and OpenBSD have a broken linker that does not @@ -3368,14 +3427,14 @@ else fi echo $ac_n "checking for library containing using_history""... $ac_c" 1>&6 -echo "configure:3372: checking for library containing using_history" >&5 +echo "configure:3431: 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 3379 "configure" +#line 3438 "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 @@ -3386,7 +3445,7 @@ int main() { using_history() ; return 0; } EOF -if { (eval echo configure:3390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3449: \"$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 @@ -3397,7 +3456,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 3401 "configure" +#line 3460 "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 @@ -3408,7 +3467,7 @@ int main() { using_history() ; return 0; } EOF -if { (eval echo configure:3412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_using_history="-l$i" break @@ -3435,7 +3494,7 @@ fi if test "$PORTNAME" != "aix" -a "$PORTNAME" != "alpha" then echo $ac_n "checking for main in -lbsd""... $ac_c" 1>&6 -echo "configure:3439: checking for main in -lbsd" >&5 +echo "configure:3498: 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 @@ -3443,14 +3502,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lbsd $LIBS" cat > conftest.$ac_ext <<EOF -#line 3447 "configure" +#line 3506 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3513: \"$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 @@ -3479,7 +3538,7 @@ fi fi echo $ac_n "checking for setproctitle in -lutil""... $ac_c" 1>&6 -echo "configure:3483: checking for setproctitle in -lutil" >&5 +echo "configure:3542: 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 @@ -3487,7 +3546,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lutil $LIBS" cat > conftest.$ac_ext <<EOF -#line 3491 "configure" +#line 3550 "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 @@ -3498,7 +3557,7 @@ int main() { setproctitle() ; return 0; } EOF -if { (eval echo configure:3502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3561: \"$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 @@ -3526,7 +3585,7 @@ else fi echo $ac_n "checking for main in -lm""... $ac_c" 1>&6 -echo "configure:3530: checking for main in -lm" >&5 +echo "configure:3589: 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 @@ -3534,14 +3593,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <<EOF -#line 3538 "configure" +#line 3597 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3604: \"$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 @@ -3569,7 +3628,7 @@ else fi echo $ac_n "checking for main in -ldl""... $ac_c" 1>&6 -echo "configure:3573: checking for main in -ldl" >&5 +echo "configure:3632: 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 @@ -3577,14 +3636,14 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <<EOF -#line 3581 "configure" +#line 3640 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3647: \"$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 @@ -3612,7 +3671,7 @@ else fi echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6 -echo "configure:3616: checking for main in -lsocket" >&5 +echo "configure:3675: 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 @@ -3620,14 +3679,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <<EOF -#line 3624 "configure" +#line 3683 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3690: \"$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 @@ -3655,7 +3714,7 @@ else fi echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6 -echo "configure:3659: checking for main in -lnsl" >&5 +echo "configure:3718: 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 @@ -3663,14 +3722,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <<EOF -#line 3667 "configure" +#line 3726 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3733: \"$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 @@ -3698,7 +3757,7 @@ else fi echo $ac_n "checking for main in -lipc""... $ac_c" 1>&6 -echo "configure:3702: checking for main in -lipc" >&5 +echo "configure:3761: 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 @@ -3706,14 +3765,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <<EOF -#line 3710 "configure" +#line 3769 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3776: \"$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 @@ -3741,7 +3800,7 @@ else fi echo $ac_n "checking for main in -lIPC""... $ac_c" 1>&6 -echo "configure:3745: checking for main in -lIPC" >&5 +echo "configure:3804: 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 @@ -3749,14 +3808,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lIPC $LIBS" cat > conftest.$ac_ext <<EOF -#line 3753 "configure" +#line 3812 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3819: \"$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 @@ -3784,7 +3843,7 @@ else fi echo $ac_n "checking for main in -llc""... $ac_c" 1>&6 -echo "configure:3788: checking for main in -llc" >&5 +echo "configure:3847: 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 @@ -3792,14 +3851,14 @@ else ac_save_LIBS="$LIBS" LIBS="-llc $LIBS" cat > conftest.$ac_ext <<EOF -#line 3796 "configure" +#line 3855 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3862: \"$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 @@ -3827,7 +3886,7 @@ else fi echo $ac_n "checking for main in -ldld""... $ac_c" 1>&6 -echo "configure:3831: checking for main in -ldld" >&5 +echo "configure:3890: 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 @@ -3835,14 +3894,14 @@ else ac_save_LIBS="$LIBS" LIBS="-ldld $LIBS" cat > conftest.$ac_ext <<EOF -#line 3839 "configure" +#line 3898 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3905: \"$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 @@ -3870,7 +3929,7 @@ else fi echo $ac_n "checking for main in -lld""... $ac_c" 1>&6 -echo "configure:3874: checking for main in -lld" >&5 +echo "configure:3933: 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 @@ -3878,14 +3937,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lld $LIBS" cat > conftest.$ac_ext <<EOF -#line 3882 "configure" +#line 3941 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3948: \"$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 @@ -3913,7 +3972,7 @@ else fi echo $ac_n "checking for main in -lcompat""... $ac_c" 1>&6 -echo "configure:3917: checking for main in -lcompat" >&5 +echo "configure:3976: 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 @@ -3921,14 +3980,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lcompat $LIBS" cat > conftest.$ac_ext <<EOF -#line 3925 "configure" +#line 3984 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3991: \"$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 @@ -3956,7 +4015,7 @@ else fi echo $ac_n "checking for main in -lBSD""... $ac_c" 1>&6 -echo "configure:3960: checking for main in -lBSD" >&5 +echo "configure:4019: 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 @@ -3964,14 +4023,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lBSD $LIBS" cat > conftest.$ac_ext <<EOF -#line 3968 "configure" +#line 4027 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4034: \"$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 @@ -3999,7 +4058,7 @@ else fi echo $ac_n "checking for main in -lgen""... $ac_c" 1>&6 -echo "configure:4003: checking for main in -lgen" >&5 +echo "configure:4062: 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 @@ -4007,14 +4066,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lgen $LIBS" cat > conftest.$ac_ext <<EOF -#line 4011 "configure" +#line 4070 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:4018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4077: \"$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 @@ -4042,7 +4101,7 @@ else fi echo $ac_n "checking for main in -lPW""... $ac_c" 1>&6 -echo "configure:4046: checking for main in -lPW" >&5 +echo "configure:4105: 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 @@ -4050,14 +4109,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lPW $LIBS" cat > conftest.$ac_ext <<EOF -#line 4054 "configure" +#line 4113 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:4061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4085,7 +4144,7 @@ else fi echo $ac_n "checking for main in -lresolv""... $ac_c" 1>&6 -echo "configure:4089: checking for main in -lresolv" >&5 +echo "configure:4148: checking for main in -lresolv" >&5 ac_lib_var=`echo resolv'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4093,14 +4152,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <<EOF -#line 4097 "configure" +#line 4156 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:4104: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4163: \"$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 @@ -4129,7 +4188,7 @@ fi # QNX: echo $ac_n "checking for main in -lunix""... $ac_c" 1>&6 -echo "configure:4133: checking for main in -lunix" >&5 +echo "configure:4192: checking for main in -lunix" >&5 ac_lib_var=`echo unix'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4137,14 +4196,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lunix $LIBS" cat > conftest.$ac_ext <<EOF -#line 4141 "configure" +#line 4200 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:4148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4207: \"$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 @@ -4173,14 +4232,14 @@ fi echo $ac_n "checking for library containing crypt""... $ac_c" 1>&6 -echo "configure:4177: checking for library containing crypt" >&5 +echo "configure:4236: 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 4184 "configure" +#line 4243 "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 @@ -4191,7 +4250,7 @@ int main() { crypt() ; return 0; } EOF -if { (eval echo configure:4195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4254: \"$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 @@ -4202,7 +4261,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 4206 "configure" +#line 4265 "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 @@ -4213,7 +4272,7 @@ int main() { crypt() ; return 0; } EOF -if { (eval echo configure:4217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4276: \"$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 @@ -4235,7 +4294,7 @@ else : fi # BeOS: echo $ac_n "checking for __inet_ntoa in -lbind""... $ac_c" 1>&6 -echo "configure:4239: checking for __inet_ntoa in -lbind" >&5 +echo "configure:4298: checking for __inet_ntoa in -lbind" >&5 ac_lib_var=`echo bind'_'__inet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4243,7 +4302,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lbind $LIBS" cat > conftest.$ac_ext <<EOF -#line 4247 "configure" +#line 4306 "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 @@ -4254,7 +4313,7 @@ int main() { __inet_ntoa() ; return 0; } EOF -if { (eval echo configure:4258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4317: \"$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 @@ -4286,7 +4345,7 @@ fi # about 1.0.4 did not). While we could work around the lack of z_streamp, # it seems unwise to encourage people to use such old zlib versions... cat > conftest.$ac_ext <<EOF -#line 4290 "configure" +#line 4349 "configure" #include "confdefs.h" #include <zlib.h> EOF @@ -4295,7 +4354,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | rm -rf conftest* echo $ac_n "checking for inflate in -lz""... $ac_c" 1>&6 -echo "configure:4299: checking for inflate in -lz" >&5 +echo "configure:4358: 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 @@ -4303,7 +4362,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <<EOF -#line 4307 "configure" +#line 4366 "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 @@ -4314,7 +4373,7 @@ int main() { inflate() ; return 0; } EOF -if { (eval echo configure:4318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4377: \"$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 @@ -4348,14 +4407,14 @@ rm -f conftest* # Solaris: echo $ac_n "checking for library containing fdatasync""... $ac_c" 1>&6 -echo "configure:4352: checking for library containing fdatasync" >&5 +echo "configure:4411: checking for library containing fdatasync" >&5 if eval "test \"`echo '$''{'ac_cv_search_fdatasync'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_func_search_save_LIBS="$LIBS" ac_cv_search_fdatasync="no" cat > conftest.$ac_ext <<EOF -#line 4359 "configure" +#line 4418 "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 @@ -4366,7 +4425,7 @@ int main() { fdatasync() ; return 0; } EOF -if { (eval echo configure:4370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_fdatasync="none required" else @@ -4377,7 +4436,7 @@ rm -f conftest* test "$ac_cv_search_fdatasync" = "no" && for i in rt posix4; do LIBS="-l$i $ac_func_search_save_LIBS" cat > conftest.$ac_ext <<EOF -#line 4381 "configure" +#line 4440 "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 @@ -4388,7 +4447,7 @@ int main() { fdatasync() ; return 0; } EOF -if { (eval echo configure:4392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_fdatasync="-l$i" break @@ -4411,7 +4470,7 @@ fi if test "$with_krb4" = yes ; then echo $ac_n "checking for des_encrypt in -ldes""... $ac_c" 1>&6 -echo "configure:4415: checking for des_encrypt in -ldes" >&5 +echo "configure:4474: 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 @@ -4419,7 +4478,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldes $LIBS" cat > conftest.$ac_ext <<EOF -#line 4423 "configure" +#line 4482 "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 @@ -4430,7 +4489,7 @@ int main() { des_encrypt() ; return 0; } EOF -if { (eval echo configure:4434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4493: \"$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 @@ -4459,7 +4518,7 @@ else fi echo $ac_n "checking for krb_sendauth in -lkrb""... $ac_c" 1>&6 -echo "configure:4463: checking for krb_sendauth in -lkrb" >&5 +echo "configure:4522: 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 @@ -4467,7 +4526,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lkrb $LIBS" cat > conftest.$ac_ext <<EOF -#line 4471 "configure" +#line 4530 "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 @@ -4478,7 +4537,7 @@ int main() { krb_sendauth() ; return 0; } EOF -if { (eval echo configure:4482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4541: \"$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 @@ -4510,7 +4569,7 @@ fi if test "$with_krb5" = yes ; then echo $ac_n "checking for com_err in -lcom_err""... $ac_c" 1>&6 -echo "configure:4514: checking for com_err in -lcom_err" >&5 +echo "configure:4573: checking for com_err in -lcom_err" >&5 ac_lib_var=`echo com_err'_'com_err | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4518,7 +4577,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcom_err $LIBS" cat > conftest.$ac_ext <<EOF -#line 4522 "configure" +#line 4581 "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 @@ -4529,7 +4588,7 @@ int main() { com_err() ; return 0; } EOF -if { (eval echo configure:4533: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4592: \"$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 @@ -4558,7 +4617,7 @@ else fi echo $ac_n "checking for krb5_encrypt in -lcrypto""... $ac_c" 1>&6 -echo "configure:4562: checking for krb5_encrypt in -lcrypto" >&5 +echo "configure:4621: checking for krb5_encrypt in -lcrypto" >&5 ac_lib_var=`echo crypto'_'krb5_encrypt | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4566,7 +4625,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcrypto $LIBS" cat > conftest.$ac_ext <<EOF -#line 4570 "configure" +#line 4629 "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 @@ -4577,7 +4636,7 @@ int main() { krb5_encrypt() ; return 0; } EOF -if { (eval echo configure:4581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4640: \"$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 @@ -4603,7 +4662,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for krb5_encrypt in -lk5crypto""... $ac_c" 1>&6 -echo "configure:4607: checking for krb5_encrypt in -lk5crypto" >&5 +echo "configure:4666: checking for krb5_encrypt in -lk5crypto" >&5 ac_lib_var=`echo k5crypto'_'krb5_encrypt | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4611,7 +4670,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lk5crypto $LIBS" cat > conftest.$ac_ext <<EOF -#line 4615 "configure" +#line 4674 "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 @@ -4622,7 +4681,7 @@ int main() { krb5_encrypt() ; return 0; } EOF -if { (eval echo configure:4626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4653,7 +4712,7 @@ fi fi echo $ac_n "checking for krb5_sendauth in -lkrb5""... $ac_c" 1>&6 -echo "configure:4657: checking for krb5_sendauth in -lkrb5" >&5 +echo "configure:4716: checking for krb5_sendauth in -lkrb5" >&5 ac_lib_var=`echo krb5'_'krb5_sendauth | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4661,7 +4720,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lkrb5 $LIBS" cat > conftest.$ac_ext <<EOF -#line 4665 "configure" +#line 4724 "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 @@ -4672,7 +4731,7 @@ int main() { krb5_sendauth() ; return 0; } EOF -if { (eval echo configure:4676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4735: \"$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 @@ -4704,7 +4763,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:4708: checking for CRYPTO_new_ex_data in -lcrypto" >&5 +echo "configure:4767: 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 @@ -4712,7 +4771,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcrypto $LIBS" cat > conftest.$ac_ext <<EOF -#line 4716 "configure" +#line 4775 "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 @@ -4723,7 +4782,7 @@ int main() { CRYPTO_new_ex_data() ; return 0; } EOF -if { (eval echo configure:4727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4786: \"$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 @@ -4752,7 +4811,7 @@ else fi echo $ac_n "checking for SSL_library_init in -lssl""... $ac_c" 1>&6 -echo "configure:4756: checking for SSL_library_init in -lssl" >&5 +echo "configure:4815: 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 @@ -4760,7 +4819,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lssl $LIBS" cat > conftest.$ac_ext <<EOF -#line 4764 "configure" +#line 4823 "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 @@ -4771,7 +4830,7 @@ int main() { SSL_library_init() ; return 0; } EOF -if { (eval echo configure:4775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4834: \"$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 @@ -4803,7 +4862,7 @@ fi if test "$with_pam" = yes ; then echo $ac_n "checking for pam_start in -lpam""... $ac_c" 1>&6 -echo "configure:4807: checking for pam_start in -lpam" >&5 +echo "configure:4866: checking for pam_start in -lpam" >&5 ac_lib_var=`echo pam'_'pam_start | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4811,7 +4870,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpam $LIBS" cat > conftest.$ac_ext <<EOF -#line 4815 "configure" +#line 4874 "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 @@ -4822,7 +4881,7 @@ int main() { pam_start() ; return 0; } EOF -if { (eval echo configure:4826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4885: \"$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 @@ -4856,14 +4915,14 @@ if test "$enable_nls" = yes ; then echo $ac_n "checking for library containing gettext""... $ac_c" 1>&6 -echo "configure:4860: checking for library containing gettext" >&5 +echo "configure:4919: checking for library containing gettext" >&5 if eval "test \"`echo '$''{'ac_cv_search_gettext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_func_search_save_LIBS="$LIBS" ac_cv_search_gettext="no" cat > conftest.$ac_ext <<EOF -#line 4867 "configure" +#line 4926 "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 @@ -4874,7 +4933,7 @@ int main() { gettext() ; return 0; } EOF -if { (eval echo configure:4878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_gettext="none required" else @@ -4885,7 +4944,7 @@ rm -f conftest* test "$ac_cv_search_gettext" = "no" && for i in intl; do LIBS="-l$i $ac_func_search_save_LIBS" cat > conftest.$ac_ext <<EOF -#line 4889 "configure" +#line 4948 "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 @@ -4896,7 +4955,7 @@ int main() { gettext() ; return 0; } EOF -if { (eval echo configure:4900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_gettext="-l$i" break @@ -4918,17 +4977,17 @@ else : fi ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for libintl.h""... $ac_c" 1>&6 -echo "configure:4922: checking for libintl.h" >&5 +echo "configure:4981: checking for libintl.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4927 "configure" +#line 4986 "configure" #include "confdefs.h" #include <libintl.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4932: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4991: \"$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* @@ -4955,7 +5014,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:4959: checking for $ac_word" >&5 +echo "configure:5018: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4992,7 +5051,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:4996: checking for $ac_word" >&5 +echo "configure:5055: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MSGMERGE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5026,7 +5085,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:5030: checking for $ac_word" >&5 +echo "configure:5089: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5079,17 +5138,17 @@ for ac_hdr in crypt.h dld.h endian.h fp_class.h getopt.h ieeefp.h pwd.h sys/ipc. do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5083: checking for $ac_hdr" >&5 +echo "configure:5142: 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 5088 "configure" +#line 5147 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5093: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5152: \"$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* @@ -5120,17 +5179,17 @@ for ac_hdr in netinet/in.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5124: checking for $ac_hdr" >&5 +echo "configure:5183: 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 5129 "configure" +#line 5188 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5134: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5193: \"$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* @@ -5157,9 +5216,9 @@ fi done echo $ac_n "checking for netinet/tcp.h""... $ac_c" 1>&6 -echo "configure:5161: checking for netinet/tcp.h" >&5 +echo "configure:5220: checking for netinet/tcp.h" >&5 cat > conftest.$ac_ext <<EOF -#line 5163 "configure" +#line 5222 "configure" #include "confdefs.h" #ifdef HAVE_NETINET_IN_H @@ -5169,7 +5228,7 @@ cat > conftest.$ac_ext <<EOF EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5173: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5232: \"$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* @@ -5187,24 +5246,24 @@ fi rm -f conftest* echo $ac_n "checking whether string.h and strings.h may both be included""... $ac_c" 1>&6 -echo "configure:5191: checking whether string.h and strings.h may both be included" >&5 +echo "configure:5250: checking whether string.h and strings.h may both be included" >&5 if eval "test \"`echo '$''{'pgac_cv_header_strings_both'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5196 "configure" +#line 5255 "configure" #include "confdefs.h" #include <string.h> #include <strings.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5203: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5262: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 5208 "configure" +#line 5267 "configure" #include "confdefs.h" #include <string.h> #include <strings.h> @@ -5213,7 +5272,7 @@ int main() { int n = strcasecmp("a", "b"); ; return 0; } EOF -if { (eval echo configure:5217: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5276: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* pgac_cv_header_strings_both=yes else @@ -5245,17 +5304,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:5249: checking for $ac_hdr" >&5 +echo "configure:5308: 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 5254 "configure" +#line 5313 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5259: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5318: \"$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* @@ -5285,17 +5344,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:5289: checking for $ac_hdr" >&5 +echo "configure:5348: 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 5294 "configure" +#line 5353 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5299: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5358: \"$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* @@ -5325,17 +5384,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:5329: checking for krb.h" >&5 +echo "configure:5388: 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 5334 "configure" +#line 5393 "configure" #include "confdefs.h" #include <krb.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5339: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5398: \"$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* @@ -5362,17 +5421,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:5366: checking for krb5.h" >&5 +echo "configure:5425: 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 5371 "configure" +#line 5430 "configure" #include "confdefs.h" #include <krb5.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5376: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5435: \"$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* @@ -5396,17 +5455,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:5400: checking for com_err.h" >&5 +echo "configure:5459: 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 5405 "configure" +#line 5464 "configure" #include "confdefs.h" #include <com_err.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5410: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5469: \"$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* @@ -5433,17 +5492,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:5437: checking for openssl/ssl.h" >&5 +echo "configure:5496: 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 5442 "configure" +#line 5501 "configure" #include "confdefs.h" #include <openssl/ssl.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5447: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5506: \"$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* @@ -5467,17 +5526,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:5471: checking for openssl/err.h" >&5 +echo "configure:5530: 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 5476 "configure" +#line 5535 "configure" #include "confdefs.h" #include <openssl/err.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5481: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5540: \"$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* @@ -5504,17 +5563,17 @@ fi if test "$with_pam" = yes ; then ac_safe=`echo "security/pam_appl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for security/pam_appl.h""... $ac_c" 1>&6 -echo "configure:5508: checking for security/pam_appl.h" >&5 +echo "configure:5567: checking for security/pam_appl.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 5513 "configure" +#line 5572 "configure" #include "confdefs.h" #include <security/pam_appl.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5518: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5577: \"$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* @@ -5543,18 +5602,18 @@ fi ## Types, structures, compiler characteristics ## echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:5547: checking for working const" >&5 +echo "configure:5606: 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 5552 "configure" +#line 5611 "configure" #include "confdefs.h" int main() { /* Ultrix mips cc rejects this. */ -typedef int charset[2]; const charset x={0,0}; +typedef int charset[2]; const charset x; /* SunOS 4.1.1 cc rejects this. */ char const *const *ccp; char **p; @@ -5597,7 +5656,7 @@ ccp = (char const *const *) p; ; return 0; } EOF -if { (eval echo configure:5601: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5660: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -5618,21 +5677,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:5622: checking for inline" >&5 +echo "configure:5681: 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 5629 "configure" +#line 5688 "configure" #include "confdefs.h" int main() { -} $ac_kw int foo() { +} $ac_kw foo() { ; return 0; } EOF -if { (eval echo configure:5636: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5695: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -5660,12 +5719,12 @@ esac echo $ac_n "checking for preprocessor stringizing operator""... $ac_c" 1>&6 -echo "configure:5664: checking for preprocessor stringizing operator" >&5 +echo "configure:5723: 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 5669 "configure" +#line 5728 "configure" #include "confdefs.h" #define x(y) #y @@ -5695,19 +5754,19 @@ fi echo "$ac_t""${ac_cv_c_stringize}" 1>&6 echo $ac_n "checking for signed types""... $ac_c" 1>&6 -echo "configure:5699: checking for signed types" >&5 +echo "configure:5758: 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 5704 "configure" +#line 5763 "configure" #include "confdefs.h" int main() { signed char c; signed short s; signed int i; ; return 0; } EOF -if { (eval echo configure:5711: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5770: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* pgac_cv_c_signed=yes else @@ -5727,19 +5786,19 @@ EOF fi echo $ac_n "checking for volatile""... $ac_c" 1>&6 -echo "configure:5731: checking for volatile" >&5 +echo "configure:5790: 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 5736 "configure" +#line 5795 "configure" #include "confdefs.h" int main() { extern volatile int i; ; return 0; } EOF -if { (eval echo configure:5743: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5802: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* pgac_cv_c_volatile=yes else @@ -5759,12 +5818,12 @@ EOF fi echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:5763: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:5822: 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 5768 "configure" +#line 5827 "configure" #include "confdefs.h" #include <sys/types.h> #include <time.h> @@ -5772,7 +5831,7 @@ int main() { struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:5776: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5835: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -5793,12 +5852,12 @@ EOF fi echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6 -echo "configure:5797: checking for tm_zone in struct tm" >&5 +echo "configure:5856: 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 5802 "configure" +#line 5861 "configure" #include "confdefs.h" #include <sys/types.h> #include <$ac_cv_struct_tm> @@ -5806,7 +5865,7 @@ int main() { struct tm tm; tm.tm_zone; ; return 0; } EOF -if { (eval echo configure:5810: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5869: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm_zone=yes else @@ -5826,12 +5885,12 @@ EOF else echo $ac_n "checking for tzname""... $ac_c" 1>&6 -echo "configure:5830: checking for tzname" >&5 +echo "configure:5889: 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 5835 "configure" +#line 5894 "configure" #include "confdefs.h" #include <time.h> #ifndef tzname /* For SGI. */ @@ -5841,7 +5900,7 @@ int main() { atoi(*tzname); ; return 0; } EOF -if { (eval echo configure:5845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_var_tzname=yes else @@ -5863,12 +5922,12 @@ EOF fi echo $ac_n "checking for union semun""... $ac_c" 1>&6 -echo "configure:5867: checking for union semun" >&5 +echo "configure:5926: 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 5872 "configure" +#line 5931 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/ipc.h> @@ -5877,7 +5936,7 @@ int main() { union semun semun; ; return 0; } EOF -if { (eval echo configure:5881: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5940: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* pgac_cv_union_semun=yes else @@ -5897,12 +5956,12 @@ EOF fi echo $ac_n "checking for struct cmsgcred""... $ac_c" 1>&6 -echo "configure:5901: checking for struct cmsgcred" >&5 +echo "configure:5960: checking for struct cmsgcred" >&5 if eval "test \"`echo '$''{'pgac_cv_struct_cmsgcred'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5906 "configure" +#line 5965 "configure" #include "confdefs.h" #include <sys/param.h> #include <sys/socket.h> @@ -5911,7 +5970,7 @@ int main() { struct cmsgcred sockcred; ; return 0; } EOF -if { (eval echo configure:5915: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5974: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* pgac_cv_struct_cmsgcred=yes else @@ -5931,12 +5990,12 @@ EOF fi echo $ac_n "checking for struct fcred""... $ac_c" 1>&6 -echo "configure:5935: checking for struct fcred" >&5 +echo "configure:5994: checking for struct fcred" >&5 if eval "test \"`echo '$''{'pgac_cv_struct_fcred'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5940 "configure" +#line 5999 "configure" #include "confdefs.h" #include <sys/param.h> #include <sys/socket.h> @@ -5945,7 +6004,7 @@ int main() { struct fcred sockcred; ; return 0; } EOF -if { (eval echo configure:5949: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6008: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* pgac_cv_struct_fcred=yes else @@ -5965,12 +6024,12 @@ EOF fi echo $ac_n "checking for struct sockcred""... $ac_c" 1>&6 -echo "configure:5969: checking for struct sockcred" >&5 +echo "configure:6028: checking for struct sockcred" >&5 if eval "test \"`echo '$''{'pgac_cv_struct_sockcred'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5974 "configure" +#line 6033 "configure" #include "confdefs.h" #include <sys/param.h> #include <sys/socket.h> @@ -5979,7 +6038,7 @@ int main() { struct sockcred sockcred; ; return 0; } EOF -if { (eval echo configure:5983: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6042: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* pgac_cv_struct_sockcred=yes else @@ -5999,12 +6058,12 @@ EOF fi echo $ac_n "checking for struct sockaddr_un""... $ac_c" 1>&6 -echo "configure:6003: checking for struct sockaddr_un" >&5 +echo "configure:6062: 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 6008 "configure" +#line 6067 "configure" #include "confdefs.h" #include <sys/types.h> #ifdef HAVE_SYS_UN_H @@ -6014,7 +6073,7 @@ int main() { struct sockaddr_un un; ; return 0; } EOF -if { (eval echo configure:6018: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6077: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* pgac_cv_struct_sockaddr_un=yes else @@ -6038,12 +6097,12 @@ fi ## Functions, global variables ## echo $ac_n "checking for int timezone""... $ac_c" 1>&6 -echo "configure:6042: checking for int timezone" >&5 +echo "configure:6101: 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 6047 "configure" +#line 6106 "configure" #include "confdefs.h" #include <time.h> int res; @@ -6051,7 +6110,7 @@ int main() { res = timezone / 60; ; return 0; } EOF -if { (eval echo configure:6055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6114: \"$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 @@ -6071,7 +6130,7 @@ EOF fi echo $ac_n "checking types of arguments for accept()""... $ac_c" 1>&6 -echo "configure:6075: checking types of arguments for accept()" >&5 +echo "configure:6134: 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 @@ -6085,7 +6144,7 @@ else for ac_cv_func_accept_arg2 in 'struct sockaddr *' 'const struct sockaddr *' 'void *'; do for ac_cv_func_accept_arg3 in 'int' 'size_t' 'socklen_t' 'unsigned int' 'void'; do cat > conftest.$ac_ext <<EOF -#line 6089 "configure" +#line 6148 "configure" #include "confdefs.h" #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> @@ -6098,7 +6157,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:6102: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6161: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_not_found=no; break 3 else @@ -6138,12 +6197,12 @@ EOF echo $ac_n "checking whether gettimeofday takes only one argument""... $ac_c" 1>&6 -echo "configure:6142: checking whether gettimeofday takes only one argument" >&5 +echo "configure:6201: 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 6147 "configure" +#line 6206 "configure" #include "confdefs.h" #include <sys/time.h> int main() { @@ -6152,7 +6211,7 @@ struct timezone *tzp; gettimeofday(tp,tzp); ; return 0; } EOF -if { (eval echo configure:6156: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6215: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* pgac_cv_func_gettimeofday_1arg=no else @@ -6175,12 +6234,12 @@ fi for ac_func in fcvt getopt_long memmove pstat setproctitle setsid sigprocmask sysconf waitpid dlopen fdatasync do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6179: checking for $ac_func" >&5 +echo "configure:6238: 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 6184 "configure" +#line 6243 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -6203,7 +6262,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:6207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6266: \"$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 @@ -6229,7 +6288,7 @@ done cat > conftest.$ac_ext <<EOF -#line 6233 "configure" +#line 6292 "configure" #include "confdefs.h" #include <unistd.h> EOF @@ -6245,12 +6304,12 @@ rm -f conftest* echo $ac_n "checking for PS_STRINGS""... $ac_c" 1>&6 -echo "configure:6249: checking for PS_STRINGS" >&5 +echo "configure:6308: 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 6254 "configure" +#line 6313 "configure" #include "confdefs.h" #include <machine/vmparam.h> #include <sys/exec.h> @@ -6260,7 +6319,7 @@ PS_STRINGS->ps_nargvstr = 1; PS_STRINGS->ps_argvstr = "foo"; ; return 0; } EOF -if { (eval echo configure:6264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6323: \"$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 @@ -6282,12 +6341,12 @@ fi SNPRINTF='' echo $ac_n "checking for snprintf""... $ac_c" 1>&6 -echo "configure:6286: checking for snprintf" >&5 +echo "configure:6345: 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 6291 "configure" +#line 6350 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char snprintf(); below. */ @@ -6310,7 +6369,7 @@ snprintf(); ; return 0; } EOF -if { (eval echo configure:6314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6373: \"$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 @@ -6334,12 +6393,12 @@ SNPRINTF='snprintf.o' fi echo $ac_n "checking for vsnprintf""... $ac_c" 1>&6 -echo "configure:6338: checking for vsnprintf" >&5 +echo "configure:6397: 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 6343 "configure" +#line 6402 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char vsnprintf(); below. */ @@ -6362,7 +6421,7 @@ vsnprintf(); ; return 0; } EOF -if { (eval echo configure:6366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6425: \"$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 @@ -6387,7 +6446,7 @@ fi cat > conftest.$ac_ext <<EOF -#line 6391 "configure" +#line 6450 "configure" #include "confdefs.h" #include <stdio.h> EOF @@ -6402,7 +6461,7 @@ fi rm -f conftest* cat > conftest.$ac_ext <<EOF -#line 6406 "configure" +#line 6465 "configure" #include "confdefs.h" #include <stdio.h> EOF @@ -6419,12 +6478,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:6423: checking for isinf" >&5 +echo "configure:6482: 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 6428 "configure" +#line 6487 "configure" #include "confdefs.h" #include <math.h> @@ -6432,7 +6491,7 @@ int main() { double x = 0.0; int res = isinf(x); ; return 0; } EOF -if { (eval echo configure:6436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_isinf=yes else @@ -6458,12 +6517,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:6462: checking for $ac_func" >&5 +echo "configure:6521: 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 6467 "configure" +#line 6526 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -6486,7 +6545,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:6490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6549: \"$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 @@ -6514,12 +6573,12 @@ fi echo $ac_n "checking for getrusage""... $ac_c" 1>&6 -echo "configure:6518: checking for getrusage" >&5 +echo "configure:6577: 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 6523 "configure" +#line 6582 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char getrusage(); below. */ @@ -6542,7 +6601,7 @@ getrusage(); ; return 0; } EOF -if { (eval echo configure:6546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6605: \"$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 @@ -6567,12 +6626,12 @@ fi echo $ac_n "checking for srandom""... $ac_c" 1>&6 -echo "configure:6571: checking for srandom" >&5 +echo "configure:6630: 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 6576 "configure" +#line 6635 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char srandom(); below. */ @@ -6595,7 +6654,7 @@ srandom(); ; return 0; } EOF -if { (eval echo configure:6599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6658: \"$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 @@ -6620,12 +6679,12 @@ fi echo $ac_n "checking for gethostname""... $ac_c" 1>&6 -echo "configure:6624: checking for gethostname" >&5 +echo "configure:6683: 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 6629 "configure" +#line 6688 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gethostname(); below. */ @@ -6648,7 +6707,7 @@ gethostname(); ; return 0; } EOF -if { (eval echo configure:6652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6711: \"$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 @@ -6673,12 +6732,12 @@ fi echo $ac_n "checking for random""... $ac_c" 1>&6 -echo "configure:6677: checking for random" >&5 +echo "configure:6736: 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 6682 "configure" +#line 6741 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char random(); below. */ @@ -6701,7 +6760,7 @@ random(); ; return 0; } EOF -if { (eval echo configure:6705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6764: \"$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 @@ -6726,12 +6785,12 @@ fi echo $ac_n "checking for inet_aton""... $ac_c" 1>&6 -echo "configure:6730: checking for inet_aton" >&5 +echo "configure:6789: 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 6735 "configure" +#line 6794 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char inet_aton(); below. */ @@ -6754,7 +6813,7 @@ inet_aton(); ; return 0; } EOF -if { (eval echo configure:6758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6817: \"$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 @@ -6779,12 +6838,12 @@ fi echo $ac_n "checking for strerror""... $ac_c" 1>&6 -echo "configure:6783: checking for strerror" >&5 +echo "configure:6842: 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 6788 "configure" +#line 6847 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char strerror(); below. */ @@ -6807,7 +6866,7 @@ strerror(); ; return 0; } EOF -if { (eval echo configure:6811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6870: \"$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 @@ -6832,12 +6891,12 @@ fi echo $ac_n "checking for strdup""... $ac_c" 1>&6 -echo "configure:6836: checking for strdup" >&5 +echo "configure:6895: 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 6841 "configure" +#line 6900 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char strdup(); below. */ @@ -6860,7 +6919,7 @@ strdup(); ; return 0; } EOF -if { (eval echo configure:6864: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6923: \"$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 @@ -6885,12 +6944,12 @@ fi echo $ac_n "checking for strtol""... $ac_c" 1>&6 -echo "configure:6889: checking for strtol" >&5 +echo "configure:6948: 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 6894 "configure" +#line 6953 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char strtol(); below. */ @@ -6913,7 +6972,7 @@ strtol(); ; return 0; } EOF -if { (eval echo configure:6917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6976: \"$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 @@ -6938,12 +6997,12 @@ fi echo $ac_n "checking for strtoul""... $ac_c" 1>&6 -echo "configure:6942: checking for strtoul" >&5 +echo "configure:7001: 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 6947 "configure" +#line 7006 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char strtoul(); below. */ @@ -6966,7 +7025,7 @@ strtoul(); ; return 0; } EOF -if { (eval echo configure:6970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7029: \"$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 @@ -6991,12 +7050,12 @@ fi echo $ac_n "checking for strcasecmp""... $ac_c" 1>&6 -echo "configure:6995: checking for strcasecmp" >&5 +echo "configure:7054: 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 7000 "configure" +#line 7059 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char strcasecmp(); below. */ @@ -7019,7 +7078,7 @@ strcasecmp(); ; return 0; } EOF -if { (eval echo configure:7023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7082: \"$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 @@ -7044,12 +7103,12 @@ fi echo $ac_n "checking for cbrt""... $ac_c" 1>&6 -echo "configure:7048: checking for cbrt" >&5 +echo "configure:7107: 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 7053 "configure" +#line 7112 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char cbrt(); below. */ @@ -7072,7 +7131,7 @@ cbrt(); ; return 0; } EOF -if { (eval echo configure:7076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7135: \"$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 @@ -7093,7 +7152,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for cbrt in -lm""... $ac_c" 1>&6 -echo "configure:7097: checking for cbrt in -lm" >&5 +echo "configure:7156: 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 @@ -7101,7 +7160,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <<EOF -#line 7105 "configure" +#line 7164 "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 @@ -7112,7 +7171,7 @@ int main() { cbrt() ; return 0; } EOF -if { (eval echo configure:7116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7175: \"$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 @@ -7150,12 +7209,12 @@ esac echo $ac_n "checking for rint""... $ac_c" 1>&6 -echo "configure:7154: checking for rint" >&5 +echo "configure:7213: 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 7159 "configure" +#line 7218 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char rint(); below. */ @@ -7178,7 +7237,7 @@ rint(); ; return 0; } EOF -if { (eval echo configure:7182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7241: \"$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 @@ -7199,7 +7258,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for rint in -lm""... $ac_c" 1>&6 -echo "configure:7203: checking for rint in -lm" >&5 +echo "configure:7262: 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 @@ -7207,7 +7266,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $HPUXMATHLIB $LIBS" cat > conftest.$ac_ext <<EOF -#line 7211 "configure" +#line 7270 "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 @@ -7218,7 +7277,7 @@ int main() { rint() ; return 0; } EOF -if { (eval echo configure:7222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7281: \"$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 @@ -7247,9 +7306,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:7251: checking for rl_completion_append_character" >&5 +echo "configure:7310: checking for rl_completion_append_character" >&5 cat > conftest.$ac_ext <<EOF -#line 7253 "configure" +#line 7312 "configure" #include "confdefs.h" #include <stdio.h> #ifdef HAVE_READLINE_READLINE_H @@ -7262,7 +7321,7 @@ int main() { rl_completion_append_character = 'x'; ; return 0; } EOF -if { (eval echo configure:7266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7325: \"$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 @@ -7280,12 +7339,12 @@ rm -f conftest* for ac_func in rl_completion_matches rl_filename_completion_function do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7284: checking for $ac_func" >&5 +echo "configure:7343: 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 7289 "configure" +#line 7348 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -7308,7 +7367,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:7312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7371: \"$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 @@ -7335,16 +7394,16 @@ done echo $ac_n "checking for finite""... $ac_c" 1>&6 -echo "configure:7339: checking for finite" >&5 +echo "configure:7398: checking for finite" >&5 cat > conftest.$ac_ext <<EOF -#line 7341 "configure" +#line 7400 "configure" #include "confdefs.h" #include <math.h> int main() { int dummy=finite(1.0); ; return 0; } EOF -if { (eval echo configure:7348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7407: \"$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 @@ -7359,16 +7418,16 @@ fi rm -f conftest* echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6 -echo "configure:7363: checking for sigsetjmp" >&5 +echo "configure:7422: checking for sigsetjmp" >&5 cat > conftest.$ac_ext <<EOF -#line 7365 "configure" +#line 7424 "configure" #include "confdefs.h" #include <setjmp.h> int main() { sigjmp_buf x; sigsetjmp(x, 1); ; return 0; } EOF -if { (eval echo configure:7372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7431: \"$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 @@ -7388,12 +7447,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:7392: checking for syslog" >&5 +echo "configure:7451: 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 7397 "configure" +#line 7456 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char syslog(); below. */ @@ -7416,7 +7475,7 @@ syslog(); ; return 0; } EOF -if { (eval echo configure:7420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7479: \"$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 @@ -7455,19 +7514,19 @@ fi echo $ac_n "checking for optreset""... $ac_c" 1>&6 -echo "configure:7459: checking for optreset" >&5 +echo "configure:7518: checking for optreset" >&5 if eval "test \"`echo '$''{'pgac_cv_var_int_optreset'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7464 "configure" +#line 7523 "configure" #include "confdefs.h" #include <unistd.h> int main() { extern int optreset; optreset = 1; ; return 0; } EOF -if { (eval echo configure:7471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* pgac_cv_var_int_optreset=yes else @@ -7493,16 +7552,16 @@ fi # This check should come after all modifications of compiler or linker # variables, and before any other run tests. echo $ac_n "checking test program""... $ac_c" 1>&6 -echo "configure:7497: checking test program" >&5 +echo "configure:7556: checking test program" >&5 if test "$cross_compiling" = yes; then echo "$ac_t""cross-compiling" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7502 "configure" +#line 7561 "configure" #include "confdefs.h" int main() { return 0; } EOF -if { (eval echo configure:7506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "$ac_t""ok" 1>&6 else @@ -7522,7 +7581,7 @@ fi echo $ac_n "checking whether long int is 64 bits""... $ac_c" 1>&6 -echo "configure:7526: checking whether long int is 64 bits" >&5 +echo "configure:7585: 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 @@ -7531,7 +7590,7 @@ else echo "configure: warning: 64 bit arithmetic disabled when cross-compiling" 1>&2 else cat > conftest.$ac_ext <<EOF -#line 7535 "configure" +#line 7594 "configure" #include "confdefs.h" typedef long int int64; @@ -7560,7 +7619,7 @@ main() { exit(! does_int64_work()); } EOF -if { (eval echo configure:7564: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7623: \"$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 @@ -7587,7 +7646,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:7591: checking whether long long int is 64 bits" >&5 +echo "configure:7650: 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 @@ -7596,7 +7655,7 @@ else echo "configure: warning: 64 bit arithmetic disabled when cross-compiling" 1>&2 else cat > conftest.$ac_ext <<EOF -#line 7600 "configure" +#line 7659 "configure" #include "confdefs.h" typedef long long int int64; @@ -7625,7 +7684,7 @@ main() { exit(! does_int64_work()); } EOF -if { (eval echo configure:7629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7688: \"$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 @@ -7655,7 +7714,7 @@ fi if [ x"$HAVE_LONG_LONG_INT_64" = xyes ] ; then cat > conftest.$ac_ext <<EOF -#line 7659 "configure" +#line 7718 "configure" #include "confdefs.h" #define INT64CONST(x) x##LL @@ -7665,7 +7724,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:7669: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7728: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_LL_CONSTANTS 1 @@ -7683,7 +7742,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:7687: checking whether snprintf handles 'long long int' as %lld" >&5 +echo "configure:7746: 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 @@ -7692,7 +7751,7 @@ echo "configure:7687: checking whether snprintf handles 'long long int' as %lld" else cat > conftest.$ac_ext <<EOF -#line 7696 "configure" +#line 7755 "configure" #include "confdefs.h" #include <stdio.h> typedef long long int int64; @@ -7719,7 +7778,7 @@ main() { exit(! does_int64_snprintf_work()); } EOF -if { (eval echo configure:7723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7782: \"$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"' @@ -7730,7 +7789,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:7734: checking whether snprintf handles 'long long int' as %qd" >&5 +echo "configure:7793: 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 @@ -7739,7 +7798,7 @@ echo "configure:7734: checking whether snprintf handles 'long long int' as %qd" else cat > conftest.$ac_ext <<EOF -#line 7743 "configure" +#line 7802 "configure" #include "confdefs.h" #include <stdio.h> typedef long long int int64; @@ -7766,7 +7825,7 @@ main() { exit(! does_int64_snprintf_work()); } EOF -if { (eval echo configure:7770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7829: \"$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"' @@ -7806,12 +7865,12 @@ EOF for ac_func in strtoll strtoq do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7810: checking for $ac_func" >&5 +echo "configure:7869: 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 7815 "configure" +#line 7874 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -7834,7 +7893,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:7838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7897: \"$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 @@ -7861,12 +7920,12 @@ done for ac_func in strtoull strtouq do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7865: checking for $ac_func" >&5 +echo "configure:7924: 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 7870 "configure" +#line 7929 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -7889,7 +7948,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:7893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7952: \"$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 @@ -7915,12 +7974,12 @@ done echo $ac_n "checking for atexit""... $ac_c" 1>&6 -echo "configure:7919: checking for atexit" >&5 +echo "configure:7978: checking for atexit" >&5 if eval "test \"`echo '$''{'ac_cv_func_atexit'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7924 "configure" +#line 7983 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char atexit(); below. */ @@ -7943,7 +8002,7 @@ atexit(); ; return 0; } EOF -if { (eval echo configure:7947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8006: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_atexit=yes" else @@ -7966,12 +8025,12 @@ else for ac_func in on_exit do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7970: checking for $ac_func" >&5 +echo "configure:8029: 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 7975 "configure" +#line 8034 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -7994,7 +8053,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:7998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8057: \"$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 @@ -8027,7 +8086,7 @@ fi echo $ac_n "checking size of unsigned long""... $ac_c" 1>&6 -echo "configure:8031: checking size of unsigned long" >&5 +echo "configure:8090: checking size of unsigned long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8035,7 +8094,7 @@ else ac_cv_sizeof_unsigned_long=4 else cat > conftest.$ac_ext <<EOF -#line 8039 "configure" +#line 8098 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -8046,7 +8105,7 @@ main() exit(0); } EOF -if { (eval echo configure:8050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_unsigned_long=`cat conftestval` else @@ -8072,7 +8131,7 @@ EOF echo $ac_n "checking alignment of short""... $ac_c" 1>&6 -echo "configure:8076: checking alignment of short" >&5 +echo "configure:8135: 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 @@ -8080,7 +8139,7 @@ else pgac_cv_alignof_short='sizeof(short)' else cat > conftest.$ac_ext <<EOF -#line 8084 "configure" +#line 8143 "configure" #include "confdefs.h" #include <stdio.h> struct { char filler; short field; } mystruct; @@ -8092,7 +8151,7 @@ main() exit(0); } EOF -if { (eval echo configure:8096: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8155: \"$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 @@ -8112,7 +8171,7 @@ EOF echo $ac_n "checking alignment of int""... $ac_c" 1>&6 -echo "configure:8116: checking alignment of int" >&5 +echo "configure:8175: 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 @@ -8120,7 +8179,7 @@ else pgac_cv_alignof_int='sizeof(int)' else cat > conftest.$ac_ext <<EOF -#line 8124 "configure" +#line 8183 "configure" #include "confdefs.h" #include <stdio.h> struct { char filler; int field; } mystruct; @@ -8132,7 +8191,7 @@ main() exit(0); } EOF -if { (eval echo configure:8136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8195: \"$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 @@ -8152,7 +8211,7 @@ EOF echo $ac_n "checking alignment of long""... $ac_c" 1>&6 -echo "configure:8156: checking alignment of long" >&5 +echo "configure:8215: 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 @@ -8160,7 +8219,7 @@ else pgac_cv_alignof_long='sizeof(long)' else cat > conftest.$ac_ext <<EOF -#line 8164 "configure" +#line 8223 "configure" #include "confdefs.h" #include <stdio.h> struct { char filler; long field; } mystruct; @@ -8172,7 +8231,7 @@ main() exit(0); } EOF -if { (eval echo configure:8176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8235: \"$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 @@ -8193,7 +8252,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:8197: checking alignment of long long int" >&5 +echo "configure:8256: 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 @@ -8201,7 +8260,7 @@ else pgac_cv_alignof_long_long_int='sizeof(long long int)' else cat > conftest.$ac_ext <<EOF -#line 8205 "configure" +#line 8264 "configure" #include "confdefs.h" #include <stdio.h> struct { char filler; long long int field; } mystruct; @@ -8213,7 +8272,7 @@ main() exit(0); } EOF -if { (eval echo configure:8217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8276: \"$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 @@ -8234,7 +8293,7 @@ EOF fi echo $ac_n "checking alignment of double""... $ac_c" 1>&6 -echo "configure:8238: checking alignment of double" >&5 +echo "configure:8297: 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 @@ -8242,7 +8301,7 @@ else pgac_cv_alignof_double='sizeof(double)' else cat > conftest.$ac_ext <<EOF -#line 8246 "configure" +#line 8305 "configure" #include "confdefs.h" #include <stdio.h> struct { char filler; double field; } mystruct; @@ -8254,7 +8313,7 @@ main() exit(0); } EOF -if { (eval echo configure:8258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8317: \"$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 @@ -8292,12 +8351,12 @@ EOF echo $ac_n "checking for POSIX signal interface""... $ac_c" 1>&6 -echo "configure:8296: checking for POSIX signal interface" >&5 +echo "configure:8355: 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 8301 "configure" +#line 8360 "configure" #include "confdefs.h" #include <signal.h> @@ -8308,7 +8367,7 @@ act.sa_flags = SA_RESTART; sigaction(0, &act, &oact); ; return 0; } EOF -if { (eval echo configure:8312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8371: \"$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 @@ -8338,7 +8397,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:8342: checking for $ac_word" >&5 +echo "configure:8401: 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 @@ -8374,7 +8433,7 @@ test -n "$TCLSH" && break done echo $ac_n "checking for tclConfig.sh""... $ac_c" 1>&6 -echo "configure:8378: checking for tclConfig.sh" >&5 +echo "configure:8437: checking for tclConfig.sh" >&5 # Let user override test if test -z "$TCL_CONFIG_SH"; then pgac_test_dirs="$with_tclconfig" @@ -8407,7 +8466,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:8411: checking for tkConfig.sh" >&5 +echo "configure:8470: checking for tkConfig.sh" >&5 # Let user override test if test -z "$TK_CONFIG_SH"; then pgac_test_dirs="$with_tkconfig $with_tclconfig" @@ -8446,7 +8505,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:8450: checking for $ac_word" >&5 +echo "configure:8509: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_NSGMLS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8482,7 +8541,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:8486: checking for $ac_word" >&5 +echo "configure:8545: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_JADE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8513,7 +8572,7 @@ done echo $ac_n "checking for DocBook V3.1""... $ac_c" 1>&6 -echo "configure:8517: checking for DocBook V3.1" >&5 +echo "configure:8576: checking for DocBook V3.1" >&5 if eval "test \"`echo '$''{'pgac_cv_check_docbook'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8546,7 +8605,7 @@ have_docbook=$pgac_cv_check_docbook echo $ac_n "checking for DocBook stylesheets""... $ac_c" 1>&6 -echo "configure:8550: checking for DocBook stylesheets" >&5 +echo "configure:8609: checking for DocBook stylesheets" >&5 if eval "test \"`echo '$''{'pgac_cv_path_stylesheets'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8585,7 +8644,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:8589: checking for $ac_word" >&5 +echo "configure:8648: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_SGMLSPL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8804,6 +8863,8 @@ s%@krb_srvtab@%$krb_srvtab%g s%@with_pam@%$with_pam%g s%@with_openssl@%$with_openssl%g s%@enable_odbc@%$enable_odbc%g +s%@with_unixodbc@%$with_unixodbc%g +s%@with_iodbc@%$with_iodbc%g s%@odbcinst_ini_dir@%$odbcinst_ini_dir%g s%@ELF_SYS@%$ELF_SYS%g s%@CXX@%$CXX%g diff --git a/configure.in b/configure.in index 28f60e5de1a..7dc5af0ee0c 100644 --- a/configure.in +++ b/configure.in @@ -567,8 +567,23 @@ fi AC_MSG_CHECKING([whether to build the ODBC driver]) PGAC_ARG_BOOL(enable, odbc, no, [ --enable-odbc build the ODBC driver package]) -AC_MSG_RESULT([$enable_odbc]) +PGAC_ARG_BOOL(with, unixodbc, no, [ --with-unixodbc build ODBC driver for unixODBC]) +PGAC_ARG_BOOL(with, iodbc, no, [ --with-iodbc build ODBC driver for iODBC]) +if test "$with_unixodbc" = yes && test "$with_iodbc" = yes; then + AC_MSG_ERROR([ODBC driver cannot be built for both unixODBC and iODBC]) +fi +if test "$with_unixodbc" = yes || test "$with_iodbc" = yes; then + enable_odbc=yes +fi +case $enable_odbc:$with_unixodbc:$with_iodbc in + yes:no:no) AC_MSG_RESULT([yes (stand-alone)]);; + yes:yes:no) AC_MSG_RESULT([yes (unixODBC)]); AC_DEFINE(WITH_UNIXODBC);; + yes:no:yes) AC_MSG_RESULT([yes (iODBC)]); AC_DEFINE(WITH_IODBC);; + no:*) AC_MSG_RESULT(no);; +esac AC_SUBST([enable_odbc]) +AC_SUBST([with_unixodbc]) +AC_SUBST([with_iodbc]) # Allow for overriding the default location of the odbcinst.ini diff --git a/src/Makefile.global.in b/src/Makefile.global.in index 9af54765418..d5123abb235 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -1,5 +1,5 @@ # -*-makefile-*- -# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.138 2001/09/17 23:00:27 petere Exp $ +# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.139 2001/09/22 22:54:32 petere Exp $ #------------------------------------------------------------------------------ # All PostgreSQL makefiles include this file and use the variables it sets, @@ -127,6 +127,8 @@ with_tcl = @with_tcl@ enable_pltcl_unknown = @enable_pltcl_unknown@ with_tk = @with_tk@ enable_odbc = @enable_odbc@ +with_iodbc = @with_iodbc@ +with_unixodbc = @with_unixodbc@ MULTIBYTE = @MULTIBYTE@ enable_shared = @enable_shared@ enable_rpath = @enable_rpath@ diff --git a/src/Makefile.shlib b/src/Makefile.shlib index 0635049d064..4b89aa49279 100644 --- a/src/Makefile.shlib +++ b/src/Makefile.shlib @@ -6,7 +6,7 @@ # Copyright (c) 1998, Regents of the University of California # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.53 2001/09/11 23:20:41 petere Exp $ +# $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.54 2001/09/22 22:54:32 petere Exp $ # #------------------------------------------------------------------------- @@ -263,6 +263,7 @@ ifeq ($(PORTNAME), beos) SHLIB_LINK += -ltermcap -lstdc++.r4 -lbind -lsocket -L/boot/develop/lib/x86 endif +SHLIB_LINK := $(filter -L%, $(LDFLAGS)) $(SHLIB_LINK) ifeq ($(enable_rpath), yes) SHLIB_LINK += $(rpath) endif diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in index 3944e1c9396..c8bee9bc5d2 100644 --- a/src/include/pg_config.h.in +++ b/src/include/pg_config.h.in @@ -8,7 +8,7 @@ * or in pg_config.h afterwards. Of course, if you edit pg_config.h, then your * changes will be overwritten the next time you run configure. * - * $Id: pg_config.h.in,v 1.6 2001/09/14 10:36:52 ishii Exp $ + * $Id: pg_config.h.in,v 1.7 2001/09/22 22:54:32 petere Exp $ */ #ifndef PG_CONFIG_H @@ -98,6 +98,13 @@ /* location of locale files */ #undef LOCALEDIR +/* Define to build the ODBC driver for unixODBC */ +#undef WITH_UNIXODBC + +/* Define to build the ODBC driver for iODBC */ +#undef WITH_IODBC + + /* *------------------------------------------------------------------------ * Part 2: feature symbols and limits that are user-configurable, but diff --git a/src/interfaces/libpq/Makefile b/src/interfaces/libpq/Makefile index c603a2b6a83..8b8f3c91d1d 100644 --- a/src/interfaces/libpq/Makefile +++ b/src/interfaces/libpq/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 1994, Regents of the University of California # -# $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.58 2001/09/21 20:31:48 tgl Exp $ +# $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.59 2001/09/22 22:54:32 petere Exp $ # #------------------------------------------------------------------------- @@ -30,7 +30,7 @@ endif # Add libraries that libpq depends (or might depend) on into the # shared library link. (The order in which you list them here doesn't # matter.) -SHLIB_LINK += $(filter -L%, $(LDFLAGS)) $(filter -lcrypt -ldes -lkrb -lcom_err -lcrypto -lk5crypto -lkrb5 -lssl -lsocket -lnsl -lresolv -lintl, $(LIBS)) +SHLIB_LINK += $(filter -lcrypt -ldes -lkrb -lcom_err -lcrypto -lk5crypto -lkrb5 -lssl -lsocket -lnsl -lresolv -lintl, $(LIBS)) all: all-lib diff --git a/src/interfaces/odbc/GNUmakefile b/src/interfaces/odbc/GNUmakefile index 2d442efe1ac..8585f57cfef 100644 --- a/src/interfaces/odbc/GNUmakefile +++ b/src/interfaces/odbc/GNUmakefile @@ -2,7 +2,7 @@ # # GNUMakefile for psqlodbc (Postgres ODBC driver) # -# $Header: /cvsroot/pgsql/src/interfaces/odbc/Attic/GNUmakefile,v 1.19 2001/09/11 23:27:10 petere Exp $ +# $Header: /cvsroot/pgsql/src/interfaces/odbc/Attic/GNUmakefile,v 1.20 2001/09/22 22:54:32 petere Exp $ # #------------------------------------------------------------------------- @@ -11,23 +11,36 @@ top_builddir = ../../.. include $(top_builddir)/src/Makefile.global # Shared library parameters +ifeq ($(with_unixodbc),yes) +NAME = odbcpsql +else NAME = psqlodbc +endif SO_MAJOR_VERSION = 0 SO_MINOR_VERSION = 27 -override CPPFLAGS := -I$(srcdir) $(CPPFLAGS) -DHAVE_CONFIG_H -DODBCINSTDIR='"$(odbcinst_ini_dir)"' +override CPPFLAGS := -I$(srcdir) $(CPPFLAGS) -DODBCINSTDIR='"$(odbcinst_ini_dir)"' OBJS = info.o bind.o columninfo.o connection.o convert.o drvconn.o \ environ.o execute.o lobj.o misc.o options.o \ pgtypes.o psqlodbc.o qresult.o results.o socket.o parse.o statement.o \ - gpps.o tuple.o tuplelist.o dlg_specific.o odbcapi.o $(OBJX) + tuple.o tuplelist.o dlg_specific.o odbcapi.o ifdef MULTIBYTE OBJS += multibyte.o endif -SHLIB_LINK = $(filter -lm -lnsl -lsocket, $(LIBS)) +SHLIB_LINK += $(filter -lm -lnsl -lsocket, $(LIBS)) +ifeq ($(with_unixodbc),yes) +SHLIB_LINK += -lodbcinst +endif +ifeq ($(with_iodbc),yes) +SHLIB_LINK += -liodbcinst +endif +ifeq ($(with_unixodbc)$(with_iodbc),nono) +OBJS += gpps.o +endif all: all-lib diff --git a/src/interfaces/odbc/bind.c b/src/interfaces/odbc/bind.c index ce172365486..062632df480 100644 --- a/src/interfaces/odbc/bind.c +++ b/src/interfaces/odbc/bind.c @@ -22,14 +22,6 @@ #include <stdlib.h> #include <string.h> -#ifndef WIN32 -#include "iodbc.h" -#include "isql.h" -#include "isqlext.h" -#else -#include "sql.h" -#include "sqlext.h" -#endif #include "pgapifunc.h" diff --git a/src/interfaces/odbc/connection.c b/src/interfaces/odbc/connection.c index 7dc3fde0b25..70c7b782309 100644 --- a/src/interfaces/odbc/connection.c +++ b/src/interfaces/odbc/connection.c @@ -14,12 +14,12 @@ */ /* Multibyte support Eiji Tokuya 2001-03-15 */ +#include "connection.h" + #include <stdio.h> #include <string.h> #include <ctype.h> -#include "connection.h" - #include "environ.h" #include "socket.h" #include "statement.h" @@ -31,9 +31,6 @@ #include "multibyte.h" #endif -#ifdef WIN32 -#include <odbcinst.h> -#endif #include "pgapifunc.h" #define STMT_INCREMENT 16 /* how many statement holders to allocate diff --git a/src/interfaces/odbc/connection.h b/src/interfaces/odbc/connection.h index fc3560d3522..505325ad682 100644 --- a/src/interfaces/odbc/connection.h +++ b/src/interfaces/odbc/connection.h @@ -14,16 +14,6 @@ #include <stdlib.h> #include <string.h> -#ifndef WIN32 -#include "iodbc.h" -#include "isql.h" -#include "isqlext.h" -#else -#include <windows.h> -#include <sql.h> -#include <sqlext.h> -#endif - typedef enum { diff --git a/src/interfaces/odbc/convert.c b/src/interfaces/odbc/convert.c index f39a34f4c15..03d1b0817bc 100644 --- a/src/interfaces/odbc/convert.c +++ b/src/interfaces/odbc/convert.c @@ -17,26 +17,16 @@ */ /* Multibyte support Eiji Tokuya 2001-03-15 */ +#include "convert.h" + #include <stdio.h> #include <string.h> #include <ctype.h> -#include "psqlodbc.h" #ifdef MULTIBYTE #include "multibyte.h" #endif -#ifndef WIN32 -#include "iodbc.h" -#include "isql.h" -#include "isqlext.h" -#else -#include <windows.h> -#include <sql.h> -#include <sqlext.h> -#endif - -#include "convert.h" #include <time.h> #include <math.h> #include <stdlib.h> @@ -48,17 +38,6 @@ #include "connection.h" #include "pgapifunc.h" -#ifndef WIN32 -#ifndef HAVE_STRICMP -#define stricmp(s1,s2) strcasecmp(s1,s2) -#define strnicmp(s1,s2,n) strncasecmp(s1,s2,n) -#endif -#ifndef SCHAR -typedef signed char SCHAR; - -#endif -#endif - /* * How to map ODBC scalar functions {fn func(args)} to Postgres. diff --git a/src/interfaces/odbc/dlg_specific.c b/src/interfaces/odbc/dlg_specific.c index c02f633fdb3..e67a1dc020d 100644 --- a/src/interfaces/odbc/dlg_specific.c +++ b/src/interfaces/odbc/dlg_specific.c @@ -17,20 +17,8 @@ */ /* Multibyte support Eiji Tokuya 2001-03-15 */ -#include "psqlodbc.h" - -#ifndef WIN32 -#include <string.h> -#include "gpps.h" -#define SQLGetPrivateProfileString(a,b,c,d,e,f) GetPrivateProfileString(a,b,c,d,e,f) -#define SQLWritePrivateProfileString(a,b,c,d) WritePrivateProfileString(a,b,c,d) -#ifndef HAVE_STRICMP -#define stricmp(s1,s2) strcasecmp(s1,s2) -#define strnicmp(s1,s2,n) strncasecmp(s1,s2,n) -#endif -#endif - #include "dlg_specific.h" + #include "convert.h" #ifdef MULTIBYTE diff --git a/src/interfaces/odbc/dlg_specific.h b/src/interfaces/odbc/dlg_specific.h index 6fc04ad2fb9..16a159c3d1a 100644 --- a/src/interfaces/odbc/dlg_specific.h +++ b/src/interfaces/odbc/dlg_specific.h @@ -13,9 +13,7 @@ #include "connection.h" #ifdef WIN32 -#include <windows.h> #include <windowsx.h> -#include <odbcinst.h> #include "resource.h" #endif diff --git a/src/interfaces/odbc/drvconn.c b/src/interfaces/odbc/drvconn.c index 781bdd54903..f2d5dab08c7 100644 --- a/src/interfaces/odbc/drvconn.c +++ b/src/interfaces/odbc/drvconn.c @@ -25,18 +25,12 @@ #define NEAR #else #include <winsock.h> -#include <sqlext.h> #endif #include <string.h> -#ifndef WIN32 -#define stricmp(s1,s2) strcasecmp(s1,s2) -#define strnicmp(s1,s2,n) strncasecmp(s1,s2,n) -#else -#include <windows.h> +#ifdef WIN32 #include <windowsx.h> -#include <odbcinst.h> #include "resource.h" #endif #include "pgapifunc.h" diff --git a/src/interfaces/odbc/environ.h b/src/interfaces/odbc/environ.h index 6d50fa6b48f..7b463b3e744 100644 --- a/src/interfaces/odbc/environ.h +++ b/src/interfaces/odbc/environ.h @@ -11,16 +11,6 @@ #include "psqlodbc.h" -#ifndef WIN32 -#include "iodbc.h" -#include "isql.h" -#include "isqlext.h" -#else -#include <windows.h> -#include <sql.h> -#include <sqlext.h> -#endif - #define ENV_ALLOC_ERROR 1 /********** Environment Handle *************/ diff --git a/src/interfaces/odbc/execute.c b/src/interfaces/odbc/execute.c index d13a37e8eff..991407975e7 100644 --- a/src/interfaces/odbc/execute.c +++ b/src/interfaces/odbc/execute.c @@ -14,17 +14,10 @@ */ #include "psqlodbc.h" + #include <stdio.h> #include <string.h> -#ifndef WIN32 -#include "iodbc.h" -#include "isqlext.h" -#else -#include <windows.h> -#include <sqlext.h> -#endif - #include "connection.h" #include "statement.h" #include "qresult.h" diff --git a/src/interfaces/odbc/gpps.c b/src/interfaces/odbc/gpps.c index 450f0b1e505..3f013bc5d2e 100644 --- a/src/interfaces/odbc/gpps.c +++ b/src/interfaces/odbc/gpps.c @@ -19,7 +19,7 @@ *------- */ -#ifndef WIN32 +#if !defined(WIN32) && !defined(WITH_UNIXODBC) && !defined(WITH_IODBC) #include "gpps.h" diff --git a/src/interfaces/odbc/gpps.h b/src/interfaces/odbc/gpps.h index c0b6a20796c..48b6722573d 100644 --- a/src/interfaces/odbc/gpps.h +++ b/src/interfaces/odbc/gpps.h @@ -8,9 +8,11 @@ #ifndef WIN32 #include <sys/types.h> -#include "iodbc.h" #endif +#define SQLGetPrivateProfileString(a,b,c,d,e,f) GetPrivateProfileString(a,b,c,d,e,f) +#define SQLWritePrivateProfileString(a,b,c,d) WritePrivateProfileString(a,b,c,d) + #ifdef __cplusplus extern "C" { diff --git a/src/interfaces/odbc/info.c b/src/interfaces/odbc/info.c index 6ff0d0b12e4..5f4059bd2d8 100644 --- a/src/interfaces/odbc/info.c +++ b/src/interfaces/odbc/info.c @@ -22,16 +22,7 @@ #include <stdio.h> #ifndef WIN32 -#include "iodbc.h" -#include "isql.h" -#include "isqlext.h" #include <ctype.h> -#else -#include <windows.h> -#include <sql.h> -#include <sqlext.h> - -#include <odbcinst.h> #endif #include "tuple.h" @@ -2060,7 +2051,7 @@ PGAPI_Statistics( char column_name[MAX_INFO_STRING], relhasrules[MAX_INFO_STRING]; char **column_names = 0; - Int4 column_name_len; + SQLINTEGER column_name_len; int total_columns = 0; char error = TRUE; ConnInfo *ci; diff --git a/src/interfaces/odbc/lobj.c b/src/interfaces/odbc/lobj.c index 16d592eafd2..6b55b82d54e 100644 --- a/src/interfaces/odbc/lobj.c +++ b/src/interfaces/odbc/lobj.c @@ -13,7 +13,7 @@ */ #include "lobj.h" -#include "psqlodbc.h" + #include "connection.h" diff --git a/src/interfaces/odbc/misc.c b/src/interfaces/odbc/misc.c index 87a4ee01ff5..b17c45e3110 100644 --- a/src/interfaces/odbc/misc.c +++ b/src/interfaces/odbc/misc.c @@ -143,21 +143,6 @@ qlog(char *fmt,...) #endif -/* Undefine these because windows.h will redefine and cause a warning */ - -#ifdef WIN32 -#undef va_start -#undef va_end -#endif - -#ifndef WIN32 -#include "iodbc.h" -#include "isql.h" -#else -#include <windows.h> -#include <sql.h> -#endif - /* * returns STRCPY_FAIL, STRCPY_TRUNCATED, or #bytes copied diff --git a/src/interfaces/odbc/misc.h b/src/interfaces/odbc/misc.h index 016b4b7a5e9..5cedd4c147e 100644 --- a/src/interfaces/odbc/misc.h +++ b/src/interfaces/odbc/misc.h @@ -11,11 +11,6 @@ #include "psqlodbc.h" -#ifndef WIN32 -#include "gpps.h" -#define SQLGetPrivateProfileString(a,b,c,d,e,f) GetPrivateProfileString(a,b,c,d,e,f) -#endif - #include <stdio.h> /* Uncomment MY_LOG define to compile in the mylog() statements. diff --git a/src/interfaces/odbc/odbcapi.c b/src/interfaces/odbc/odbcapi.c index dbb3142401f..9718aa9ff3a 100644 --- a/src/interfaces/odbc/odbcapi.c +++ b/src/interfaces/odbc/odbcapi.c @@ -34,13 +34,6 @@ #include <stdio.h> #include <string.h> -#ifndef WIN32 -#include "iodbc.h" -#include "isqlext.h" -#else -#include <windows.h> -#include <sqlext.h> -#endif #include "pgapifunc.h" #include "connection.h" #include "statement.h" diff --git a/src/interfaces/odbc/odbcapi30.c b/src/interfaces/odbc/odbcapi30.c index e657595c031..24688583efd 100644 --- a/src/interfaces/odbc/odbcapi30.c +++ b/src/interfaces/odbc/odbcapi30.c @@ -24,13 +24,6 @@ #include <stdio.h> #include <string.h> -#ifndef WIN32 -#include "iodbc.h" -#include "isqlext.h" -#else -#include <windows.h> -#include <sqlext.h> -#endif #include "environ.h" #include "connection.h" #include "statement.h" diff --git a/src/interfaces/odbc/options.c b/src/interfaces/odbc/options.c index a9a0a287fbd..bc221186baa 100644 --- a/src/interfaces/odbc/options.c +++ b/src/interfaces/odbc/options.c @@ -16,16 +16,6 @@ #include "psqlodbc.h" #include <string.h> -#ifndef WIN32 -#include "iodbc.h" -#include "isql.h" -#include "isqlext.h" -#else -#include <windows.h> -#include <sql.h> -#include <sqlext.h> -#endif - #include "environ.h" #include "connection.h" #include "statement.h" diff --git a/src/interfaces/odbc/parse.c b/src/interfaces/odbc/parse.c index 0f0aff6e04e..4fa7fffea5e 100644 --- a/src/interfaces/odbc/parse.c +++ b/src/interfaces/odbc/parse.c @@ -38,13 +38,6 @@ #include "multibyte.h" #endif -#ifndef WIN32 -#ifndef HAVE_STRICMP -#define stricmp(s1,s2) strcasecmp(s1,s2) -#define strnicmp(s1,s2,n) strncasecmp(s1,s2,n) -#endif -#endif - #define FLD_INCR 32 #define TAB_INCR 8 #define COL_INCR 16 diff --git a/src/interfaces/odbc/pgapifunc.h b/src/interfaces/odbc/pgapifunc.h index a4aca5f323d..72a5286e9f4 100644 --- a/src/interfaces/odbc/pgapifunc.h +++ b/src/interfaces/odbc/pgapifunc.h @@ -10,13 +10,6 @@ #include <stdio.h> #include <string.h> -#ifndef WIN32 -#include "iodbc.h" -#include "isqlext.h" -#else -#include <windows.h> -#include <sqlext.h> -#endif RETCODE SQL_API PGAPI_AllocConnect(HENV EnvironmentHandle, HDBC FAR *ConnectionHandle); diff --git a/src/interfaces/odbc/pgtypes.c b/src/interfaces/odbc/pgtypes.c index dd242d7bdcd..0af96536e8f 100644 --- a/src/interfaces/odbc/pgtypes.c +++ b/src/interfaces/odbc/pgtypes.c @@ -23,16 +23,6 @@ #include "connection.h" #include "qresult.h" -#ifndef WIN32 -#include "iodbc.h" -#include "isql.h" -#include "isqlext.h" -#else -#include <windows.h> -#include <sql.h> -#include <sqlext.h> -#endif - Int4 getCharPrecision(StatementClass *stmt, Int4 type, int col, int handle_unknown_size_as); diff --git a/src/interfaces/odbc/psqlodbc.c b/src/interfaces/odbc/psqlodbc.c index ad156379d0a..3c8ff2a53ff 100644 --- a/src/interfaces/odbc/psqlodbc.c +++ b/src/interfaces/odbc/psqlodbc.c @@ -16,15 +16,8 @@ #include "psqlodbc.h" #include "dlg_specific.h" -#ifndef WIN32 -#include "iodbc.h" -#include "isql.h" -#include "isqlext.h" -#else +#ifdef WIN32 #include <winsock.h> -#include <windows.h> -#include <sql.h> -#include <odbcinst.h> #endif GLOBAL_VALUES globals; diff --git a/src/interfaces/odbc/psqlodbc.h b/src/interfaces/odbc/psqlodbc.h index 98fd47205f9..94b9c76701e 100644 --- a/src/interfaces/odbc/psqlodbc.h +++ b/src/interfaces/odbc/psqlodbc.h @@ -5,26 +5,58 @@ * * Comments: See "notice.txt" for copyright and license information. * - * $Id: psqlodbc.h,v 1.48 2001/09/08 16:20:16 inoue Exp $ + * $Id: psqlodbc.h,v 1.49 2001/09/22 22:54:33 petere Exp $ * */ #ifndef __PSQLODBC_H__ #define __PSQLODBC_H__ -#ifdef HAVE_CONFIG_H +#ifndef WIN32 #include "pg_config.h" +#else +#include <windows.h> #endif #include <stdio.h> /* for FILE* pointers: see GLOBAL_VALUES */ +/* Must come before sql.h */ +#define ODBCVER 0x0250 + + +#if defined(WIN32) || defined(WITH_UNIXODBC) || defined(WITH_IODBC) +#include <sql.h> +#include <sqlext.h> +#else +#include "iodbc.h" +#include "isql.h" +#include "isqlext.h" +#endif + +#if defined(WIN32) +#include <odbcinst.h> +#elif defined(WITH_UNIXODBC) +#include <odbcinst.h> +#elif defined(WITH_IODBC) +#include <iodbcinst.h> +#else +#include "gpps.h" +#endif + #ifndef WIN32 #define Int4 long int #define UInt4 unsigned int #define Int2 short #define UInt2 unsigned short + +#if !defined(WITH_UNIXODBC) && !defined(WITH_IODBC) typedef float SFLOAT; typedef double SDOUBLE; +#endif + +#ifndef CALLBACK +#define CALLBACK +#endif #else #define Int4 int @@ -35,8 +67,12 @@ typedef double SDOUBLE; typedef UInt4 Oid; +#ifndef WIN32 +#define stricmp strcasecmp +#define strnicmp strncasecmp +#endif + /* Driver stuff */ -#define ODBCVER 0x0250 #define DRIVER_ODBC_VER "02.50" #define DRIVERNAME "PostgreSQL ODBC" diff --git a/src/interfaces/odbc/qresult.c b/src/interfaces/odbc/qresult.c index 103b299ed36..b3c8f6fcc09 100644 --- a/src/interfaces/odbc/qresult.c +++ b/src/interfaces/odbc/qresult.c @@ -21,6 +21,7 @@ */ #include "qresult.h" + #include "misc.h" #include <stdio.h> #include <string.h> diff --git a/src/interfaces/odbc/results.c b/src/interfaces/odbc/results.c index 2475eeef9e3..c5652ff984d 100644 --- a/src/interfaces/odbc/results.c +++ b/src/interfaces/odbc/results.c @@ -29,13 +29,6 @@ #include <stdio.h> -#ifndef WIN32 -#include "iodbc.h" -#include "isqlext.h" -#else -#include <windows.h> -#include <sqlext.h> -#endif #include "pgapifunc.h" diff --git a/src/interfaces/odbc/setup.c b/src/interfaces/odbc/setup.c index 65f3423cf15..6b75840d98e 100644 --- a/src/interfaces/odbc/setup.c +++ b/src/interfaces/odbc/setup.c @@ -14,10 +14,9 @@ */ #include "psqlodbc.h" + #include "connection.h" -#include <windows.h> #include <windowsx.h> -#include <odbcinst.h> #include <string.h> #include <stdlib.h> #include "resource.h" diff --git a/src/interfaces/odbc/socket.c b/src/interfaces/odbc/socket.c index fbfb5ca9297..28a7af22bb5 100644 --- a/src/interfaces/odbc/socket.c +++ b/src/interfaces/odbc/socket.c @@ -13,6 +13,7 @@ */ #include "socket.h" + #include "connection.h" #ifndef WIN32 diff --git a/src/interfaces/odbc/socket.h b/src/interfaces/odbc/socket.h index f4c7b9e4e43..b49bebea9bb 100644 --- a/src/interfaces/odbc/socket.h +++ b/src/interfaces/odbc/socket.h @@ -36,8 +36,6 @@ typedef unsigned int in_addr_t; #define SOCKETFD SOCKET #endif -#include "psqlodbc.h" - #define SOCKET_ALREADY_CONNECTED 1 #define SOCKET_HOST_NOT_FOUND 2 #define SOCKET_COULD_NOT_CREATE_SOCKET 3 diff --git a/src/interfaces/odbc/statement.c b/src/interfaces/odbc/statement.c index 9efd4fb52c8..ea296ea7b3a 100644 --- a/src/interfaces/odbc/statement.c +++ b/src/interfaces/odbc/statement.c @@ -13,6 +13,7 @@ */ #include "statement.h" + #include "bind.h" #include "connection.h" #include "qresult.h" @@ -23,22 +24,9 @@ #include <string.h> #include <ctype.h> -#ifndef WIN32 -#include "iodbc.h" -#include "isql.h" -#else -#include <windows.h> -#include <sql.h> -#endif #include "pgapifunc.h" -#ifndef WIN32 -#ifndef HAVE_STRICMP -#define stricmp(s1,s2) strcasecmp(s1,s2) -#define strnicmp(s1,s2,n) strncasecmp(s1,s2,n) -#endif -#endif #define PRN_NULLCHECK diff --git a/src/interfaces/odbc/statement.h b/src/interfaces/odbc/statement.h index 834eb005b3d..c1a2152b0c0 100644 --- a/src/interfaces/odbc/statement.h +++ b/src/interfaces/odbc/statement.h @@ -10,15 +10,8 @@ #define __STATEMENT_H__ #include "psqlodbc.h" -#include "bind.h" -#ifndef WIN32 -#include "iodbc.h" -#include "isql.h" -#else -#include <windows.h> -#include <sql.h> -#endif +#include "bind.h" #ifndef FALSE diff --git a/src/interfaces/odbc/tuple.c b/src/interfaces/odbc/tuple.c index 658b7a75ec7..512f36d2b23 100644 --- a/src/interfaces/odbc/tuple.c +++ b/src/interfaces/odbc/tuple.c @@ -18,6 +18,7 @@ */ #include "tuple.h" + #include <string.h> #include <stdlib.h> diff --git a/src/interfaces/odbc/tuplelist.c b/src/interfaces/odbc/tuplelist.c index 284ee8ed440..5f3871600d6 100644 --- a/src/interfaces/odbc/tuplelist.c +++ b/src/interfaces/odbc/tuplelist.c @@ -14,6 +14,7 @@ */ #include "tuplelist.h" + #include <stdlib.h> #include "tuple.h" |