diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2000-08-30 23:06:01 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2000-08-30 23:06:01 +0000 |
| commit | 95f7625ca57c5b12ee8bc912b8ba9527777217d0 (patch) | |
| tree | b6d87a12e68d831cee8d4269768368607297be03 /src | |
| parent | 38bcab3a608056491e3b09811d6f6a3ff8774ce9 (diff) | |
| download | krb5-95f7625ca57c5b12ee8bc912b8ba9527777217d0.zip krb5-95f7625ca57c5b12ee8bc912b8ba9527777217d0.tar.gz krb5-95f7625ca57c5b12ee8bc912b8ba9527777217d0.tar.bz2 | |
* 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
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/aclocal.m4 | 11 |
2 files changed, 17 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index f0e92d4..2636eb2 100644 --- 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 f0e7658..f64371a 100644 --- 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 |