From f428d053ce075bafe1785d0ba7792f4eb92d93d5 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <peter_e@gmx.net>
Date: Mon, 25 Sep 2000 22:23:01 +0000
Subject: [PATCH] Revise Tcl/Tk configuration. Make missing Tcl after
--with-tcl an error, add --without-tk option to disable Tk. We don't need
the AC_PATH_XTRA test because tkConfig.sh already contains all the
information about how to compile and link with X. Also make sure that libpq
is up to date for libpgtcl. Remove executable bits from pgaccess.sh, but add
it to pgaccess.
---
aclocal.m4 | 3 +-
config/tcl.m4 | 76 ++
configure | 1914 ++++++++----------------------
configure.in | 158 +--
src/Makefile.global.in | 14 +-
src/bin/Makefile | 7 +-
src/bin/pgaccess/Makefile | 9 +-
src/bin/pgaccess/pgaccess.sh | 6 +-
src/bin/pgtclsh/Makefile | 23 +-
src/interfaces/Makefile | 4 +-
src/interfaces/libpgtcl/Makefile | 8 +-
src/pl/Makefile | 4 +-
12 files changed, 643 insertions(+), 1583 deletions(-)
create mode 100644 config/tcl.m4
diff --git a/aclocal.m4 b/aclocal.m4
index e03245ad217..d37d1d959ca 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $Header: /cvsroot/pgsql/aclocal.m4,v 1.8 2000/09/21 20:17:41 petere Exp $
+dnl $Header: /cvsroot/pgsql/aclocal.m4,v 1.9 2000/09/25 22:22:52 petere Exp $
builtin([include], [config/ac_func_accept_argtypes.m4])
builtin([include], [config/c-compiler.m4])
builtin([include], [config/c-library.m4])
@@ -6,3 +6,4 @@ builtin([include], [config/cxx.m4])
builtin([include], [config/general.m4])
builtin([include], [config/programs.m4])
builtin([include], [config/python.m4])
+builtin([include], [config/tcl.m4])
diff --git a/config/tcl.m4 b/config/tcl.m4
new file mode 100644
index 00000000000..6916fe998b1
--- /dev/null
+++ b/config/tcl.m4
@@ -0,0 +1,76 @@
+# $Header: /cvsroot/pgsql/config/tcl.m4,v 1.1 2000/09/25 22:22:53 petere Exp $
+
+# Autoconf macros to check for Tcl related things
+
+
+AC_DEFUN([PGAC_PATH_TCLSH],
+ [AC_PATH_PROGS(TCLSH, [tclsh tcl])])
+
+
+# PGAC_PATH_TCLCONFIGSH([SEARCH-PATH])
+# ------------------------------------
+AC_DEFUN([PGAC_PATH_TCLCONFIGSH],
+[AC_REQUIRE([PGAC_PATH_TCLSH])[]dnl
+AC_BEFORE([$0], [PGAC_PATH_TKCONFIGSH])[]dnl
+AC_MSG_CHECKING([for tclConfig.sh])
+# Let user override test
+if test -z "$TCL_CONFIG_SH"; then
+ pgac_test_dirs="$1"
+
+ set X $pgac_test_dirs; shift
+ if test $[#] -eq 0; then
+ test -z "$TCLSH" && AC_MSG_ERROR([unable to locate tclConfig.sh because no Tcl shell was found])
+ set X `echo 'puts $auto_path' | $TCLSH`; shift
+ fi
+
+ for pgac_dir; do
+ if test -r "$pgac_dir/tclConfig.sh"; then
+ TCL_CONFIG_SH=$pgac_dir/tclConfig.sh
+ break
+ fi
+ done
+fi
+
+if test -z "$TCL_CONFIG_SH"; then
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([file \`tclConfig.sh' is required for Tcl])
+else
+ AC_MSG_RESULT([$TCL_CONFIG_SH])
+fi
+
+AC_SUBST([TCL_CONFIG_SH])
+])# PGAC_PATH_TCLCONFIGSH
+
+
+# PGAC_PATH_TKCONFIGSH([SEARCH-PATH])
+# ------------------------------------
+AC_DEFUN([PGAC_PATH_TKCONFIGSH],
+[AC_REQUIRE([PGAC_PATH_TCLSH])[]dnl
+AC_MSG_CHECKING([for tkConfig.sh])
+# Let user override test
+if test -z "$TK_CONFIG_SH"; then
+ pgac_test_dirs="$1"
+
+ set X $pgac_test_dirs; shift
+ if test $[#] -eq 0; then
+ test -z "$TCLSH" && AC_MSG_ERROR([unable to locate tkConfig.sh because no Tcl shell was found])
+ set X `echo 'puts $auto_path' | $TCLSH`; shift
+ fi
+
+ for pgac_dir; do
+ if test -r "$pgac_dir/tkConfig.sh"; then
+ TK_CONFIG_SH=$pgac_dir/tkConfig.sh
+ break
+ fi
+ done
+fi
+
+if test -z "$TK_CONFIG_SH"; then
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([file \`tkConfig.sh' is required for Tk])
+else
+ AC_MSG_RESULT([$TK_CONFIG_SH])
+fi
+
+AC_SUBST([TK_CONFIG_SH])
+])# PGAC_PATH_TKCONFIGSH
diff --git a/configure b/configure
index fa9d533574c..8f4f9a59cff 100755
--- a/configure
+++ b/configure
@@ -35,7 +35,9 @@ ac_help="$ac_help
ac_help="$ac_help
--enable-cassert enable assertion checks (for debugging)"
ac_help="$ac_help
- --with-tcl build Tcl interfaces and pgtclsh"
+ --with-tcl build Tcl and Tk interfaces"
+ac_help="$ac_help
+ --without-tk do not build Tk interfaces if Tcl is enabled"
ac_help="$ac_help
--with-tclconfig=DIR tclConfig.sh and tkConfig.sh are in DIR"
ac_help="$ac_help
@@ -49,7 +51,7 @@ ac_help="$ac_help
ac_help="$ac_help
--with-krb5[=DIR] build with Kerberos 5 support [/usr/athena]"
ac_help="$ac_help
- --with-krb-srvnam=NAME name of the PostgreSQL service principal in Kerberos"
+ --with-krb-srvnam=NAME name of the PostgreSQL service principal in Kerberos [postgres]"
ac_help="$ac_help
--with-openssl[=DIR] build with OpenSSL support [/usr/local/ssl]"
ac_help="$ac_help
@@ -60,8 +62,6 @@ ac_help="$ac_help
--with-CXX build C++ modules (libpq++)"
ac_help="$ac_help
--enable-syslog enable logging to syslog"
-ac_help="$ac_help
- --with-x use the X Window System"
# Initialize some variables set by options.
# The variables have the same names as the options, with
@@ -1522,18 +1522,19 @@ done
IFS=$ac_save_IFS
-
-# We exclude tcl support unless user says --with-tcl
-echo $ac_n "checking setting USE_TCL""... $ac_c" 1>&6
-echo "configure:1529: checking setting USE_TCL" >&5
+#
+# Tcl/Tk
+#
+echo $ac_n "checking whether to build with Tcl""... $ac_c" 1>&6
+echo "configure:1530: 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
yes)
- USE_TCL=true; USE_TK=true; echo "$ac_t""enabled" 1>&6
+ :
;;
no)
- USE_TCL=; USE_TK=; echo "$ac_t""disabled" 1>&6
+ :
;;
*)
withval=$with_tcl
@@ -1542,9 +1543,37 @@ if test x"${with_tcl+set}" = xset; then
esac # $with_tcl
else
with_tcl=no
-USE_TCL=; USE_TK=; echo "$ac_t""disabled" 1>&6
+
fi
+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:1554: 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
+ case $with_tk in
+ yes)
+ :
+ ;;
+ no)
+ :
+ ;;
+ *)
+ withval=$with_tk
+ { echo "configure: error: no argument expected for --with-tk option" 1>&2; exit 1; }
+ ;;
+ esac # $with_tk
+else
+ with_tk=yes
+fi
+else
+ with_tk=no
+fi
+echo "$ac_t""$with_tk" 1>&6
@@ -1560,14 +1589,9 @@ if test x"${with_tclconfig+set}" = xset; then
no)
{ echo "configure: error: argument required for --with-tclconfig option" 1>&2; exit 1; }
;;
- *)
- withval=$with_tclconfig
- TCL_DIRS=$withval
- ;;
esac # $with_tclconfig
fi
-
# We see if the path to the TK configuration scripts is specified.
# This will override the use of tclsh to find the paths to search.
@@ -1580,10 +1604,6 @@ if test x"${with_tkconfig+set}" = xset; then
no)
{ echo "configure: error: argument required for --with-tkconfig option" 1>&2; exit 1; }
;;
- *)
- withval=$with_tkconfig
- TK_DIRS=$withval
- ;;
esac # $with_tkconfig
fi
@@ -1592,7 +1612,7 @@ fi
# Optionally build Perl modules (Pg.pm and PL/Perl)
#
echo $ac_n "checking whether to build Perl modules""... $ac_c" 1>&6
-echo "configure:1596: checking whether to build Perl modules" >&5
+echo "configure:1616: 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
@@ -1619,7 +1639,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:1623: checking whether to build Python modules" >&5
+echo "configure:1643: 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
@@ -1628,7 +1648,7 @@ if test x"${with_python+set}" = xset; then
# Extract the first word of "python", so it can be a program name with args.
set dummy python; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1632: checking for $ac_word" >&5
+echo "configure:1652: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_PYTHON'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1664,7 +1684,7 @@ if test "${PYTHON+set}" = set ; then
python_extmakefile="${python_configdir}/Makefile.pre.in"
echo $ac_n "checking for Python extension makefile""... $ac_c" 1>&6
-echo "configure:1668: checking for Python extension makefile" >&5
+echo "configure:1688: checking for Python extension makefile" >&5
if test -f "${python_extmakefile}" ; then
echo "$ac_t""found" 1>&6
else
@@ -1896,7 +1916,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:1900: checking whether to build the ODBC driver" >&5
+echo "configure:1920: 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
@@ -1949,7 +1969,7 @@ case $host_os in
esac
cat > conftest.$ac_ext <<EOF
-#line 1953 "configure"
+#line 1973 "configure"
#include "confdefs.h"
#if __ELF__
yes
@@ -1978,7 +1998,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:1982: checking whether to build C++ modules" >&5
+echo "configure:2002: 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
@@ -2006,7 +2026,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:2010: checking for $ac_word" >&5
+echo "configure:2030: 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
@@ -2038,7 +2058,7 @@ test -n "$CXX" || CXX="gcc"
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:2042: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:2062: 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.
@@ -2049,12 +2069,12 @@ cross_compiling=$ac_cv_prog_cxx_cross
cat > conftest.$ac_ext << EOF
-#line 2053 "configure"
+#line 2073 "configure"
#include "confdefs.h"
int main(){return(0);}
EOF
-if { (eval echo configure:2058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2078: \"$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
@@ -2080,12 +2100,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:2084: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:2104: 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:2089: checking whether we are using GNU C++" >&5
+echo "configure:2109: 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
@@ -2094,7 +2114,7 @@ else
yes;
#endif
EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2098: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2118: \"$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
@@ -2113,7 +2133,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:2117: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:2137: 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
@@ -2145,7 +2165,7 @@ else
fi
echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
-echo "configure:2149: checking how to run the C++ preprocessor" >&5
+echo "configure:2169: 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
@@ -2158,12 +2178,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 2162 "configure"
+#line 2182 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2167: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2187: \"$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
:
@@ -2197,17 +2217,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:2201: checking for string" >&5
+echo "configure:2221: 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 2206 "configure"
+#line 2226 "configure"
#include "confdefs.h"
#include <string>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2211: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2231: \"$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*
@@ -2234,12 +2254,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:2238: checking for class string in <string.h>" >&5
+echo "configure:2258: 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 2243 "configure"
+#line 2263 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <stdlib.h>
@@ -2249,7 +2269,7 @@ int main() {
string foo = "test"
; return 0; }
EOF
-if { (eval echo configure:2253: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2273: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
pgac_cv_class_string_in_string_h=yes
else
@@ -2276,7 +2296,7 @@ cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking for namespace std in C++""... $ac_c" 1>&6
-echo "configure:2280: checking for namespace std in C++" >&5
+echo "configure:2300: 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
@@ -2290,7 +2310,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 2294 "configure"
+#line 2314 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <stdlib.h>
@@ -2303,7 +2323,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:2307: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2327: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
pgac_cv_cxx_namespace_std=yes
else
@@ -2359,7 +2379,7 @@ echo "using LDFLAGS=$LDFLAGS"
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:2363: checking for a BSD compatible install" >&5
+echo "configure:2383: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2441,7 +2461,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:2445: checking for $ac_word" >&5
+echo "configure:2465: 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
@@ -2471,7 +2491,7 @@ test -n "$AWK" && break
done
echo $ac_n "checking for flex""... $ac_c" 1>&6
-echo "configure:2475: checking for flex" >&5
+echo "configure:2495: checking for flex" >&5
if eval "test \"`echo '$''{'pgac_cv_path_flex'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2539,7 +2559,7 @@ fi
echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:2543: checking whether ln -s works" >&5
+echo "configure:2563: 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
@@ -2562,7 +2582,7 @@ fi
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2566: checking for $ac_word" >&5
+echo "configure:2586: 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
@@ -2592,7 +2612,7 @@ fi
# Extract the first word of "tar", so it can be a program name with args.
set dummy tar; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2596: checking for $ac_word" >&5
+echo "configure:2616: 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
@@ -2629,7 +2649,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:2633: checking for $ac_word" >&5
+echo "configure:2653: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_PERL'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2663,7 +2683,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:2667: checking for $ac_word" >&5
+echo "configure:2687: 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
@@ -2694,6 +2714,44 @@ done
test -n "$YACC" || YACC="yacc"
+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:2722: 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
+ case "$WISH" in
+ /*)
+ ac_cv_path_WISH="$WISH" # Let the user override the test with a path.
+ ;;
+ ?:/*)
+ ac_cv_path_WISH="$WISH" # Let the user override the test with a dos path.
+ ;;
+ *)
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
+ ac_dummy="$PATH"
+ for ac_dir in $ac_dummy; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ ac_cv_path_WISH="$ac_dir/$ac_word"
+ break
+ fi
+ done
+ IFS="$ac_save_ifs"
+ ;;
+esac
+fi
+WISH="$ac_cv_path_WISH"
+if test -n "$WISH"; then
+ echo "$ac_t""$WISH" 1>&6
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+ test -z "$WISH" && { echo "configure: error: \`wish' is required for Tk support" 1>&2; exit 1; }
+fi
##
@@ -2701,7 +2759,7 @@ test -n "$YACC" || YACC="yacc"
##
echo $ac_n "checking for main in -lsfio""... $ac_c" 1>&6
-echo "configure:2705: checking for main in -lsfio" >&5
+echo "configure:2763: checking for main in -lsfio" >&5
ac_lib_var=`echo sfio'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2709,14 +2767,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lsfio $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2713 "configure"
+#line 2771 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:2720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2778: \"$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
@@ -2744,7 +2802,7 @@ else
fi
echo $ac_n "checking for main in -lncurses""... $ac_c" 1>&6
-echo "configure:2748: checking for main in -lncurses" >&5
+echo "configure:2806: checking for main in -lncurses" >&5
ac_lib_var=`echo ncurses'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2752,14 +2810,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lncurses $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2756 "configure"
+#line 2814 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:2763: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2821: \"$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
@@ -2785,7 +2843,7 @@ EOF
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for main in -lcurses""... $ac_c" 1>&6
-echo "configure:2789: checking for main in -lcurses" >&5
+echo "configure:2847: checking for main in -lcurses" >&5
ac_lib_var=`echo curses'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2793,14 +2851,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lcurses $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2797 "configure"
+#line 2855 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:2804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2862: \"$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
@@ -2830,7 +2888,7 @@ fi
fi
echo $ac_n "checking for main in -ltermcap""... $ac_c" 1>&6
-echo "configure:2834: checking for main in -ltermcap" >&5
+echo "configure:2892: checking for main in -ltermcap" >&5
ac_lib_var=`echo termcap'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2838,14 +2896,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ltermcap $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2842 "configure"
+#line 2900 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:2849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2907: \"$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
@@ -2873,7 +2931,7 @@ else
fi
echo $ac_n "checking for main in -lreadline""... $ac_c" 1>&6
-echo "configure:2877: checking for main in -lreadline" >&5
+echo "configure:2935: checking for main in -lreadline" >&5
ac_lib_var=`echo readline'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2881,14 +2939,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lreadline $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2885 "configure"
+#line 2943 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:2892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2950: \"$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
@@ -2916,7 +2974,7 @@ else
fi
echo $ac_n "checking for using_history in -lreadline""... $ac_c" 1>&6
-echo "configure:2920: checking for using_history in -lreadline" >&5
+echo "configure:2978: checking for using_history in -lreadline" >&5
ac_lib_var=`echo readline'_'using_history | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2924,7 +2982,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lreadline $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2928 "configure"
+#line 2986 "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
@@ -2935,7 +2993,7 @@ int main() {
using_history()
; return 0; }
EOF
-if { (eval echo configure:2939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2997: \"$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
@@ -2957,7 +3015,7 @@ EOF
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for main in -lhistory""... $ac_c" 1>&6
-echo "configure:2961: checking for main in -lhistory" >&5
+echo "configure:3019: checking for main in -lhistory" >&5
ac_lib_var=`echo history'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2965,14 +3023,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lhistory $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2969 "configure"
+#line 3027 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:2976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3034: \"$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
@@ -3005,7 +3063,7 @@ fi
if test "$PORTNAME" != "aix" -a "$PORTNAME" != "alpha"
then
echo $ac_n "checking for main in -lbsd""... $ac_c" 1>&6
-echo "configure:3009: checking for main in -lbsd" >&5
+echo "configure:3067: 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
@@ -3013,14 +3071,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lbsd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3017 "configure"
+#line 3075 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3049,7 +3107,7 @@ fi
fi
echo $ac_n "checking for setproctitle in -lutil""... $ac_c" 1>&6
-echo "configure:3053: checking for setproctitle in -lutil" >&5
+echo "configure:3111: 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
@@ -3057,7 +3115,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lutil $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3061 "configure"
+#line 3119 "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
@@ -3068,7 +3126,7 @@ int main() {
setproctitle()
; return 0; }
EOF
-if { (eval echo configure:3072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3130: \"$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
@@ -3096,7 +3154,7 @@ else
fi
echo $ac_n "checking for main in -lm""... $ac_c" 1>&6
-echo "configure:3100: checking for main in -lm" >&5
+echo "configure:3158: 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
@@ -3104,14 +3162,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3108 "configure"
+#line 3166 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3115: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3173: \"$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
@@ -3139,7 +3197,7 @@ else
fi
echo $ac_n "checking for main in -ldl""... $ac_c" 1>&6
-echo "configure:3143: checking for main in -ldl" >&5
+echo "configure:3201: 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
@@ -3147,14 +3205,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3151 "configure"
+#line 3209 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3216: \"$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
@@ -3182,7 +3240,7 @@ else
fi
echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6
-echo "configure:3186: checking for main in -lsocket" >&5
+echo "configure:3244: 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
@@ -3190,14 +3248,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3194 "configure"
+#line 3252 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3259: \"$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
@@ -3225,7 +3283,7 @@ else
fi
echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6
-echo "configure:3229: checking for main in -lnsl" >&5
+echo "configure:3287: 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
@@ -3233,14 +3291,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3237 "configure"
+#line 3295 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3302: \"$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
@@ -3268,7 +3326,7 @@ else
fi
echo $ac_n "checking for main in -lipc""... $ac_c" 1>&6
-echo "configure:3272: checking for main in -lipc" >&5
+echo "configure:3330: 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
@@ -3276,14 +3334,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lipc $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3280 "configure"
+#line 3338 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3345: \"$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
@@ -3311,7 +3369,7 @@ else
fi
echo $ac_n "checking for main in -lIPC""... $ac_c" 1>&6
-echo "configure:3315: checking for main in -lIPC" >&5
+echo "configure:3373: 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
@@ -3319,14 +3377,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lIPC $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3323 "configure"
+#line 3381 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3388: \"$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
@@ -3354,7 +3412,7 @@ else
fi
echo $ac_n "checking for main in -llc""... $ac_c" 1>&6
-echo "configure:3358: checking for main in -llc" >&5
+echo "configure:3416: 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
@@ -3362,14 +3420,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-llc $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3366 "configure"
+#line 3424 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3431: \"$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
@@ -3397,7 +3455,7 @@ else
fi
echo $ac_n "checking for main in -ldld""... $ac_c" 1>&6
-echo "configure:3401: checking for main in -ldld" >&5
+echo "configure:3459: 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
@@ -3405,14 +3463,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldld $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3409 "configure"
+#line 3467 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3474: \"$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
@@ -3440,7 +3498,7 @@ else
fi
echo $ac_n "checking for main in -lln""... $ac_c" 1>&6
-echo "configure:3444: checking for main in -lln" >&5
+echo "configure:3502: checking for main in -lln" >&5
ac_lib_var=`echo ln'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3448,14 +3506,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lln $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3452 "configure"
+#line 3510 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3459: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3517: \"$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
@@ -3483,7 +3541,7 @@ else
fi
echo $ac_n "checking for main in -lld""... $ac_c" 1>&6
-echo "configure:3487: checking for main in -lld" >&5
+echo "configure:3545: 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
@@ -3491,14 +3549,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lld $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3495 "configure"
+#line 3553 "configure"
#include "confdefs.h"
int main() {
main()
; 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:3560: \"$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 +3584,7 @@ else
fi
echo $ac_n "checking for main in -lcompat""... $ac_c" 1>&6
-echo "configure:3530: checking for main in -lcompat" >&5
+echo "configure:3588: 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
@@ -3534,14 +3592,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lcompat $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3538 "configure"
+#line 3596 "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:3603: \"$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 +3627,7 @@ else
fi
echo $ac_n "checking for main in -lBSD""... $ac_c" 1>&6
-echo "configure:3573: checking for main in -lBSD" >&5
+echo "configure:3631: 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
@@ -3577,14 +3635,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lBSD $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3581 "configure"
+#line 3639 "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:3646: \"$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 +3670,7 @@ else
fi
echo $ac_n "checking for main in -lgen""... $ac_c" 1>&6
-echo "configure:3616: checking for main in -lgen" >&5
+echo "configure:3674: 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
@@ -3620,14 +3678,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lgen $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3624 "configure"
+#line 3682 "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:3689: \"$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 +3713,7 @@ else
fi
echo $ac_n "checking for main in -lPW""... $ac_c" 1>&6
-echo "configure:3659: checking for main in -lPW" >&5
+echo "configure:3717: 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
@@ -3663,14 +3721,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lPW $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3667 "configure"
+#line 3725 "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:3732: \"$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
@@ -3699,14 +3757,14 @@ fi
echo $ac_n "checking for library containing crypt""... $ac_c" 1>&6
-echo "configure:3703: checking for library containing crypt" >&5
+echo "configure:3761: 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 3710 "configure"
+#line 3768 "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
@@ -3717,7 +3775,7 @@ int main() {
crypt()
; return 0; }
EOF
-if { (eval echo configure:3721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3779: \"$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
@@ -3728,7 +3786,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 3732 "configure"
+#line 3790 "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
@@ -3739,7 +3797,7 @@ int main() {
crypt()
; return 0; }
EOF
-if { (eval echo configure:3743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3801: \"$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
@@ -3760,7 +3818,7 @@ else :
fi
echo $ac_n "checking for inflate in -lz""... $ac_c" 1>&6
-echo "configure:3764: checking for inflate in -lz" >&5
+echo "configure:3822: 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
@@ -3768,7 +3826,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lz $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3772 "configure"
+#line 3830 "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
@@ -3779,7 +3837,7 @@ int main() {
inflate()
; return 0; }
EOF
-if { (eval echo configure:3783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3841: \"$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
@@ -3809,7 +3867,7 @@ fi
if test "$with_krb4" = yes ; then
echo $ac_n "checking for des_encrypt in -ldes""... $ac_c" 1>&6
-echo "configure:3813: checking for des_encrypt in -ldes" >&5
+echo "configure:3871: 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
@@ -3817,7 +3875,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldes $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3821 "configure"
+#line 3879 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3828,7 +3886,7 @@ int main() {
des_encrypt()
; return 0; }
EOF
-if { (eval echo configure:3832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3857,7 +3915,7 @@ else
fi
echo $ac_n "checking for krb_sendauth in -lkrb""... $ac_c" 1>&6
-echo "configure:3861: checking for krb_sendauth in -lkrb" >&5
+echo "configure:3919: 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
@@ -3865,7 +3923,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lkrb $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3869 "configure"
+#line 3927 "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
@@ -3876,7 +3934,7 @@ int main() {
krb_sendauth()
; return 0; }
EOF
-if { (eval echo configure:3880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3908,7 +3966,7 @@ fi
if test "$with_krb5" = yes ; then
echo $ac_n "checking for main in -lcom_err""... $ac_c" 1>&6
-echo "configure:3912: checking for main in -lcom_err" >&5
+echo "configure:3970: checking for main in -lcom_err" >&5
ac_lib_var=`echo com_err'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3916,14 +3974,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lcom_err $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3920 "configure"
+#line 3978 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3985: \"$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
@@ -3952,7 +4010,7 @@ else
fi
echo $ac_n "checking for main in -lcrypto""... $ac_c" 1>&6
-echo "configure:3956: checking for main in -lcrypto" >&5
+echo "configure:4014: checking for main in -lcrypto" >&5
ac_lib_var=`echo crypto'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3960,14 +4018,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lcrypto $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3964 "configure"
+#line 4022 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3971: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4029: \"$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
@@ -3996,7 +4054,7 @@ else
fi
echo $ac_n "checking for main in -lkrb5""... $ac_c" 1>&6
-echo "configure:4000: checking for main in -lkrb5" >&5
+echo "configure:4058: checking for main in -lkrb5" >&5
ac_lib_var=`echo krb5'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4004,14 +4062,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lkrb5 $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4008 "configure"
+#line 4066 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:4015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4043,7 +4101,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:4047: checking for CRYPTO_new_ex_data in -lcrypto" >&5
+echo "configure:4105: 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
@@ -4051,7 +4109,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lcrypto $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4055 "configure"
+#line 4113 "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
@@ -4062,7 +4120,7 @@ int main() {
CRYPTO_new_ex_data()
; return 0; }
EOF
-if { (eval echo configure:4066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4124: \"$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
@@ -4091,7 +4149,7 @@ else
fi
echo $ac_n "checking for SSL_library_init in -lssl""... $ac_c" 1>&6
-echo "configure:4095: checking for SSL_library_init in -lssl" >&5
+echo "configure:4153: 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
@@ -4099,7 +4157,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lssl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4103 "configure"
+#line 4161 "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
@@ -4110,7 +4168,7 @@ int main() {
SSL_library_init()
; return 0; }
EOF
-if { (eval echo configure:4114: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4172: \"$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
@@ -4148,17 +4206,17 @@ for ac_hdr in crypt.h dld.h endian.h fp_class.h getopt.h ieeefp.h pwd.h sys/psta
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4152: checking for $ac_hdr" >&5
+echo "configure:4210: 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 4157 "configure"
+#line 4215 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4162: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4220: \"$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*
@@ -4189,17 +4247,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:4193: checking for $ac_hdr" >&5
+echo "configure:4251: 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 4198 "configure"
+#line 4256 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4203: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4261: \"$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*
@@ -4229,17 +4287,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:4233: checking for $ac_hdr" >&5
+echo "configure:4291: 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 4238 "configure"
+#line 4296 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4243: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4301: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -4269,17 +4327,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:4273: checking for krb.h" >&5
+echo "configure:4331: 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 4278 "configure"
+#line 4336 "configure"
#include "confdefs.h"
#include <krb.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4283: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4341: \"$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*
@@ -4306,17 +4364,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:4310: checking for krb5.h" >&5
+echo "configure:4368: 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 4315 "configure"
+#line 4373 "configure"
#include "confdefs.h"
#include <krb5.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4320: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4378: \"$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*
@@ -4340,17 +4398,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:4344: checking for com_err.h" >&5
+echo "configure:4402: 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 4349 "configure"
+#line 4407 "configure"
#include "confdefs.h"
#include <com_err.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4354: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4412: \"$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*
@@ -4377,17 +4435,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:4381: checking for openssl/ssl.h" >&5
+echo "configure:4439: 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 4386 "configure"
+#line 4444 "configure"
#include "confdefs.h"
#include <openssl/ssl.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4391: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4449: \"$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*
@@ -4411,17 +4469,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:4415: checking for openssl/err.h" >&5
+echo "configure:4473: 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 4420 "configure"
+#line 4478 "configure"
#include "confdefs.h"
#include <openssl/err.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4425: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4483: \"$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*
@@ -4450,12 +4508,12 @@ fi
## Types, structures, compiler characteristics
##
echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:4454: checking for working const" >&5
+echo "configure:4512: 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 4459 "configure"
+#line 4517 "configure"
#include "confdefs.h"
int main() {
@@ -4504,7 +4562,7 @@ ccp = (char const *const *) p;
; return 0; }
EOF
-if { (eval echo configure:4508: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4566: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
@@ -4525,21 +4583,21 @@ EOF
fi
echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:4529: checking for inline" >&5
+echo "configure:4587: 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 4536 "configure"
+#line 4594 "configure"
#include "confdefs.h"
int main() {
} $ac_kw foo() {
; return 0; }
EOF
-if { (eval echo configure:4543: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4601: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_inline=$ac_kw; break
else
@@ -4567,12 +4625,12 @@ esac
echo $ac_n "checking for preprocessor stringizing operator""... $ac_c" 1>&6
-echo "configure:4571: checking for preprocessor stringizing operator" >&5
+echo "configure:4629: 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 4576 "configure"
+#line 4634 "configure"
#include "confdefs.h"
#define x(y) #y
@@ -4602,19 +4660,19 @@ fi
echo "$ac_t""${ac_cv_c_stringize}" 1>&6
echo $ac_n "checking for signed types""... $ac_c" 1>&6
-echo "configure:4606: checking for signed types" >&5
+echo "configure:4664: 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 4611 "configure"
+#line 4669 "configure"
#include "confdefs.h"
int main() {
signed char c; signed short s; signed int i;
; return 0; }
EOF
-if { (eval echo configure:4618: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4676: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
pgac_cv_c_signed=yes
else
@@ -4634,19 +4692,19 @@ EOF
fi
echo $ac_n "checking for volatile""... $ac_c" 1>&6
-echo "configure:4638: checking for volatile" >&5
+echo "configure:4696: 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 4643 "configure"
+#line 4701 "configure"
#include "confdefs.h"
int main() {
extern volatile int i;
; return 0; }
EOF
-if { (eval echo configure:4650: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4708: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
pgac_cv_c_volatile=yes
else
@@ -4666,12 +4724,12 @@ EOF
fi
echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
-echo "configure:4670: checking whether struct tm is in sys/time.h or time.h" >&5
+echo "configure:4728: 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 4675 "configure"
+#line 4733 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <time.h>
@@ -4679,7 +4737,7 @@ int main() {
struct tm *tp; tp->tm_sec;
; return 0; }
EOF
-if { (eval echo configure:4683: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4741: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_struct_tm=time.h
else
@@ -4700,12 +4758,12 @@ EOF
fi
echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6
-echo "configure:4704: checking for tm_zone in struct tm" >&5
+echo "configure:4762: 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 4709 "configure"
+#line 4767 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <$ac_cv_struct_tm>
@@ -4713,7 +4771,7 @@ int main() {
struct tm tm; tm.tm_zone;
; return 0; }
EOF
-if { (eval echo configure:4717: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4775: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_struct_tm_zone=yes
else
@@ -4733,12 +4791,12 @@ EOF
else
echo $ac_n "checking for tzname""... $ac_c" 1>&6
-echo "configure:4737: checking for tzname" >&5
+echo "configure:4795: 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 4742 "configure"
+#line 4800 "configure"
#include "confdefs.h"
#include <time.h>
#ifndef tzname /* For SGI. */
@@ -4748,7 +4806,7 @@ int main() {
atoi(*tzname);
; return 0; }
EOF
-if { (eval echo configure:4752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4810: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_var_tzname=yes
else
@@ -4770,12 +4828,12 @@ EOF
fi
echo $ac_n "checking for union semun""... $ac_c" 1>&6
-echo "configure:4774: checking for union semun" >&5
+echo "configure:4832: 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 4779 "configure"
+#line 4837 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/ipc.h>
@@ -4784,7 +4842,7 @@ int main() {
union semun semun;
; return 0; }
EOF
-if { (eval echo configure:4788: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4846: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
pgac_cv_union_semun=yes
else
@@ -4809,19 +4867,19 @@ fi
## Functions, global variables
##
echo $ac_n "checking for int timezone""... $ac_c" 1>&6
-echo "configure:4813: checking for int timezone" >&5
+echo "configure:4871: 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 4818 "configure"
+#line 4876 "configure"
#include "confdefs.h"
#include <time.h>
int main() {
int res = timezone / 60;
; return 0; }
EOF
-if { (eval echo configure:4825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4883: \"$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
@@ -4841,7 +4899,7 @@ EOF
fi
echo $ac_n "checking types of arguments for accept()""... $ac_c" 1>&6
-echo "configure:4845: checking types of arguments for accept()" >&5
+echo "configure:4903: 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
@@ -4855,7 +4913,7 @@ else
for ac_cv_func_accept_arg2 in 'struct sockaddr *' 'const struct sockaddr *' 'void *'; do
for ac_cv_func_accept_arg3 in 'int' 'size_t' 'socklen_t' 'unsigned int'; do
cat > conftest.$ac_ext <<EOF
-#line 4859 "configure"
+#line 4917 "configure"
#include "confdefs.h"
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
@@ -4868,7 +4926,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:4872: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4930: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_not_found=no; break 3
else
@@ -4905,12 +4963,12 @@ EOF
echo $ac_n "checking whether gettimeofday takes only one argument""... $ac_c" 1>&6
-echo "configure:4909: checking whether gettimeofday takes only one argument" >&5
+echo "configure:4967: 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 4914 "configure"
+#line 4972 "configure"
#include "confdefs.h"
#include <sys/time.h>
int main() {
@@ -4919,7 +4977,7 @@ struct timezone *tzp;
gettimeofday(tp,tzp);
; return 0; }
EOF
-if { (eval echo configure:4923: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4981: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
pgac_cv_func_gettimeofday_1arg=no
else
@@ -4940,12 +4998,12 @@ EOF
fi
echo $ac_n "checking for fcntl(F_SETLK)""... $ac_c" 1>&6
-echo "configure:4944: checking for fcntl(F_SETLK)" >&5
+echo "configure:5002: checking for fcntl(F_SETLK)" >&5
case $host_os in
linux*) echo "$ac_t""broken on Linux" 1>&6 ;;
*)
cat > conftest.$ac_ext <<EOF
-#line 4949 "configure"
+#line 5007 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <fcntl.h>
@@ -4957,7 +5015,7 @@ lck.l_type = F_WRLCK;
fcntl(0, F_SETLK, &lck);
; return 0; }
EOF
-if { (eval echo configure:4961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
#define HAVE_FCNTL_SETLK 1
@@ -4976,12 +5034,12 @@ esac
for ac_func in fcvt getopt_long memmove pstat setproctitle setsid sigprocmask sysconf waitpid
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4980: checking for $ac_func" >&5
+echo "configure:5038: 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 4985 "configure"
+#line 5043 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -5004,7 +5062,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:5008: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5066: \"$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
@@ -5030,12 +5088,12 @@ done
echo $ac_n "checking for PS_STRINGS""... $ac_c" 1>&6
-echo "configure:5034: checking for PS_STRINGS" >&5
+echo "configure:5092: 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 5039 "configure"
+#line 5097 "configure"
#include "confdefs.h"
#include <machine/vmparam.h>
#include <sys/exec.h>
@@ -5045,7 +5103,7 @@ PS_STRINGS->ps_nargvstr = 1;
PS_STRINGS->ps_argvstr = "foo";
; return 0; }
EOF
-if { (eval echo configure:5049: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5107: \"$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
@@ -5067,12 +5125,12 @@ fi
SNPRINTF=''
echo $ac_n "checking for snprintf""... $ac_c" 1>&6
-echo "configure:5071: checking for snprintf" >&5
+echo "configure:5129: 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 5076 "configure"
+#line 5134 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char snprintf(); below. */
@@ -5095,7 +5153,7 @@ snprintf();
; return 0; }
EOF
-if { (eval echo configure:5099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5157: \"$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
@@ -5119,12 +5177,12 @@ SNPRINTF='snprintf.o'
fi
echo $ac_n "checking for vsnprintf""... $ac_c" 1>&6
-echo "configure:5123: checking for vsnprintf" >&5
+echo "configure:5181: 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 5128 "configure"
+#line 5186 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char vsnprintf(); below. */
@@ -5147,7 +5205,7 @@ vsnprintf();
; return 0; }
EOF
-if { (eval echo configure:5151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5209: \"$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
@@ -5172,7 +5230,7 @@ fi
cat > conftest.$ac_ext <<EOF
-#line 5176 "configure"
+#line 5234 "configure"
#include "confdefs.h"
#include <stdio.h>
EOF
@@ -5187,7 +5245,7 @@ fi
rm -f conftest*
cat > conftest.$ac_ext <<EOF
-#line 5191 "configure"
+#line 5249 "configure"
#include "confdefs.h"
#include <stdio.h>
EOF
@@ -5204,12 +5262,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:5208: checking for isinf" >&5
+echo "configure:5266: 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 5213 "configure"
+#line 5271 "configure"
#include "confdefs.h"
#include <math.h>
@@ -5217,7 +5275,7 @@ int main() {
double x = 0.0; int res = isinf(x);
; return 0; }
EOF
-if { (eval echo configure:5221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_func_isinf=yes
else
@@ -5243,12 +5301,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:5247: checking for $ac_func" >&5
+echo "configure:5305: 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 5252 "configure"
+#line 5310 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -5271,7 +5329,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:5275: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5333: \"$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
@@ -5299,12 +5357,12 @@ fi
echo $ac_n "checking for getrusage""... $ac_c" 1>&6
-echo "configure:5303: checking for getrusage" >&5
+echo "configure:5361: 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 5308 "configure"
+#line 5366 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char getrusage(); below. */
@@ -5327,7 +5385,7 @@ getrusage();
; return 0; }
EOF
-if { (eval echo configure:5331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5389: \"$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
@@ -5352,12 +5410,12 @@ fi
echo $ac_n "checking for srandom""... $ac_c" 1>&6
-echo "configure:5356: checking for srandom" >&5
+echo "configure:5414: 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 5361 "configure"
+#line 5419 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char srandom(); below. */
@@ -5380,7 +5438,7 @@ srandom();
; return 0; }
EOF
-if { (eval echo configure:5384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5442: \"$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
@@ -5405,12 +5463,12 @@ fi
echo $ac_n "checking for gethostname""... $ac_c" 1>&6
-echo "configure:5409: checking for gethostname" >&5
+echo "configure:5467: 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 5414 "configure"
+#line 5472 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gethostname(); below. */
@@ -5433,7 +5491,7 @@ gethostname();
; return 0; }
EOF
-if { (eval echo configure:5437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5495: \"$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
@@ -5458,12 +5516,12 @@ fi
echo $ac_n "checking for random""... $ac_c" 1>&6
-echo "configure:5462: checking for random" >&5
+echo "configure:5520: 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 5467 "configure"
+#line 5525 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char random(); below. */
@@ -5486,7 +5544,7 @@ random();
; return 0; }
EOF
-if { (eval echo configure:5490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5548: \"$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
@@ -5511,12 +5569,12 @@ fi
echo $ac_n "checking for inet_aton""... $ac_c" 1>&6
-echo "configure:5515: checking for inet_aton" >&5
+echo "configure:5573: 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 5520 "configure"
+#line 5578 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char inet_aton(); below. */
@@ -5539,7 +5597,7 @@ inet_aton();
; return 0; }
EOF
-if { (eval echo configure:5543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5601: \"$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
@@ -5564,12 +5622,12 @@ fi
echo $ac_n "checking for strerror""... $ac_c" 1>&6
-echo "configure:5568: checking for strerror" >&5
+echo "configure:5626: 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 5573 "configure"
+#line 5631 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char strerror(); below. */
@@ -5592,7 +5650,7 @@ strerror();
; return 0; }
EOF
-if { (eval echo configure:5596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5654: \"$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
@@ -5618,12 +5676,12 @@ fi
echo $ac_n "checking for strdup""... $ac_c" 1>&6
-echo "configure:5622: checking for strdup" >&5
+echo "configure:5680: 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 5627 "configure"
+#line 5685 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char strdup(); below. */
@@ -5646,7 +5704,7 @@ strdup();
; return 0; }
EOF
-if { (eval echo configure:5650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5708: \"$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
@@ -5671,12 +5729,12 @@ fi
echo $ac_n "checking for strtol""... $ac_c" 1>&6
-echo "configure:5675: checking for strtol" >&5
+echo "configure:5733: 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 5680 "configure"
+#line 5738 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char strtol(); below. */
@@ -5699,7 +5757,7 @@ strtol();
; return 0; }
EOF
-if { (eval echo configure:5703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5761: \"$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
@@ -5724,12 +5782,12 @@ fi
echo $ac_n "checking for strtoul""... $ac_c" 1>&6
-echo "configure:5728: checking for strtoul" >&5
+echo "configure:5786: 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 5733 "configure"
+#line 5791 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char strtoul(); below. */
@@ -5752,7 +5810,7 @@ strtoul();
; return 0; }
EOF
-if { (eval echo configure:5756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_strtoul=yes"
else
@@ -5777,12 +5835,12 @@ fi
echo $ac_n "checking for strcasecmp""... $ac_c" 1>&6
-echo "configure:5781: checking for strcasecmp" >&5
+echo "configure:5839: 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 5786 "configure"
+#line 5844 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char strcasecmp(); below. */
@@ -5805,7 +5863,7 @@ strcasecmp();
; return 0; }
EOF
-if { (eval echo configure:5809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5867: \"$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
@@ -5830,12 +5888,12 @@ fi
echo $ac_n "checking for cbrt""... $ac_c" 1>&6
-echo "configure:5834: checking for cbrt" >&5
+echo "configure:5892: 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 5839 "configure"
+#line 5897 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char cbrt(); below. */
@@ -5858,7 +5916,7 @@ cbrt();
; return 0; }
EOF
-if { (eval echo configure:5862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5920: \"$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
@@ -5879,7 +5937,7 @@ EOF
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for cbrt in -lm""... $ac_c" 1>&6
-echo "configure:5883: checking for cbrt in -lm" >&5
+echo "configure:5941: 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
@@ -5887,7 +5945,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5891 "configure"
+#line 5949 "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
@@ -5898,7 +5956,7 @@ int main() {
cbrt()
; return 0; }
EOF
-if { (eval echo configure:5902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5960: \"$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
@@ -5936,12 +5994,12 @@ esac
echo $ac_n "checking for rint""... $ac_c" 1>&6
-echo "configure:5940: checking for rint" >&5
+echo "configure:5998: 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 5945 "configure"
+#line 6003 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char rint(); below. */
@@ -5964,7 +6022,7 @@ rint();
; return 0; }
EOF
-if { (eval echo configure:5968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6026: \"$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
@@ -5985,7 +6043,7 @@ EOF
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for rint in -lm""... $ac_c" 1>&6
-echo "configure:5989: checking for rint in -lm" >&5
+echo "configure:6047: 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
@@ -5993,7 +6051,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lm $HPUXMATHLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5997 "configure"
+#line 6055 "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
@@ -6004,7 +6062,7 @@ int main() {
rint()
; return 0; }
EOF
-if { (eval echo configure:6008: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6066: \"$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
@@ -6031,7 +6089,7 @@ fi
cat > conftest.$ac_ext <<EOF
-#line 6035 "configure"
+#line 6093 "configure"
#include "confdefs.h"
#include <readline.h>
EOF
@@ -6045,7 +6103,7 @@ EOF
else
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 6049 "configure"
+#line 6107 "configure"
#include "confdefs.h"
#include <readline/readline.h>
EOF
@@ -6067,12 +6125,12 @@ rm -f conftest*
for ac_func in filename_completion_function
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6071: checking for $ac_func" >&5
+echo "configure:6129: 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 6076 "configure"
+#line 6134 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -6095,7 +6153,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:6099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6157: \"$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
@@ -6114,7 +6172,7 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
#define $ac_tr_func 1
EOF
cat > conftest.$ac_ext <<EOF
-#line 6118 "configure"
+#line 6176 "configure"
#include "confdefs.h"
#include <readline.h>
EOF
@@ -6128,7 +6186,7 @@ EOF
else
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 6132 "configure"
+#line 6190 "configure"
#include "confdefs.h"
#include <readline/readline.h>
EOF
@@ -6156,16 +6214,16 @@ done
echo $ac_n "checking for finite""... $ac_c" 1>&6
-echo "configure:6160: checking for finite" >&5
+echo "configure:6218: checking for finite" >&5
cat > conftest.$ac_ext <<EOF
-#line 6162 "configure"
+#line 6220 "configure"
#include "confdefs.h"
#include <math.h>
int main() {
int dummy=finite(1.0);
; return 0; }
EOF
-if { (eval echo configure:6169: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6227: \"$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
@@ -6180,16 +6238,16 @@ fi
rm -f conftest*
echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6
-echo "configure:6184: checking for sigsetjmp" >&5
+echo "configure:6242: checking for sigsetjmp" >&5
cat > conftest.$ac_ext <<EOF
-#line 6186 "configure"
+#line 6244 "configure"
#include "confdefs.h"
#include <setjmp.h>
int main() {
sigjmp_buf x; sigsetjmp(x, 1);
; return 0; }
EOF
-if { (eval echo configure:6193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6251: \"$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
@@ -6209,12 +6267,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:6213: checking for syslog" >&5
+echo "configure:6271: 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 6218 "configure"
+#line 6276 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char syslog(); below. */
@@ -6237,7 +6295,7 @@ syslog();
; return 0; }
EOF
-if { (eval echo configure:6241: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6299: \"$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
@@ -6277,7 +6335,7 @@ fi
echo $ac_n "checking whether long int is 64 bits""... $ac_c" 1>&6
-echo "configure:6281: checking whether long int is 64 bits" >&5
+echo "configure:6339: 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
@@ -6286,7 +6344,7 @@ else
echo "configure: warning: 64 bit arithmetic disabled when cross-compiling" 1>&2
else
cat > conftest.$ac_ext <<EOF
-#line 6290 "configure"
+#line 6348 "configure"
#include "confdefs.h"
typedef long int int64;
@@ -6315,7 +6373,7 @@ main() {
exit(! does_int64_work());
}
EOF
-if { (eval echo configure:6319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6377: \"$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
@@ -6342,7 +6400,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:6346: checking whether long long int is 64 bits" >&5
+echo "configure:6404: 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
@@ -6351,7 +6409,7 @@ else
echo "configure: warning: 64 bit arithmetic disabled when cross-compiling" 1>&2
else
cat > conftest.$ac_ext <<EOF
-#line 6355 "configure"
+#line 6413 "configure"
#include "confdefs.h"
typedef long long int int64;
@@ -6380,7 +6438,7 @@ main() {
exit(! does_int64_work());
}
EOF
-if { (eval echo configure:6384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6442: \"$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
@@ -6411,7 +6469,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:6415: checking whether snprintf handles 'long long int' as %lld" >&5
+echo "configure:6473: 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
@@ -6420,7 +6478,7 @@ echo "configure:6415: checking whether snprintf handles 'long long int' as %lld"
else
cat > conftest.$ac_ext <<EOF
-#line 6424 "configure"
+#line 6482 "configure"
#include "confdefs.h"
#include <stdio.h>
typedef long long int int64;
@@ -6447,7 +6505,7 @@ main() {
exit(! does_int64_snprintf_work());
}
EOF
-if { (eval echo configure:6451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6509: \"$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"'
@@ -6458,7 +6516,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:6462: checking whether snprintf handles 'long long int' as %qd" >&5
+echo "configure:6520: 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
@@ -6467,7 +6525,7 @@ echo "configure:6462: checking whether snprintf handles 'long long int' as %qd"
else
cat > conftest.$ac_ext <<EOF
-#line 6471 "configure"
+#line 6529 "configure"
#include "confdefs.h"
#include <stdio.h>
typedef long long int int64;
@@ -6494,7 +6552,7 @@ main() {
exit(! does_int64_snprintf_work());
}
EOF
-if { (eval echo configure:6498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6556: \"$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"'
@@ -6533,7 +6591,7 @@ EOF
echo $ac_n "checking alignment of short""... $ac_c" 1>&6
-echo "configure:6537: checking alignment of short" >&5
+echo "configure:6595: 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
@@ -6541,7 +6599,7 @@ else
pgac_cv_alignof_short='sizeof(short)'
else
cat > conftest.$ac_ext <<EOF
-#line 6545 "configure"
+#line 6603 "configure"
#include "confdefs.h"
#include <stdio.h>
struct { char filler; short field; } mystruct;
@@ -6553,7 +6611,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:6557: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6615: \"$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
@@ -6573,7 +6631,7 @@ EOF
echo $ac_n "checking alignment of int""... $ac_c" 1>&6
-echo "configure:6577: checking alignment of int" >&5
+echo "configure:6635: 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
@@ -6581,7 +6639,7 @@ else
pgac_cv_alignof_int='sizeof(int)'
else
cat > conftest.$ac_ext <<EOF
-#line 6585 "configure"
+#line 6643 "configure"
#include "confdefs.h"
#include <stdio.h>
struct { char filler; int field; } mystruct;
@@ -6593,7 +6651,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:6597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6655: \"$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
@@ -6613,7 +6671,7 @@ EOF
echo $ac_n "checking alignment of long""... $ac_c" 1>&6
-echo "configure:6617: checking alignment of long" >&5
+echo "configure:6675: 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
@@ -6621,7 +6679,7 @@ else
pgac_cv_alignof_long='sizeof(long)'
else
cat > conftest.$ac_ext <<EOF
-#line 6625 "configure"
+#line 6683 "configure"
#include "confdefs.h"
#include <stdio.h>
struct { char filler; long field; } mystruct;
@@ -6633,7 +6691,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:6637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6695: \"$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
@@ -6654,7 +6712,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:6658: checking alignment of long long int" >&5
+echo "configure:6716: 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
@@ -6662,7 +6720,7 @@ else
pgac_cv_alignof_long_long_int='sizeof(long long int)'
else
cat > conftest.$ac_ext <<EOF
-#line 6666 "configure"
+#line 6724 "configure"
#include "confdefs.h"
#include <stdio.h>
struct { char filler; long long int field; } mystruct;
@@ -6674,7 +6732,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:6678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6736: \"$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
@@ -6695,7 +6753,7 @@ EOF
fi
echo $ac_n "checking alignment of double""... $ac_c" 1>&6
-echo "configure:6699: checking alignment of double" >&5
+echo "configure:6757: 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
@@ -6703,7 +6761,7 @@ else
pgac_cv_alignof_double='sizeof(double)'
else
cat > conftest.$ac_ext <<EOF
-#line 6707 "configure"
+#line 6765 "configure"
#include "confdefs.h"
#include <stdio.h>
struct { char filler; double field; } mystruct;
@@ -6715,7 +6773,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:6719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6777: \"$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
@@ -6753,12 +6811,12 @@ EOF
echo $ac_n "checking for POSIX signal interface""... $ac_c" 1>&6
-echo "configure:6757: checking for POSIX signal interface" >&5
+echo "configure:6815: 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 6762 "configure"
+#line 6820 "configure"
#include "confdefs.h"
#include <signal.h>
@@ -6769,7 +6827,7 @@ act.sa_flags = SA_RESTART;
sigaction(0, &act, &oact);
; return 0; }
EOF
-if { (eval echo configure:6773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6831: \"$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
@@ -6792,50 +6850,14 @@ HAVE_POSIX_SIGNALS=$pgac_cv_func_posix_signals
-
-if test -z "$TCL_DIRS"
-then
- # Extract the first word of "tclsh", so it can be a program name with args.
-set dummy tclsh; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6802: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_TCLSH'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- case "$TCLSH" in
- /*)
- ac_cv_path_TCLSH="$TCLSH" # Let the user override the test with a path.
- ;;
- ?:/*)
- ac_cv_path_TCLSH="$TCLSH" # Let the user override the test with a dos path.
- ;;
- *)
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
- ac_dummy="$PATH"
- for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_path_TCLSH="$ac_dir/$ac_word"
- break
- fi
- done
- IFS="$ac_save_ifs"
- ;;
-esac
-fi
-TCLSH="$ac_cv_path_TCLSH"
-if test -n "$TCLSH"; then
- echo "$ac_t""$TCLSH" 1>&6
-else
- echo "$ac_t""no" 1>&6
-fi
-
- if test -z "$TCLSH"
- then
- # Extract the first word of "tcl", so it can be a program name with args.
-set dummy tcl; ac_word=$2
+# Check for Tcl configuration script tclConfig.sh
+if test "$with_tcl" = yes; then
+ for ac_prog in tclsh tcl
+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:6839: checking for $ac_word" >&5
+echo "configure:6861: 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
@@ -6867,1079 +6889,140 @@ else
echo "$ac_t""no" 1>&6
fi
- if test -z "$TCLSH"
- then
- echo "configure: warning: TCL/TK support disabled; tcl shell is not in your path" 1>&2
- USE_TCL=
- fi
- fi
-fi
-
-if test "$USE_TCL" = true
-then
- echo $ac_n "checking for tclConfig.sh""... $ac_c" 1>&6
-echo "configure:6882: checking for tclConfig.sh" >&5
- TCL_CONFIG_SH=
- library_dirs=
- if test -z "$TCL_DIRS"
- then
- library_dirs=`echo 'puts $auto_path' | $TCLSH`
- fi
- library_dirs="$TCL_DIRS $TK_DIRS $library_dirs"
- for dir in $library_dirs; do
- if test -d "$dir" -a -r "$dir/tclConfig.sh"; then
- TCL_CONFIG_SH=$dir/tclConfig.sh
- break
- fi
- done
- if test -z "$TCL_CONFIG_SH"; then
- echo "$ac_t""no" 1>&6
- echo "configure: warning: TCL/TK support disabled; Tcl configuration script missing" 1>&2
- USE_TCL=
- else
- echo "$ac_t""$TCL_CONFIG_SH" 1>&6
-
- fi
-fi
+test -n "$TCLSH" && break
+done
-USE_TK=$USE_TCL # If TCL is disabled, disable TK
+echo $ac_n "checking for tclConfig.sh""... $ac_c" 1>&6
+echo "configure:6897: checking for tclConfig.sh" >&5
+# Let user override test
+if test -z "$TCL_CONFIG_SH"; then
+ pgac_test_dirs="$with_tclconfig"
-if test "$USE_TK" = true
-then
- echo $ac_n "checking for tkConfig.sh""... $ac_c" 1>&6
-echo "configure:6911: checking for tkConfig.sh" >&5
- TK_CONFIG_SH=
- # library_dirs are set in the check for TCL
- for dir in $library_dirs
- do
- if test -d "$dir" -a -r "$dir/tkConfig.sh"
- then
- TK_CONFIG_SH=$dir/tkConfig.sh
- break
- fi
- done
- if test -z "$TK_CONFIG_SH"
- then
- echo "$ac_t""no" 1>&6
- echo "configure: warning: TK support disabled; Tk configuration script missing" 1>&2
- USE_TK=
- else
- echo "$ac_t""$TK_CONFIG_SH" 1>&6
-
- # 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:6933: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_WISH'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- case "$WISH" in
- /*)
- ac_cv_path_WISH="$WISH" # Let the user override the test with a path.
- ;;
- ?:/*)
- ac_cv_path_WISH="$WISH" # Let the user override the test with a dos path.
- ;;
- *)
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
- ac_dummy="$PATH"
- for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_path_WISH="$ac_dir/$ac_word"
- break
+ set X $pgac_test_dirs; shift
+ if test $# -eq 0; then
+ test -z "$TCLSH" && { echo "configure: error: unable to locate tclConfig.sh because no Tcl shell was found" 1>&2; exit 1; }
+ set X `echo 'puts $auto_path' | $TCLSH`; shift
fi
- done
- IFS="$ac_save_ifs"
- ;;
-esac
-fi
-WISH="$ac_cv_path_WISH"
-if test -n "$WISH"; then
- echo "$ac_t""$WISH" 1>&6
-else
- echo "$ac_t""no" 1>&6
-fi
- fi
+ for pgac_dir; do
+ if test -r "$pgac_dir/tclConfig.sh"; then
+ TCL_CONFIG_SH=$pgac_dir/tclConfig.sh
+ break
+ fi
+ done
fi
+if test -z "$TCL_CONFIG_SH"; then
+ echo "$ac_t""no" 1>&6
+ { echo "configure: error: file \`tclConfig.sh' is required for Tcl" 1>&2; exit 1; }
+else
+ echo "$ac_t""$TCL_CONFIG_SH" 1>&6
+fi
-USE_X=$USE_TK
-if test "$USE_X" = true; then
+fi
- ice_save_LIBS="$LIBS"
- ice_save_CFLAGS="$CFLAGS"
- ice_save_CPPFLAGS="$CPPFLAGS"
- ice_save_LDFLAGS="$LDFLAGS"
+# 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:6930: checking for tkConfig.sh" >&5
+# Let user override test
+if test -z "$TK_CONFIG_SH"; then
+ pgac_test_dirs="$with_tkconfig $with_tclconfig"
- # If we find X, set shell vars x_includes and x_libraries to the
-# paths, otherwise set no_x=yes.
-# Uses ac_ vars as temps to allow command line to override cache and checks.
-# --without-x overrides everything else, but does not touch the cache.
-echo $ac_n "checking for X""... $ac_c" 1>&6
-echo "configure:6984: checking for X" >&5
+ set X $pgac_test_dirs; shift
+ if test $# -eq 0; then
+ test -z "$TCLSH" && { echo "configure: error: unable to locate tkConfig.sh because no Tcl shell was found" 1>&2; exit 1; }
+ set X `echo 'puts $auto_path' | $TCLSH`; shift
+ fi
-# Check whether --with-x or --without-x was given.
-if test "${with_x+set}" = set; then
- withval="$with_x"
- :
+ for pgac_dir; do
+ if test -r "$pgac_dir/tkConfig.sh"; then
+ TK_CONFIG_SH=$pgac_dir/tkConfig.sh
+ break
+ fi
+ done
fi
-# $have_x is `yes', `no', `disabled', or empty when we do not yet know.
-if test "x$with_x" = xno; then
- # The user explicitly disabled X.
- have_x=disabled
-else
- if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then
- # Both variables are already set.
- have_x=yes
- else
-if eval "test \"`echo '$''{'ac_cv_have_x'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+if test -z "$TK_CONFIG_SH"; then
+ echo "$ac_t""no" 1>&6
+ { echo "configure: error: file \`tkConfig.sh' is required for Tk" 1>&2; exit 1; }
else
- # One or both of the vars are not set, and there is no cached value.
-ac_x_includes=NO ac_x_libraries=NO
-rm -fr conftestdir
-if mkdir conftestdir; then
- cd conftestdir
- # Make sure to not put "make" in the Imakefile rules, since we grep it out.
- cat > Imakefile <<'EOF'
-acfindx:
- @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
-EOF
- if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
- # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
- eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
- # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
- for ac_extension in a so sl; do
- if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
- test -f $ac_im_libdir/libX11.$ac_extension; then
- ac_im_usrlibdir=$ac_im_libdir; break
- fi
- done
- # Screen out bogus values from the imake configuration. They are
- # bogus both because they are the default anyway, and because
- # using them would break gcc on systems where it needs fixed includes.
- case "$ac_im_incroot" in
- /usr/include) ;;
- *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes="$ac_im_incroot" ;;
- esac
- case "$ac_im_usrlibdir" in
- /usr/lib | /lib) ;;
- *) test -d "$ac_im_usrlibdir" && ac_x_libraries="$ac_im_usrlibdir" ;;
- esac
- fi
- cd ..
- rm -fr conftestdir
+ echo "$ac_t""$TK_CONFIG_SH" 1>&6
fi
-if test "$ac_x_includes" = NO; then
- # Guess where to find include files, by looking for this one X11 .h file.
- test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h
- # First, try using that file with no special directory specified.
-cat > conftest.$ac_ext <<EOF
-#line 7046 "configure"
-#include "confdefs.h"
-#include <$x_direct_test_include>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7051: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
- rm -rf conftest*
- # We can compile using X headers with no special include directory.
-ac_x_includes=
-else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- # Look for the header file in a standard set of common directories.
-# Check X11 before X11Rn because it is often a symlink to the current release.
- for ac_dir in \
- /usr/X11/include \
- /usr/X11R6/include \
- /usr/X11R5/include \
- /usr/X11R4/include \
- \
- /usr/include/X11 \
- /usr/include/X11R6 \
- /usr/include/X11R5 \
- /usr/include/X11R4 \
- \
- /usr/local/X11/include \
- /usr/local/X11R6/include \
- /usr/local/X11R5/include \
- /usr/local/X11R4/include \
- \
- /usr/local/include/X11 \
- /usr/local/include/X11R6 \
- /usr/local/include/X11R5 \
- /usr/local/include/X11R4 \
- \
- /usr/X386/include \
- /usr/x386/include \
- /usr/XFree86/include/X11 \
- \
- /usr/include \
- /usr/local/include \
- /usr/unsupported/include \
- /usr/athena/include \
- /usr/local/x11r5/include \
- /usr/lpp/Xamples/include \
- \
- /usr/openwin/include \
- /usr/openwin/share/include \
- ; \
- do
- if test -r "$ac_dir/$x_direct_test_include"; then
- ac_x_includes=$ac_dir
- break
- fi
- done
-fi
-rm -f conftest*
-fi # $ac_x_includes = NO
-if test "$ac_x_libraries" = NO; then
- # Check for the libraries.
+fi
- test -z "$x_direct_test_library" && x_direct_test_library=Xt
- test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc
- # See if we find them without any special options.
- # Don't add to $LIBS permanently.
- ac_save_LIBS="$LIBS"
- LIBS="-l$x_direct_test_library $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 7120 "configure"
-#include "confdefs.h"
+# Finally ready to produce output files ...
-int main() {
-${x_direct_test_function}()
-; return 0; }
+trap '' 1 2 15
+cat > confcache <<\EOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs. It is not useful on other systems.
+# If it contains results you don't want to keep, you may remove or edit it.
+#
+# By default, configure uses ./config.cache as the cache file,
+# creating it if it does not exist already. You can give configure
+# the --cache-file=FILE option to use a different cache file; that is
+# what configure does when it calls configure scripts in
+# subdirectories, so they share the cache.
+# Giving --cache-file=/dev/null disables caching, for debugging configure.
+# config.status only pays attention to the cache file if you give it the
+# --recheck option to rerun configure.
+#
EOF
-if { (eval echo configure:7127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- LIBS="$ac_save_LIBS"
-# We can link X programs with no special library path.
-ac_x_libraries=
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, don't put newlines in cache variables' values.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+(set) 2>&1 |
+ case `(ac_space=' '; set | grep ac_space) 2>&1` in
+ *ac_space=\ *)
+ # `set' does not quote correctly, so add quotes (double-quote substitution
+ # turns \\\\ into \\, and sed turns \\ into \).
+ sed -n \
+ -e "s/'/'\\\\''/g" \
+ -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
+ ;;
+ *)
+ # `set' quotes correctly as required by POSIX, so do not add quotes.
+ sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
+ ;;
+ esac >> confcache
+if cmp -s $cache_file confcache; then
+ :
else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- LIBS="$ac_save_LIBS"
-# First see if replacing the include by lib works.
-# Check X11 before X11Rn because it is often a symlink to the current release.
-for ac_dir in `echo "$ac_x_includes" | sed s/include/lib/` \
- /usr/X11/lib \
- /usr/X11R6/lib \
- /usr/X11R5/lib \
- /usr/X11R4/lib \
- \
- /usr/lib/X11 \
- /usr/lib/X11R6 \
- /usr/lib/X11R5 \
- /usr/lib/X11R4 \
- \
- /usr/local/X11/lib \
- /usr/local/X11R6/lib \
- /usr/local/X11R5/lib \
- /usr/local/X11R4/lib \
- \
- /usr/local/lib/X11 \
- /usr/local/lib/X11R6 \
- /usr/local/lib/X11R5 \
- /usr/local/lib/X11R4 \
- \
- /usr/X386/lib \
- /usr/x386/lib \
- /usr/XFree86/lib/X11 \
- \
- /usr/lib \
- /usr/local/lib \
- /usr/unsupported/lib \
- /usr/athena/lib \
- /usr/local/x11r5/lib \
- /usr/lpp/Xamples/lib \
- /lib/usr/lib/X11 \
- \
- /usr/openwin/lib \
- /usr/openwin/share/lib \
- ; \
-do
- for ac_extension in a so sl; do
- if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then
- ac_x_libraries=$ac_dir
- break 2
- fi
- done
-done
+ if test -w $cache_file; then
+ echo "updating cache $cache_file"
+ cat confcache > $cache_file
+ else
+ echo "not updating unwritable cache $cache_file"
+ fi
fi
-rm -f conftest*
-fi # $ac_x_libraries = NO
+rm -f confcache
-if test "$ac_x_includes" = NO || test "$ac_x_libraries" = NO; then
- # Didn't find X anywhere. Cache the known absence of X.
- ac_cv_have_x="have_x=no"
-else
- # Record where we found X for the cache.
- ac_cv_have_x="have_x=yes \
- ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries"
-fi
-fi
- fi
- eval "$ac_cv_have_x"
-fi # $with_x != no
+trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-if test "$have_x" != yes; then
- echo "$ac_t""$have_x" 1>&6
- no_x=yes
-else
- # If each of the values was on the command line, it overrides each guess.
- test "x$x_includes" = xNONE && x_includes=$ac_x_includes
- test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
- # Update the cache value to reflect the command line values.
- ac_cv_have_x="have_x=yes \
- ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
- echo "$ac_t""libraries $x_libraries, headers $x_includes" 1>&6
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+# Let make expand exec_prefix.
+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+
+# Any assignment to VPATH causes Sun make to only execute
+# the first set of double-colon rules, so remove it if not needed.
+# If there is a colon in the path, we need to keep it.
+if test "x$srcdir" = x.; then
+ ac_vpsub='/^[ ]*VPATH[ ]*=[^:]*$/d'
fi
-if test "$no_x" = yes; then
- # Not all programs may use this symbol, but it does not hurt to define it.
- cat >> confdefs.h <<\EOF
-#define X_DISPLAY_MISSING 1
-EOF
+trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
- X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
-else
- if test -n "$x_includes"; then
- X_CFLAGS="$X_CFLAGS -I$x_includes"
- fi
-
- # It would also be nice to do this for all -L options, not just this one.
- if test -n "$x_libraries"; then
- X_LIBS="$X_LIBS -L$x_libraries"
- # For Solaris; some versions of Sun CC require a space after -R and
- # others require no space. Words are not sufficient . . . .
- case "`(uname -sr) 2>/dev/null`" in
- "SunOS 5"*)
- echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
-echo "configure:7233: checking whether -R must be followed by a space" >&5
- ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
- cat > conftest.$ac_ext <<EOF
-#line 7236 "configure"
-#include "confdefs.h"
-
-int main() {
-
-; return 0; }
-EOF
-if { (eval echo configure:7243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- ac_R_nospace=yes
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- ac_R_nospace=no
-fi
-rm -f conftest*
- if test $ac_R_nospace = yes; then
- echo "$ac_t""no" 1>&6
- X_LIBS="$X_LIBS -R$x_libraries"
- else
- LIBS="$ac_xsave_LIBS -R $x_libraries"
- cat > conftest.$ac_ext <<EOF
-#line 7259 "configure"
-#include "confdefs.h"
-
-int main() {
-
-; return 0; }
-EOF
-if { (eval echo configure:7266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- ac_R_space=yes
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- ac_R_space=no
-fi
-rm -f conftest*
- if test $ac_R_space = yes; then
- echo "$ac_t""yes" 1>&6
- X_LIBS="$X_LIBS -R $x_libraries"
- else
- echo "$ac_t""neither works" 1>&6
- fi
- fi
- LIBS="$ac_xsave_LIBS"
- esac
- fi
-
- # Check for system-dependent libraries X programs must link with.
- # Do this before checking for the system-independent R6 libraries
- # (-lICE), since we may need -lsocket or whatever for X linking.
-
- if test "$ISC" = yes; then
- X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet"
- else
- # Martyn.Johnson@cl.cam.ac.uk says this is needed for Ultrix, if the X
- # libraries were built with DECnet support. And karl@cs.umb.edu says
- # the Alpha needs dnet_stub (dnet does not exist).
- echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:7298: checking for dnet_ntoa in -ldnet" >&5
-ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- ac_save_LIBS="$LIBS"
-LIBS="-ldnet $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 7306 "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
- builtin and then its argument prototype would still apply. */
-char dnet_ntoa();
-
-int main() {
-dnet_ntoa()
-; return 0; }
-EOF
-if { (eval echo configure:7317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
-else
- echo "$ac_t""no" 1>&6
-fi
-
- if test $ac_cv_lib_dnet_dnet_ntoa = no; then
- echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
-echo "configure:7339: checking for dnet_ntoa in -ldnet_stub" >&5
-ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- ac_save_LIBS="$LIBS"
-LIBS="-ldnet_stub $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 7347 "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
- builtin and then its argument prototype would still apply. */
-char dnet_ntoa();
-
-int main() {
-dnet_ntoa()
-; return 0; }
-EOF
-if { (eval echo configure:7358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
-else
- echo "$ac_t""no" 1>&6
-fi
-
- fi
-
- # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
- # to get the SysV transport functions.
- # chad@anasazi.com says the Pyramis MIS-ES running DC/OSx (SVR4)
- # needs -lnsl.
- # The nsl library prevents programs from opening the X display
- # on Irix 5.2, according to dickey@clark.net.
- echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:7387: checking for gethostbyname" >&5
-if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 7392 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char gethostbyname(); below. */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error. */
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char gethostbyname();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined (__stub_gethostbyname) || defined (__stub___gethostbyname)
-choke me
-#else
-gethostbyname();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:7415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_gethostbyname=yes"
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_func_gethostbyname=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'gethostbyname`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- :
-else
- echo "$ac_t""no" 1>&6
-fi
-
- if test $ac_cv_func_gethostbyname = no; then
- echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:7436: checking for gethostbyname in -lnsl" >&5
-ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- ac_save_LIBS="$LIBS"
-LIBS="-lnsl $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 7444 "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
- builtin and then its argument prototype would still apply. */
-char gethostbyname();
-
-int main() {
-gethostbyname()
-; return 0; }
-EOF
-if { (eval echo configure:7455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
-else
- echo "$ac_t""no" 1>&6
-fi
-
- fi
-
- # lieder@skyler.mavd.honeywell.com says without -lsocket,
- # socket/setsockopt and other routines are undefined under SCO ODT
- # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary
- # on later versions), says simon@lia.di.epfl.ch: it contains
- # gethostby* variants that don't use the nameserver (or something).
- # -lsocket must be given before -lnsl if both are needed.
- # We assume that if connect needs -lnsl, so does gethostbyname.
- echo $ac_n "checking for connect""... $ac_c" 1>&6
-echo "configure:7485: checking for connect" >&5
-if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 7490 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char connect(); below. */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error. */
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char connect();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined (__stub_connect) || defined (__stub___connect)
-choke me
-#else
-connect();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:7513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_connect=yes"
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_func_connect=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'connect`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- :
-else
- echo "$ac_t""no" 1>&6
-fi
-
- if test $ac_cv_func_connect = no; then
- echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:7534: checking for connect in -lsocket" >&5
-ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- ac_save_LIBS="$LIBS"
-LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 7542 "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
- builtin and then its argument prototype would still apply. */
-char connect();
-
-int main() {
-connect()
-; return 0; }
-EOF
-if { (eval echo configure:7553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
-else
- echo "$ac_t""no" 1>&6
-fi
-
- fi
-
- # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
- echo $ac_n "checking for remove""... $ac_c" 1>&6
-echo "configure:7577: checking for remove" >&5
-if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 7582 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char remove(); below. */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error. */
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char remove();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined (__stub_remove) || defined (__stub___remove)
-choke me
-#else
-remove();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:7605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_remove=yes"
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_func_remove=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'remove`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- :
-else
- echo "$ac_t""no" 1>&6
-fi
-
- if test $ac_cv_func_remove = no; then
- echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:7626: checking for remove in -lposix" >&5
-ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- ac_save_LIBS="$LIBS"
-LIBS="-lposix $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 7634 "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
- builtin and then its argument prototype would still apply. */
-char remove();
-
-int main() {
-remove()
-; return 0; }
-EOF
-if { (eval echo configure:7645: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
-else
- echo "$ac_t""no" 1>&6
-fi
-
- fi
-
- # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
- echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:7669: checking for shmat" >&5
-if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 7674 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char shmat(); below. */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error. */
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char shmat();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined (__stub_shmat) || defined (__stub___shmat)
-choke me
-#else
-shmat();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:7697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_shmat=yes"
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_func_shmat=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'shmat`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- :
-else
- echo "$ac_t""no" 1>&6
-fi
-
- if test $ac_cv_func_shmat = no; then
- echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:7718: checking for shmat in -lipc" >&5
-ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- ac_save_LIBS="$LIBS"
-LIBS="-lipc $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 7726 "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
- builtin and then its argument prototype would still apply. */
-char shmat();
-
-int main() {
-shmat()
-; return 0; }
-EOF
-if { (eval echo configure:7737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
-else
- echo "$ac_t""no" 1>&6
-fi
-
- fi
- fi
-
- # Check for libraries that X11R6 Xt/Xaw programs need.
- ac_save_LDFLAGS="$LDFLAGS"
- test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
- # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
- # check for ICE first), but we must link in the order -lSM -lICE or
- # we get undefined symbols. So assume we have SM if we have ICE.
- # These have to be linked with before -lX11, unlike the other
- # libraries we check for below, so use a different variable.
- # --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
- echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
-echo "configure:7770: checking for IceConnectionNumber in -lICE" >&5
-ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- ac_save_LIBS="$LIBS"
-LIBS="-lICE $X_EXTRA_LIBS $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 7778 "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
- builtin and then its argument prototype would still apply. */
-char IceConnectionNumber();
-
-int main() {
-IceConnectionNumber()
-; return 0; }
-EOF
-if { (eval echo configure:7789: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
-else
- echo "$ac_t""no" 1>&6
-fi
-
- LDFLAGS="$ac_save_LDFLAGS"
-
-fi
-
-
- LIBS="$LIBS $X_EXTRA_LIBS"
- CFLAGS="$CFLAGS $X_CFLAGS"
- CPPFLAGS="$CPPFLAGS $X_CFLAGS"
- LDFLAGS="$LDFLAGS $X_LIBS"
-
-
- X11_LIBS=""
- echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
-echo "configure:7822: checking for XOpenDisplay in -lX11" >&5
-ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- ac_save_LIBS="$LIBS"
-LIBS="-lX11 ${X_PRE_LIBS} $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 7830 "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
- builtin and then its argument prototype would still apply. */
-char XOpenDisplay();
-
-int main() {
-XOpenDisplay()
-; return 0; }
-EOF
-if { (eval echo configure:7841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- X11_LIBS="-lX11"
-else
- echo "$ac_t""no" 1>&6
-fi
-
- if test "$X11_LIBS" = ""; then
- echo "configure: warning: The X11 library '-lX11' could not be found,
-so TK support will be disabled. To enable TK support,
-please use the configure options '--x-includes=DIR'
-and '--x-libraries=DIR' to specify the X location.
-See the file 'config.log' for further diagnostics." 1>&2
- USE_TK=
- fi
-
-
-
-
- LIBS="$ice_save_LIBS"
- CFLAGS="$ice_save_CFLAGS"
- CPPFLAGS="$ice_save_CPPFLAGS"
- LDFLAGS="$ice_save_LDFLAGS"
-fi
-
-
-trap '' 1 2 15
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs. It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already. You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
- case `(ac_space=' '; set | grep ac_space) 2>&1` in
- *ac_space=\ *)
- # `set' does not quote correctly, so add quotes (double-quote substitution
- # turns \\\\ into \\, and sed turns \\ into \).
- sed -n \
- -e "s/'/'\\\\''/g" \
- -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
- ;;
- *)
- # `set' quotes correctly as required by POSIX, so do not add quotes.
- sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
- ;;
- esac >> confcache
-if cmp -s $cache_file confcache; then
- :
-else
- if test -w $cache_file; then
- echo "updating cache $cache_file"
- cat confcache > $cache_file
- else
- echo "not updating unwritable cache $cache_file"
- fi
-fi
-rm -f confcache
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
-if test "x$srcdir" = x.; then
- ac_vpsub='/^[ ]*VPATH[ ]*=[^:]*$/d'
-fi
-
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
-DEFS=-DHAVE_CONFIG_H
+DEFS=-DHAVE_CONFIG_H
# Without the "./", some shells look in PATH for config.status.
: ${CONFIG_STATUS=./config.status}
@@ -8033,8 +7116,8 @@ s%@DLSUFFIX@%$DLSUFFIX%g
s%@DL_LIB@%$DL_LIB%g
s%@autodepend@%$autodepend%g
s%@INCLUDES@%$INCLUDES%g
-s%@USE_TCL@%$USE_TCL%g
-s%@USE_TK@%$USE_TK%g
+s%@with_tcl@%$with_tcl%g
+s%@with_tk@%$with_tk%g
s%@with_perl@%$with_perl%g
s%@PYTHON@%$PYTHON%g
s%@python_version@%$python_version%g
@@ -8069,6 +7152,7 @@ s%@tar@%$tar%g
s%@PERL@%$PERL%g
s%@YACC@%$YACC%g
s%@YFLAGS@%$YFLAGS%g
+s%@WISH@%$WISH%g
s%@SNPRINTF@%$SNPRINTF%g
s%@ISINF@%$ISINF%g
s%@GETRUSAGE@%$GETRUSAGE%g
@@ -8090,12 +7174,6 @@ s%@HAVE_POSIX_SIGNALS@%$HAVE_POSIX_SIGNALS%g
s%@TCLSH@%$TCLSH%g
s%@TCL_CONFIG_SH@%$TCL_CONFIG_SH%g
s%@TK_CONFIG_SH@%$TK_CONFIG_SH%g
-s%@WISH@%$WISH%g
-s%@X_CFLAGS@%$X_CFLAGS%g
-s%@X_PRE_LIBS@%$X_PRE_LIBS%g
-s%@X_LIBS@%$X_LIBS%g
-s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g
-s%@X11_LIBS@%$X11_LIBS%g
CEOF
EOF
@@ -8357,7 +7435,7 @@ cat >> $CONFIG_STATUS <<EOF
EOF
cat >> $CONFIG_STATUS <<\EOF
-echo timestamp > src/include/stamp-h
+echo "timestamp file" > src/include/stamp-h
exit 0
EOF
diff --git a/configure.in b/configure.in
index 67c66928291..a2033c464fc 100644
--- a/configure.in
+++ b/configure.in
@@ -317,28 +317,34 @@ done
IFS=$ac_save_IFS
-
-# We exclude tcl support unless user says --with-tcl
-AC_MSG_CHECKING(setting USE_TCL)
-PGAC_ARG_BOOL(with, tcl, no, [ --with-tcl build Tcl interfaces and pgtclsh],
- [USE_TCL=true; USE_TK=true; AC_MSG_RESULT(enabled)],
- [USE_TCL=; USE_TK=; AC_MSG_RESULT(disabled)])
-AC_SUBST(USE_TCL)
-AC_SUBST(USE_TK)
+#
+# Tcl/Tk
+#
+AC_MSG_CHECKING([whether to build with Tcl])
+PGAC_ARG_BOOL(with, tcl, no, [ --with-tcl build Tcl and Tk interfaces])
+AC_MSG_RESULT([$with_tcl])
+AC_SUBST([with_tcl])
+
+# If Tcl is enabled (above) then Tk is also, unless the user disables it using --without-tk
+AC_MSG_CHECKING([whether to build with Tk])
+if test "$with_tcl" = yes; then
+ PGAC_ARG_BOOL(with, tk, yes, [ --without-tk do not build Tk interfaces if Tcl is enabled])
+else
+ with_tk=no
+fi
+AC_MSG_RESULT([$with_tk])
+AC_SUBST([with_tk])
# We see if the path to the TCL/TK configuration scripts is specified.
# This will override the use of tclsh to find the paths to search.
-PGAC_ARG_REQ(with, tclconfig, [ --with-tclconfig=DIR tclConfig.sh and tkConfig.sh are in DIR],
- [TCL_DIRS=$withval])
-
+PGAC_ARG_REQ(with, tclconfig, [ --with-tclconfig=DIR tclConfig.sh and tkConfig.sh are in DIR])
# We see if the path to the TK configuration scripts is specified.
# This will override the use of tclsh to find the paths to search.
-PGAC_ARG_REQ(with, tkconfig, [ --with-tkconfig=DIR tkConfig.sh is in DIR],
- [TK_DIRS=$withval])
+PGAC_ARG_REQ(with, tkconfig, [ --with-tkconfig=DIR tkConfig.sh is in DIR])
#
@@ -443,7 +449,7 @@ AC_SUBST(KRB_LIBS)
# Kerberos configuration parameters
#
PGAC_ARG_REQ(with, krb-srvnam,
- [ --with-krb-srvnam=NAME name of the PostgreSQL service principal in Kerberos],
+ [ --with-krb-srvnam=NAME name of the PostgreSQL service principal in Kerberos [postgres]],
[],
[with_krb_srvnam="postgres"])
AC_DEFINE_UNQUOTED([PG_KRB_SRVNAM], ["$with_krb_srvnam"],
@@ -591,6 +597,10 @@ AC_PATH_PROG(tar, tar)
AC_CHECK_PROGS(PERL, perl,)
AC_PROG_YACC
AC_SUBST(YFLAGS)
+if test "$with_tk" = yes; then
+ AC_PATH_PROG(WISH, wish)
+ test -z "$WISH" && AC_MSG_ERROR([\`wish' is required for Tk support])
+fi
##
@@ -1007,120 +1017,18 @@ AC_DEFINE_UNQUOTED(MAXIMUM_ALIGNOF, $MAX_ALIGNOF, [Define as the maximum alignme
PGAC_FUNC_POSIX_SIGNALS
-dnl Check for Tcl configuration script tclConfig.sh
-
-dnl If --with-tclconfig was given, don't check for tclsh, tcl
-if test -z "$TCL_DIRS"
-then
- AC_PATH_PROG(TCLSH, tclsh)
- if test -z "$TCLSH"
- then
- AC_PATH_PROG(TCLSH, tcl)
- if test -z "$TCLSH"
- then
- AC_MSG_WARN(TCL/TK support disabled; tcl shell is not in your path)
- USE_TCL=
- fi
- fi
-fi
-
-if test "$USE_TCL" = true
-then
- AC_MSG_CHECKING(for tclConfig.sh)
- TCL_CONFIG_SH=
- library_dirs=
- if test -z "$TCL_DIRS"
- then
- library_dirs=`echo 'puts $auto_path' | $TCLSH`
- fi
- library_dirs="$TCL_DIRS $TK_DIRS $library_dirs"
- for dir in $library_dirs; do
- if test -d "$dir" -a -r "$dir/tclConfig.sh"; then
- TCL_CONFIG_SH=$dir/tclConfig.sh
- break
- fi
- done
- if test -z "$TCL_CONFIG_SH"; then
- AC_MSG_RESULT(no)
- AC_MSG_WARN(TCL/TK support disabled; Tcl configuration script missing)
- USE_TCL=
- else
- AC_MSG_RESULT($TCL_CONFIG_SH)
- AC_SUBST(TCL_CONFIG_SH)
- fi
+# Check for Tcl configuration script tclConfig.sh
+if test "$with_tcl" = yes; then
+ PGAC_PATH_TCLCONFIGSH([$with_tclconfig])
fi
-USE_TK=$USE_TCL # If TCL is disabled, disable TK
-
-dnl Check for Tk configuration script tkConfig.sh
-if test "$USE_TK" = true
-then
- AC_MSG_CHECKING(for tkConfig.sh)
- TK_CONFIG_SH=
- # library_dirs are set in the check for TCL
- for dir in $library_dirs
- do
- if test -d "$dir" -a -r "$dir/tkConfig.sh"
- then
- TK_CONFIG_SH=$dir/tkConfig.sh
- break
- fi
- done
- if test -z "$TK_CONFIG_SH"
- then
- AC_MSG_RESULT(no)
- AC_MSG_WARN(TK support disabled; Tk configuration script missing)
- USE_TK=
- else
- AC_MSG_RESULT($TK_CONFIG_SH)
- AC_SUBST(TK_CONFIG_SH)
- AC_PATH_PROG(WISH, wish)
- fi
-fi
-AC_SUBST(WISH)
-
-USE_X=$USE_TK
-
-dnl Check for X libraries
-
-if test "$USE_X" = true; then
-
- ice_save_LIBS="$LIBS"
- ice_save_CFLAGS="$CFLAGS"
- ice_save_CPPFLAGS="$CPPFLAGS"
- ice_save_LDFLAGS="$LDFLAGS"
-
- AC_PATH_XTRA
-
- LIBS="$LIBS $X_EXTRA_LIBS"
- CFLAGS="$CFLAGS $X_CFLAGS"
- CPPFLAGS="$CPPFLAGS $X_CFLAGS"
- LDFLAGS="$LDFLAGS $X_LIBS"
-
- dnl Check for X library
-
- X11_LIBS=""
- AC_CHECK_LIB(X11, XOpenDisplay, X11_LIBS="-lX11",,${X_PRE_LIBS})
- if test "$X11_LIBS" = ""; then
- dnl Not having X is bad news for pgtksh. Let the user fix this.
- AC_MSG_WARN([The X11 library '-lX11' could not be found,
-so TK support will be disabled. To enable TK support,
-please use the configure options '--x-includes=DIR'
-and '--x-libraries=DIR' to specify the X location.
-See the file 'config.log' for further diagnostics.])
- USE_TK=
- fi
- AC_SUBST(X_LIBS)
- AC_SUBST(X11_LIBS)
- AC_SUBST(X_PRE_LIBS)
-
- LIBS="$ice_save_LIBS"
- CFLAGS="$ice_save_CFLAGS"
- CPPFLAGS="$ice_save_CPPFLAGS"
- LDFLAGS="$ice_save_LDFLAGS"
+# Check for Tk configuration script tkConfig.sh
+if test "$with_tk" = yes; then
+ PGAC_PATH_TKCONFIGSH([$with_tkconfig $with_tclconfig])
fi
-dnl Finally ready to produce output files ...
+
+# Finally ready to produce output files ...
AC_OUTPUT(
[
@@ -1129,5 +1037,5 @@ AC_OUTPUT(
src/Makefile.global
src/backend/port/Makefile
],
-[echo timestamp > src/include/stamp-h]
+[echo "timestamp file" > src/include/stamp-h]
)
diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index 80069263b1e..c5c7f4e815a 100644
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -1,4 +1,4 @@
-# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.94 2000/09/21 20:17:43 petere Exp $
+# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.95 2000/09/25 22:22:54 petere Exp $
#------------------------------------------------------------------------------
# All PostgreSQL makefiles include this file and use the variables it sets,
@@ -97,19 +97,13 @@ python_moduledir = @python_moduledir@
krb_srvtab = @krb_srvtab@
-#
-# Please do not edit USE_TCL and USE_TK by hand.
-#
-USE_TCL= @USE_TCL@
-USE_TK= @USE_TK@
+with_tcl = @with_tcl@
+with_tk = @with_tk@
+
WISH= @WISH@
TCL_CONFIG_SH = @TCL_CONFIG_SH@
TK_CONFIG_SH = @TK_CONFIG_SH@
-X_CFLAGS= @X_CFLAGS@
-X_LIBS= @X_LIBS@
-X11_LIBS= -lX11 @X_EXTRA_LIBS@
-
# flag whether multibyte is on/off
MULTIBYTE=@MULTIBYTE@
diff --git a/src/bin/Makefile b/src/bin/Makefile
index 0519a294910..e635f5f4ce3 100644
--- a/src/bin/Makefile
+++ b/src/bin/Makefile
@@ -4,7 +4,7 @@
#
# Copyright (c) 1994, Regents of the University of California
#
-# $Header: /cvsroot/pgsql/src/bin/Makefile,v 1.31 2000/08/31 16:11:03 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/Makefile,v 1.32 2000/09/25 22:22:54 petere Exp $
#
#-------------------------------------------------------------------------
@@ -19,9 +19,8 @@ ifdef MULTIBYTE
DIRS += pg_encoding
endif
-# TCL/TK programs
-ifeq ($(USE_TCL), true)
-ifeq ($(USE_TK), true)
+ifeq ($(with_tcl), yes)
+ifeq ($(with_tk), yes)
DIRS += pgaccess
endif
DIRS += pgtclsh
diff --git a/src/bin/pgaccess/Makefile b/src/bin/pgaccess/Makefile
index 359f98f4e5f..8360973208a 100644
--- a/src/bin/pgaccess/Makefile
+++ b/src/bin/pgaccess/Makefile
@@ -4,7 +4,7 @@
#
# Copyright (c) 1994, Regents of the University of California
#
-# $Header: /cvsroot/pgsql/src/bin/pgaccess/Attic/Makefile,v 1.12 2000/09/17 13:02:41 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/pgaccess/Attic/Makefile,v 1.13 2000/09/25 22:22:56 petere Exp $
#
#-------------------------------------------------------------------------
@@ -16,8 +16,11 @@ pgaccessdir = $(datadir)/pgaccess
all: pgaccess
-pgaccess: pgaccess.sh
- sed -e 's,__wish__,$(WISH),' -e 's,__PGACCESSHOME__,$(pgaccessdir),' < $< > $@
+pgaccess: pgaccess.sh $(top_builddir)/src/Makefile.global
+ sed -e 's,@WISH@,$(WISH),g' \
+ -e 's,@PGACCESSHOME@,$(pgaccessdir),g' \
+ $< >$@
+ chmod a+x $@
install: all installdirs
$(INSTALL_SCRIPT) pgaccess $(DESTDIR)$(bindir)/pgaccess
diff --git a/src/bin/pgaccess/pgaccess.sh b/src/bin/pgaccess/pgaccess.sh
index c41cf53cce0..196873b8044 100755
--- a/src/bin/pgaccess/pgaccess.sh
+++ b/src/bin/pgaccess/pgaccess.sh
@@ -1,9 +1,9 @@
#! /bin/sh
-PATH_TO_WISH=__wish__
-PGACCESS_HOME=__PGACCESSHOME__
+PATH_TO_WISH='@WISH@'
+PGACCESS_HOME='@PGACCESSHOME@'
export PATH_TO_WISH
export PGACCESS_HOME
-exec ${PATH_TO_WISH} ${PGACCESS_HOME}/main.tcl "$@"
+exec "${PATH_TO_WISH}" "${PGACCESS_HOME}/main.tcl" "$@"
diff --git a/src/bin/pgtclsh/Makefile b/src/bin/pgtclsh/Makefile
index e2ae981f9e8..053b50a6f09 100644
--- a/src/bin/pgtclsh/Makefile
+++ b/src/bin/pgtclsh/Makefile
@@ -5,7 +5,7 @@
#
# Copyright (c) 1994, Regents of the University of California
#
-# $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.32 2000/09/17 13:02:42 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.33 2000/09/25 22:22:58 petere Exp $
#
#-------------------------------------------------------------------------
@@ -17,7 +17,7 @@ include $(top_builddir)/src/Makefile.global
# Include definitions from the tclConfig.sh file
#
-include Makefile.tcldefs
-ifeq ($(USE_TK), true)
+ifeq ($(with_tk), yes)
-include Makefile.tkdefs
endif
@@ -25,27 +25,24 @@ libpgtcl_srcdir = $(top_srcdir)/src/interfaces/libpgtcl
libpgtcl_builddir = $(top_builddir)/src/interfaces/libpgtcl
libpgtcl = -L$(libpgtcl_builddir) -lpgtcl
-CFLAGS+= $(X_CFLAGS) -I$(libpgtcl_srcdir)
+CPPFLAGS += -I$(libpgtcl_srcdir) $(TK_XINCLUDES)
-# If we are here then TCL is available
+# If we are here then Tcl is available
PROGRAMS = pgtclsh
-# Add TK targets if TK is available
-ifeq ($(USE_TK), true)
+# Add Tk targets if Tk is available
+ifeq ($(with_tk), yes)
PROGRAMS += pgtksh
endif
all: submake $(PROGRAMS)
pgtclsh: pgtclAppInit.o
- $(CC) $(CFLAGS) $(TCL_DEFS) -o $@ $< \
- $(libpgtcl) $(libpq) $(TCL_LIB_SPEC) $(TCL_LIBS) $(LDFLAGS)
+ $(CC) $(CFLAGS) -o $@ $< $(libpgtcl) $(libpq) $(TCL_LIB_SPEC) $(TCL_LIBS) $(LDFLAGS)
pgtksh: pgtkAppInit.o
- $(CC) $(CFLAGS) $(TK_DEFS) -o $@ $< \
- $(libpgtcl) $(libpq) $(X_LIBS) $(TK_LIB_SPEC) $(TK_LIBS) \
- $(TCL_LIB_SPEC) $(X11_LIBS) $(LDFLAGS)
+ $(CC) $(CFLAGS) -o $@ $< $(libpgtcl) $(libpq) $(TK_LIB_SPEC) $(TK_LIBS) $(TCL_LIB_SPEC) $(LDFLAGS)
.PHONY: submake
submake:
@@ -53,7 +50,7 @@ submake:
install: all installdirs
$(INSTALL_PROGRAM) pgtclsh $(DESTDIR)$(bindir)/pgtclsh
-ifeq ($(USE_TK), true)
+ifeq ($(with_tk), yes)
$(INSTALL_PROGRAM) pgtksh $(DESTDIR)$(bindir)/pgtksh
endif
@@ -70,7 +67,7 @@ Makefile.tkdefs: mkMakefile.tkdefs.sh
$(SHELL) $< '$(TK_CONFIG_SH)' '$@'
clean distclean maintainer-clean:
- rm -f *.o Makefile.tcldefs Makefile.tkdefs pgtclsh pgtksh
+ rm -f pgtclAppInit.o pgtkAppInit.o Makefile.tcldefs Makefile.tkdefs pgtclsh pgtksh
dep depend:
$(CC) -MM $(CFLAGS) *.c > depend
diff --git a/src/interfaces/Makefile b/src/interfaces/Makefile
index 5640c8d0bc3..ee9fed3851b 100644
--- a/src/interfaces/Makefile
+++ b/src/interfaces/Makefile
@@ -4,7 +4,7 @@
#
# Copyright (c) 1994, Regents of the University of California
#
-# $Header: /cvsroot/pgsql/src/interfaces/Makefile,v 1.42 2000/08/31 16:11:30 petere Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/Makefile,v 1.43 2000/09/25 22:23:00 petere Exp $
#
#-------------------------------------------------------------------------
@@ -24,7 +24,7 @@ ifeq ($(with_CXX), yes)
DIRS += libpq++
endif
-ifeq ($(USE_TCL), true)
+ifeq ($(with_tcl), yes)
DIRS += libpgtcl
endif
diff --git a/src/interfaces/libpgtcl/Makefile b/src/interfaces/libpgtcl/Makefile
index 636891e3e85..a20970c098a 100644
--- a/src/interfaces/libpgtcl/Makefile
+++ b/src/interfaces/libpgtcl/Makefile
@@ -4,7 +4,7 @@
#
# Copyright (c) 1994, Regents of the University of California
#
-# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile,v 1.21 2000/09/17 13:02:49 petere Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile,v 1.22 2000/09/25 22:23:00 petere Exp $
#
#-------------------------------------------------------------------------
@@ -27,7 +27,11 @@ SHLIB_LINK+= $(libpq)
# braindead; users of libpq should not need to know what it depends on.)
SHLIB_LINK+= $(findstring -lcrypt,$(LIBS))
-all: all-lib
+all: submake all-lib
+
+.PHONY: submake
+submake:
+ $(MAKE) -C $(libpq_builddir) all
# Shared library stuff
include $(top_srcdir)/src/Makefile.shlib
diff --git a/src/pl/Makefile b/src/pl/Makefile
index dbe85b5b3b6..b0160f59278 100644
--- a/src/pl/Makefile
+++ b/src/pl/Makefile
@@ -4,7 +4,7 @@
#
# Copyright (c) 1994, Regents of the University of California
#
-# $Header: /cvsroot/pgsql/src/pl/Makefile,v 1.14 2000/09/25 12:43:24 momjian Exp $
+# $Header: /cvsroot/pgsql/src/pl/Makefile,v 1.15 2000/09/25 22:23:01 petere Exp $
#
#-------------------------------------------------------------------------
@@ -14,7 +14,7 @@ include $(top_builddir)/src/Makefile.global
DIRS := plpgsql
-ifeq ($(USE_TCL), true)
+ifeq ($(with_tcl), yes)
DIRS += tcl
endif
--
GitLab