* aclocal.m4 (KRB5_LIB_AUX): Do what Sam originally meant to do by

	moving the explicit resetting of DEPLIB=$SHLIBEXT and forcing
	SHLIBEXT=.so-nobuild to avoid duplicate rules on AIX and such.

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/marc-3des@10935 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/ChangeLog b/src/ChangeLog
index 92eea4d3f46b09fabb20403794b52a1559c0ed2b..eb86f7c0067846ffdbcf06c0515339ece28cf562 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+Wed Sep 23 15:24:44 1998  Tom Yu  <tlyu@mit.edu>
+
+       * aclocal.m4 (KRB5_LIB_AUX): Do what Sam originally meant to do by
+       moving the explicit resetting of DEPLIB=$SHLIBEXT and forcing
+       SHLIBEXT=.so-nobuild to avoid duplicate rules on AIX and such.
+
 Wed Aug 19 20:14:31 1998  Tom Yu  <tlyu@mit.edu>
 
        * aclocal.m4 (KRB5_LIB_AUX): Back out Sam's change to reorder the

diff --git a/src/aclocal.m4 b/src/aclocal.m4
index e789b59db273962fe11e5eb3f228e8e70a77d3cb..1bfd92606fe893ee72b169625283739ba9c5563d 100644 (file)
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -868,8 +868,8 @@ if test "$enableval" = no && test "$krb5_force_static" != yes; then
        LIBLIST=
        OBJLISTS=
 else
-       LIBLIST="lib\$(LIB)$STLIBEXT"
-       LIBLINKS="\$(TOPLIBD)/lib\$(LIB)$STLIBEXT"
+       LIBLIST='lib$(LIB)$(STLIBEXT)'
+       LIBLINKS='$(TOPLIBD)/lib$(LIB)$(STLIBEXT)'
        OBJLISTS=OBJS.ST
        LIBINSTLIST=install-static
        DEPLIBEXT=$STLIBEXT
@@ -886,8 +886,12 @@ AC_ARG_ENABLE([shared],
                CC_LINK="$CC_LINK_STATIC"
                ;;
        *)
+               # set this now because some logic below may reset SHLIBEXT
+               DEPLIBEXT=$SHLIBEXT
                if test "$krb5_force_static" = "yes"; then
                        AC_MSG_RESULT([Forcing static libraries.])
+                       # avoid duplicate rules generation for AIX and such
+                       SHLIBEXT=.so-nobuild
                else
                        AC_MSG_RESULT([Enabling shared libraries.])
                        LIBLIST="$LIBLIST "'lib$(LIB)$(SHLIBEXT)'
@@ -904,7 +908,6 @@ AC_ARG_ENABLE([shared],
                        esac
                        OBJLISTS="$OBJLISTS OBJS.SH"
                fi
-               DEPLIBEXT=$SHLIBEXT
                CC_LINK="$CC_LINK_SHARED"
                if test "$STLIBEXT" = "$SHLIBEXT" ; then
                  STLIBEXT=".a-no-build"