diff options
| author | Tom Yu <tlyu@mit.edu> | 1997-08-12 01:19:06 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 1997-08-12 01:19:06 +0000 |
| commit | 6800cbeb765d701729e2aa42a800232c2736ddc1 (patch) | |
| tree | cb6d0d953c33536f3d17219a4d6b0bcf72795bc8 /src | |
| parent | 7efa8358d8699c1c00c70338f7ebd34e0b63ab7e (diff) | |
| download | krb5-6800cbeb765d701729e2aa42a800232c2736ddc1.tar.gz krb5-6800cbeb765d701729e2aa42a800232c2736ddc1.tar.xz krb5-6800cbeb765d701729e2aa42a800232c2736ddc1.zip | |
* aclocal.m4 (KRB5_BUILD_LIBRARY_STATIC): Fix up some things so
that this macro actually works; it's still necessary to precede a
call to KRB5_BUILD_LIBOBJS with a call to
KRB5_BUILD_LIBRARY_STATIC, though. Basically if you AC_DEFUN
something that produces shell code and then calls a macro that
AC_REQUIREs something else, then all the AC_REQUIREd stuff ends up
coming *before* the shell code in the first macro. I'm not sure
there's a reasonable workaround, or whether this can even be
considered to be a bug.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@10168 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 12 | ||||
| -rw-r--r-- | src/aclocal.m4 | 37 |
2 files changed, 33 insertions, 16 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 87db266ad..700cb3680 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,15 @@ +Mon Aug 11 21:16:50 1997 Tom Yu <tlyu@mit.edu> + + * aclocal.m4 (KRB5_BUILD_LIBRARY_STATIC): Fix up some things so + that this macro actually works; it's still necessary to precede a + call to KRB5_BUILD_LIBOBJS with a call to + KRB5_BUILD_LIBRARY_STATIC, though. Basically if you AC_DEFUN + something that produces shell code and then calls a macro that + AC_REQUIREs something else, then all the AC_REQUIREd stuff ends up + coming *before* the shell code in the first macro. I'm not sure + there's a reasonable workaround, or whether this can even be + considered to be a bug. + Wed Aug 6 20:25:49 1997 Tom Yu <tlyu@mit.edu> * aclocal.m4: Add support for --with-hesiod (and add it to diff --git a/src/aclocal.m4 b/src/aclocal.m4 index 942237ef6..c0418274d 100644 --- a/src/aclocal.m4 +++ b/src/aclocal.m4 @@ -989,7 +989,8 @@ dnl KRB5_BUILD_LIBRARY_STATIC dnl dnl Force static library build. -AC_DEFUN(KRB5_BUILD_LIBRARY_STATIC, +define(KRB5_BUILD_LIBRARY_STATIC, +dnl Use define rather than AC_DEFUN to avoid ordering problems. [krb5_force_static=yes KRB5_BUILD_LIBRARY]) @@ -1084,7 +1085,7 @@ fi # Check whether to build shared libraries. AC_ARG_ENABLE([shared], [ --enable-shared build shared libraries], -[if test "$enableval" = yes && test "$krb5_force_static" != yes; then +[if test "$enableval" = yes; then case "$SHLIBEXT" in .so-nobuild) AC_MSG_WARN([shared libraries not supported on this architecture]) @@ -1092,20 +1093,24 @@ AC_ARG_ENABLE([shared], CC_LINK="$CC_LINK_STATIC" ;; *) - AC_MSG_RESULT([Enabling shared libraries.]) - LIBLIST="$LIBLIST "'lib$(LIB)$(SHLIBEXT)' - LIBLINKS="$LIBLINKS "'$(TOPLIBD)/lib$(LIB)$(SHLIBEXT) $(TOPLIBD)/lib$(LIB)$(SHLIBVEXT)' - case "$SHLIBSEXT" in - .so.s-nobuild) - LIBINSTLIST="$LIBINSTLIST install-shared" - ;; - *) - LIBLIST="$LIBLIST "'lib$(LIB)$(SHLIBSEXT)' - LIBLINKS="$LIBLINKS "'$(TOPLIBD)/lib$(LIB)$(SHLIBSEXT)' - LIBINSTLIST="$LIBINSTLIST install-shlib-soname" - ;; - esac - OBJLISTS="$OBJLISTS OBJS.SH" + if test "$krb5_force_static" = "yes"; then + AC_MSG_RESULT([Forcing static libraries.]) + else + AC_MSG_RESULT([Enabling shared libraries.]) + LIBLIST="$LIBLIST "'lib$(LIB)$(SHLIBEXT)' + LIBLINKS="$LIBLINKS "'$(TOPLIBD)/lib$(LIB)$(SHLIBEXT) $(TOPLIBD)/lib$(LIB)$(SHLIBVEXT)' + case "$SHLIBSEXT" in + .so.s-nobuild) + LIBINSTLIST="$LIBINSTLIST install-shared" + ;; + *) + LIBLIST="$LIBLIST "'lib$(LIB)$(SHLIBSEXT)' + LIBLINKS="$LIBLINKS "'$(TOPLIBD)/lib$(LIB)$(SHLIBSEXT)' + LIBINSTLIST="$LIBINSTLIST install-shlib-soname" + ;; + esac + OBJLISTS="$OBJLISTS OBJS.SH" + fi DEPLIBEXT=$SHLIBEXT CC_LINK="$CC_LINK_SHARED" if test "$STLIBEXT" = "$SHLIBEXT" ; then |