Commit 51fd8dd3 authored by Bruce Momjian's avatar Bruce Momjian

autoconf

parent eb3e640e
...@@ -6112,12 +6112,11 @@ fi ...@@ -6112,12 +6112,11 @@ fi
else else
TCL_LIB=-l$TCL_LIB TCL_LIB=-l$TCL_LIB
fi fi
fi 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:6120: checking for tclConfig.sh" >&5
library_dirs="$LIBRARY_DIRS /usr/lib" library_dirs="$LIBRARY_DIRS /usr/lib"
TCL_CONFIG_SH= TCL_CONFIG_SH=
for dir in $library_dirs; do for dir in $library_dirs; do
...@@ -6157,17 +6156,17 @@ then ...@@ -6157,17 +6156,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:6161: checking for tk.h" >&5 echo "configure:6160: 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 6166 "configure" #line 6165 "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:6171: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:6170: \"$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*
...@@ -6216,7 +6215,7 @@ then ...@@ -6216,7 +6215,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:6220: checking for main in -l$tk_lib" >&5 echo "configure:6219: 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
...@@ -6224,14 +6223,14 @@ else ...@@ -6224,14 +6223,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 6228 "configure" #line 6227 "configure"
#include "confdefs.h" #include "confdefs.h"
int main() { int main() {
main() main()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:6235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then if { (eval echo configure:6234: \"$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
...@@ -6260,8 +6259,6 @@ fi ...@@ -6260,8 +6259,6 @@ fi
TK_LIB=-l$TK_LIB TK_LIB=-l$TK_LIB
fi fi
LIBS="$ice_save_LIBS" LIBS="$ice_save_LIBS"
CFLAGS="$ice_save_CFLAGS" CFLAGS="$ice_save_CFLAGS"
CPPFLAGS="$ice_save_CPPFLAGS" CPPFLAGS="$ice_save_CPPFLAGS"
...@@ -6270,7 +6267,7 @@ fi ...@@ -6270,7 +6267,7 @@ fi
if test "$USE_TCL"; then if test "$USE_TCL"; then
echo $ac_n "checking for tkConfig.sh""... $ac_c" 1>&6 echo $ac_n "checking for tkConfig.sh""... $ac_c" 1>&6
echo "configure:6121: checking for tkConfig.sh" >&5 echo "configure:6271: checking for tkConfig.sh" >&5
library_dirs="$LIBRARY_DIRS /usr/lib" library_dirs="$LIBRARY_DIRS /usr/lib"
TK_CONFIG_SH= TK_CONFIG_SH=
for dir in $library_dirs; do for dir in $library_dirs; do
...@@ -6297,7 +6294,6 @@ echo "configure:6121: checking for tkConfig.sh" >&5 ...@@ -6297,7 +6294,6 @@ echo "configure:6121: checking for tkConfig.sh" >&5
fi fi
fi fi
#if test "X$USE_ODBC" = "Xtrue" #if test "X$USE_ODBC" = "Xtrue"
#then #then
# AC_CONFIG_SUBDIRS(interfaces/odbc) # AC_CONFIG_SUBDIRS(interfaces/odbc)
...@@ -6307,17 +6303,17 @@ then ...@@ -6307,17 +6303,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:6281: checking for pwd.h" >&5 echo "configure:6307: 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 6286 "configure" #line 6312 "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:6291: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:6317: \"$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*
...@@ -6561,9 +6557,7 @@ s%@X_PRE_LIBS@%$X_PRE_LIBS%g ...@@ -6561,9 +6557,7 @@ s%@X_PRE_LIBS@%$X_PRE_LIBS%g
s%@X_LIBS@%$X_LIBS%g s%@X_LIBS@%$X_LIBS%g
s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g
s%@X11_LIBS@%$X11_LIBS%g s%@X11_LIBS@%$X11_LIBS%g
s%@TCL_LIB@%$TCL_LIB%g
s%@TCL_CONFIG_SH@%$TCL_CONFIG_SH%g s%@TCL_CONFIG_SH@%$TCL_CONFIG_SH%g
s%@TK_LIB@%$TK_LIB%g
s%@TK_CONFIG_SH@%$TK_CONFIG_SH%g s%@TK_CONFIG_SH@%$TK_CONFIG_SH%g
CEOF CEOF
......
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