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