* aclocal.m4 (KRB5_LIB_PARAMS): Set CC_LINK_STATIC for platforms

		w/o shared library support.
		     (KRB5_LIB_AUX); Set CC_LINK if --enable-shared is not
		specified.

			(The second fix was to utilize the action-if-false stanza of AC_ARG_ENABLE.

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 9369ea82dc073f8e1e2554b6b43400d68586e421..b50b65e09b2653505327fdec47c468c38f1e8fc2 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+Mon Feb 10 11:30:56 1997  Ezra Peisach  <epeisach@mit.edu>
+
+       * aclocal.m4 (KRB5_LIB_PARAMS): Set CC_LINK_STATIC for platforms
+               w/o shared library support.
+                    (KRB5_LIB_AUX); Set CC_LINK if --enable-shared is not
+               specified.
+
 Mon Feb  3 00:11:37 1997  Richard Basch  <basch@lehman.com>
 
        * Makefile.in:

diff --git a/src/aclocal.m4 b/src/aclocal.m4
index e2991576ec462d42ffdad8399e9cd966a8932eb3..71caa7b7fd4388be64041bdfdf6cb56fcdce7af4 100644 (file)
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -1095,7 +1095,10 @@ AC_ARG_ENABLE([shared],
 else
        RUN_ENV=
        CC_LINK="$CC_LINK_STATIC"
-fi])dnl
+fi],
+       RUN_ENV=
+       CC_LINK="$CC_LINK_STATIC"
+)dnl
 
 if test -z "$LIBLIST"; then
        AC_MSG_ERROR([must enable one of shared or static libraries])
@@ -1144,6 +1147,9 @@ PFLIBEXT=_p.a
 STOBJEXT=.o
 SHOBJEXT=.so
 PFOBJEXT=.po
+# Default for systems w/o shared libraries
+CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)'
+
 # Set up architecture-specific variables.
 case $krb5_cv_host in
 alpha-dec-osf*)