Commit edcf5a7e authored by Bruce Momjian's avatar Bruce Momjian

parent 40703f28
...@@ -6118,6 +6118,35 @@ fi ...@@ -6118,6 +6118,35 @@ fi
if test "$USE_TCL"; then if test "$USE_TCL"; then
echo $ac_n "checking for tclConfig.sh""... $ac_c" 1>&6 echo $ac_n "checking for tclConfig.sh""... $ac_c" 1>&6
echo "configure:6121: checking for tclConfig.sh" >&5 echo "configure:6121: checking for tclConfig.sh" >&5
library_dirs="/usr/lib $LIBRARY_DIRS"
TCL_CONFIG_SH=
for dir in $library_dirs; do
for tcl_dir in $tcl_dirs; do
if test -z "$TCL_CONFIG_SH"; then
if test -d "$dir/$tcl_dir" -a -r "$dir/$tcl_dir/tclConfig.sh"; then
TCL_CONFIG_SH=$dir/$tcl_dir/tclConfig.sh
fi
fi
done
if test -z "$TCL_CONFIG_SH"; then
if test -d "$dir" -a -r "$dir/tclConfig.sh"; then
TCL_CONFIG_SH=$dir/tclConfig.sh
fi
fi
done
if test -z "$TCL_CONFIG_SH"; then
echo "$ac_t""no" 1>&6
echo "configure: warning: tcl support disabled; Tcl configuration script missing" 1>&2
USE_TCL=
else
echo "$ac_t""$TCL_CONFIG_SH" 1>&6
fi
fi
if test "$USE_TCL"; then
echo $ac_n "checking for tclConfig.sh""... $ac_c" 1>&6
echo "configure:6150: checking for tclConfig.sh" >&5
library_dirs="/usr/lib $LIBRARY_DIRS" library_dirs="/usr/lib $LIBRARY_DIRS"
TCL_CONFIG_SH= TCL_CONFIG_SH=
for dir in $library_dirs; do for dir in $library_dirs; do
...@@ -6152,17 +6181,17 @@ then ...@@ -6152,17 +6181,17 @@ then
TK_INCDIR=no TK_INCDIR=no
ac_safe=`echo "tk.h" | sed 'y%./+-%__p_%'` ac_safe=`echo "tk.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for tk.h""... $ac_c" 1>&6 echo $ac_n "checking for tk.h""... $ac_c" 1>&6
echo "configure:6156: checking for tk.h" >&5 echo "configure:6185: checking for tk.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 6161 "configure" #line 6190 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <tk.h> #include <tk.h>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:6166: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:6195: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out` ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -6211,7 +6240,7 @@ then ...@@ -6211,7 +6240,7 @@ then
for tk_lib in $tk_libs; do for tk_lib in $tk_libs; do
if test -z "$TK_LIB"; then if test -z "$TK_LIB"; then
echo $ac_n "checking for main in -l$tk_lib""... $ac_c" 1>&6 echo $ac_n "checking for main in -l$tk_lib""... $ac_c" 1>&6
echo "configure:6215: checking for main in -l$tk_lib" >&5 echo "configure:6244: checking for main in -l$tk_lib" >&5
ac_lib_var=`echo $tk_lib'_'main | sed 'y%./+-%__p_%'` ac_lib_var=`echo $tk_lib'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
...@@ -6219,14 +6248,14 @@ else ...@@ -6219,14 +6248,14 @@ else
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="-l$tk_lib $LIBS" LIBS="-l$tk_lib $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 6223 "configure" #line 6252 "configure"
#include "confdefs.h" #include "confdefs.h"
int main() { int main() {
main() main()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:6230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then if { (eval echo configure:6259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes" eval "ac_cv_lib_$ac_lib_var=yes"
else else
...@@ -6272,17 +6301,17 @@ then ...@@ -6272,17 +6301,17 @@ then
PWD_INCDIR=no PWD_INCDIR=no
ac_safe=`echo "pwd.h" | sed 'y%./+-%__p_%'` ac_safe=`echo "pwd.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for pwd.h""... $ac_c" 1>&6 echo $ac_n "checking for pwd.h""... $ac_c" 1>&6
echo "configure:6276: checking for pwd.h" >&5 echo "configure:6305: checking for pwd.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 6281 "configure" #line 6310 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <pwd.h> #include <pwd.h>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:6286: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:6315: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out` ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -6803,3 +6832,20 @@ rm -fr confdefs* $ac_clean_files ...@@ -6803,3 +6832,20 @@ rm -fr confdefs* $ac_clean_files
test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
GNUmakefile
Makefile.global
backend/port/Makefile
backend/utils/Gen_fmgrtab.sh
bin/pg_dump/Makefile
bin/pg_version/Makefile
bin/psql/Makefile
include/version.h
interfaces/ecpg/lib/Makefile
interfaces/libpgtcl/Makefile
interfaces/libpq++/Makefile
interfaces/libpq/Makefile
interfaces/odbc/GNUmakefile
interfaces/odbc/Makefile.global
pl/plpgsql/src/Makefile
pl/tcl/mkMakefile.tcldefs.sh
)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment