diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2004-09-23 00:21:34 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2004-09-23 00:21:34 +0000 |
| commit | 36f2f2296b61e4be33e1ae2dcae67aab7931e227 (patch) | |
| tree | 3bb4879c85915a48d9e99f87c64469791e3519cd | |
| parent | 25e1623bc53bf9d06b5b95f8009c8a8b25a13b84 (diff) | |
| download | krb5-36f2f2296b61e4be33e1ae2dcae67aab7931e227.zip krb5-36f2f2296b61e4be33e1ae2dcae67aab7931e227.tar.gz krb5-36f2f2296b61e4be33e1ae2dcae67aab7931e227.tar.bz2 | |
* 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.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16778 dc483132-0cff-0310-8789-dd5450dbe970
| -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 61138a4..6555d2d 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 a3b32ff..a9e7752 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) |