* aclocal.m4 (KRB5_LIB_AUX): Fold in values of EXTRA_LIB_TARGETS,

EXTRA_LIBLINK_TARGETS, EXTRA_LIBINST_TARGETS set in shlib.conf.  Substitute
EXTRA_CLEAN_TARGETS and EXTRA_CLEAN_LINKS.
(KRB5_LIB_PARAMS): Substitute LIB_LINK_OPT.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@12637 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/ChangeLog b/src/ChangeLog
index f0e92d44b3775c5c90a1180cd0713facea7b5254..2636eb2916806c95a51e5d6ba286156d170eb4d6 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2000-08-30  Ken Raeburn  <raeburn@mit.edu>
+
+       * aclocal.m4 (KRB5_LIB_AUX): Fold in values of EXTRA_LIB_TARGETS,
+       EXTRA_LIBLINK_TARGETS, EXTRA_LIBINST_TARGETS set in shlib.conf.
+       Substitute EXTRA_CLEAN_TARGETS and EXTRA_CLEAN_LINKS.
+       (KRB5_LIB_PARAMS): Substitute LIB_LINK_OPT.
+
 2000-08-23  Ken Raeburn  <raeburn@mit.edu>
 
        * aclocal.m4 (KRB5_AC_CHECK_INET6): Require "struct

diff --git a/src/aclocal.m4 b/src/aclocal.m4
index f0e76587f55408407ce89f35cf06f74c38dd2716..f64371a09529e1ba5012c1bb8242a65fe5f5c132 100644 (file)
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -1072,6 +1072,14 @@ fi],
        CC_LINK="$CC_LINK_STATIC"
 )dnl
 
+if test -n "$EXTRA_LIB_TARGETS"; then
+  LIBLIST="$LIBLIST $EXTRA_LIB_TARGETS"
+fi
+LIBLINKS="$LIBLIST $EXTRA_LIBLINK_TARGETS"
+LIBINSTLIST="$LIBINSTLIST $EXTRA_LIBINST_TARGETS"
+AC_SUBST(EXTRA_CLEAN_TARGETS)
+AC_SUBST(EXTRA_CLEAN_LINKS)
+
 if test -z "$LIBLIST"; then
        AC_MSG_ERROR([must enable one of shared or static libraries])
 fi
@@ -1105,7 +1113,8 @@ AC_DEFUN(KRB5_LIB_PARAMS,
 krb5_cv_host=$host])
 AC_REQUIRE([AC_PROG_CC])
 AC_REQUIRE([V5_SET_TOPDIR])
-. $ac_topdir/config/shlib.conf])
+. $ac_topdir/config/shlib.conf
+AC_SUBST(LIB_LINK_OPT)])
 dnl
 dnl The following was written by jhawk@mit.edu
 dnl