configure cleanup.

This commit is contained in:
Bruce Momjian 1998-04-05 21:18:03 +00:00
parent 4b6fcc4459
commit 34fec16198
1 changed files with 190 additions and 189 deletions

View File

@ -622,7 +622,6 @@ dnl Disable Tcl support if Tk not found
dnl Check for tk.h
if test "$USE_TCL" = "true"
then
ice_save_LIBS="$LIBS"
ice_save_CFLAGS="$CFLAGS"
ice_save_CPPFLAGS="$CPPFLAGS"
@ -650,11 +649,12 @@ ice_save_LIBS="$LIBS"
ice_save_CFLAGS="$CFLAGS"
ice_save_CPPFLAGS="$CPPFLAGS"
ice_save_LDFLAGS="$LDFLAGS"
LIBS="$LIBS $X_EXTRA_LIBS"
CFLAGS="$CFLAGS $X_CFLAGS"
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
LDFLAGS="$LDFLAGS $X_LIBS"
TK_LIB=
TK_LIB=
tk_libs="tk8.0 tk80 tk4.2 tk42 tk"
for tk_lib in $tk_libs; do
@ -668,8 +668,9 @@ TK_LIB=
else
TK_LIB=-l$TK_LIB
fi
AC_SUBST(TK_LIB)
fi
LIBS="$ice_save_LIBS"
CFLAGS="$ice_save_CFLAGS"
CPPFLAGS="$ice_save_CPPFLAGS"