Here is a pair of patches that (I hope) finish the configuration
issues with tcl/tk and make the recognition of the two packages
completely parallel in organization. This should make future changes
easier to maintain.
Hope to see this in 6.2.2.
Cheers,
Brook
===========================================================================
--- ../INSTALL.orig Thu Apr 9 17:00:52 1998
+++ ../INSTALL Thu Apr 16 13:43:20 1998
@@ -288,6 +288,7 @@
for header files. (Typical use will need
--with-includes=/usr/local/include)
+ --with-libs=DIRS
--with-libraries=DIRS
Include DIRS in list of directories searched
for archive libraries. (Typical use will need
===========================================================================
--- configure.in.orig Fri Apr 10 01:00:37 1998
+++ configure.in Thu Apr 16 13:42:32 1998
@@ -185,7 +185,7 @@
])
if test "$LIBRARY_DIRS"; then
- for dir in $withval; do
+ for dir in $LIBRARY_DIRS; do
if test -d "$dir"; then
PGSQL_LDFLAGS="$PGSQL_LDFLAGS -L$dir"
else
@@ -661,7 +661,7 @@
ice_save_CPPFLAGS="$CPPFLAGS"
ice_save_LDFLAGS="$LDFLAGS"
- LIBS="$LIBS $X_EXTRA_LIBS"
+ LIBS="$TCL_LIB $X_PRE_LIBS $X11_LIBS $X_EXTRA_LIBS $LIBS"
CFLAGS="$CFLAGS $X_CFLAGS"
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
LDFLAGS="$LDFLAGS $X_LIBS"
@@ -670,7 +670,7 @@
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,, $TCL_LIB $X_PRE_LIBS $X_LIBS $X11_LIBS)
+ AC_CHECK_LIB($tk_lib, main, TK_LIB=$tk_lib)
fi
done
if test -z "$TK_LIB"; then
===========================================================================
