diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/aclocal.m4 | 4 |
2 files changed, 11 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 61138a43b..6555d2dcb 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2004-09-22 Ken Raeburn <raeburn@mit.edu> + + * aclocal.m4 (AC_KRB5_TCL_FIND_CONFIG): If the config info set by + tclConfig.sh doesn't produce a working executable, set TCL_LIBS to + be empty explicitly. + (KRB5_BUILD_LIBRARY_WITH_DEPS): Substitute SHLIB_EXPORT_FILE_DEP. + 2004-09-22 Tom Yu <tlyu@mit.edu> * aclocal.m4 (KRB5_AC_LIBUTIL): New macro to check for libutil. diff --git a/src/aclocal.m4 b/src/aclocal.m4 index a3b32fff0..a9e775294 100644 --- a/src/aclocal.m4 +++ b/src/aclocal.m4 @@ -953,6 +953,9 @@ if test -n "$tcl_ok_conf" ; then fi CPPFLAGS="$old_CPPFLAGS" tcl_lib=yes +else + # If we read a tclConfig.sh file, it probably set this. + TCL_LIBS= fi AC_SUBST(TCL_INCLUDES) AC_SUBST(TCL_LIBS) @@ -1145,6 +1148,7 @@ AC_SUBST(LIBLIST) AC_SUBST(LIBLINKS) AC_SUBST(MAKE_SHLIB_COMMAND) AC_SUBST(SHLIB_EXPFLAGS) +AC_SUBST(SHLIB_EXPORT_FILE_DEP) AC_SUBST(INSTALL_SHLIB) AC_SUBST(STLIBEXT) AC_SUBST(SHLIBEXT) |