diff options
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/aclocal.m4 | 17 |
2 files changed, 19 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index b7e4858b21..6cda13bbea 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2001-01-28 Tom Yu <tlyu@mit.edu> + + * aclocal.m4 (KRB5_LIB_AUX): Smash some shared lib file extensions + so that AIX doesn't break, since static and shared libs are + mutually exclusive on AIX. + 2001-01-16 Ken Raeburn <raeburn@mit.edu> * acconfig.h (HAVE_SA_LEN): Undef. diff --git a/src/aclocal.m4 b/src/aclocal.m4 index 902c8091c2..cf775b7cf2 100644 --- a/src/aclocal.m4 +++ b/src/aclocal.m4 @@ -1063,8 +1063,18 @@ AC_ARG_ENABLE([shared], AC_MSG_RESULT([Forcing static libraries.]) # avoid duplicate rules generation for AIX and such SHLIBEXT=.so-nobuild + SHLIBVEXT=.so.v-nobuild + SHLIBSEXT=.so.s-nobuild else AC_MSG_RESULT([Enabling shared libraries.]) + # Clear some stuff in case of AIX, etc. + if test "$STLIBEXT" = "$SHLIBEXT" ; then + STLIBEXT=.a-nobuild + LIBLIST= + LIBLINKS= + OBJLISTS= + LIBINSTLIST= + fi LIBLIST="$LIBLIST "'lib$(LIB)$(SHLIBEXT)' LIBLINKS="$LIBLINKS "'$(TOPLIBD)/lib$(LIB)$(SHLIBEXT) $(TOPLIBD)/lib$(LIB)$(SHLIBVEXT)' case "$SHLIBSEXT" in @@ -1080,10 +1090,6 @@ AC_ARG_ENABLE([shared], OBJLISTS="$OBJLISTS OBJS.SH" fi CC_LINK="$CC_LINK_SHARED" - if test "$STLIBEXT" = "$SHLIBEXT" ; then - STLIBEXT=".a-no-build" - LIBINSTLIST="install-shared" #don't install static - fi ;; esac else @@ -1095,6 +1101,9 @@ else fi], RUN_ENV= CC_LINK="$CC_LINK_STATIC" + SHLIBEXT=.so-nobuild + SHLIBVEXT=.so.v-nobuild + SHLIBSEXT=.so.s-nobuild )dnl if test -n "$EXTRA_LIB_TARGETS"; then |