]> granicus.if.org Git - postgresql/commitdiff
From: Bruce Stephens <bruce@cenderis.demon.co.uk>
authorMarc G. Fournier <scrappy@hub.org>
Wed, 8 Apr 1998 02:06:37 +0000 (02:06 +0000)
committerMarc G. Fournier <scrappy@hub.org>
Wed, 8 Apr 1998 02:06:37 +0000 (02:06 +0000)
fix for the tk problem...

src/configure
src/configure.in

index c52922383427e6823394d78e182677ba22eb5b96..3f11f37916a576430e7789a67f142e894c25133d 100755 (executable)
@@ -3371,7 +3371,7 @@ else
 fi
 rm -f conftest*
 
-if test $ac_cv_prog_gcc = yes; then
+if test x$ac_cv_prog_gcc = xyes; then
     echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
 echo "configure:3377: checking whether ${CC-cc} needs -traditional" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
@@ -5617,7 +5617,7 @@ 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="-l$tk_lib  $LIBS"
+LIBS="-l$tk_lib $TCL_LIB $X_PRE_LIBS $X_LIBS $X11_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
 #line 5623 "configure"
 #include "confdefs.h"
index de16dbb367c376ec9f97fcfaf2793dc57dece649..e562792d8f251149ab300f0d4279b2b62a7d3746 100644 (file)
@@ -659,7 +659,7 @@ then
        tk_libs="tk8.0 tk80 tk4.2 tk42 tk"
        for tk_lib in $tk_libs; do
                if test -z "$TK_LIB"; then
-                       AC_CHECK_LIB($tk_lib, main, TK_LIB=$tk_lib)
+                       AC_CHECK_LIB($tk_lib, main, TK_LIB=$tk_lib,, $TCL_LIB $X_PRE_LIBS $X_LIBS $X11_LIBS)
                fi
        done
        if test -z "$TK_LIB"; then