From: Ezra Peisach <epeisach@mit.edu>
Date: Fri, 23 Jun 1995 15:52:00 +0000 (+0000)
Subject: (V5_MAKE_SHARED_RULE) Set STEXT when not making shared library
X-Git-Tag: krb5-1.0-beta6~1671
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=67973fc5f37a010a5deb856fc914ad1703532d53;p=krb5.git

(V5_MAKE_SHARED_RULE) Set STEXT when not making shared library
(CONFIG_RULES): Move AC_CONST from WITH_KRB4 definition

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

diff --git a/src/ChangeLog b/src/ChangeLog
index f32475a9b..a367273d1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+Fri Jun 23 11:48:04 1995  Ezra Peisach  (epeisach@kangaroo.mit.edu)
+
+	* aclocal.m4 (V5_MAKE_SHARED_RULE) Set STEXT when not making
+		shared library.
+		(CONFIG_RULES): Move AC_CONST from WITH_KRB4 definition. 
+
 Wed Jun 21 18:10:40 1995  Theodore Y. Ts'o  <tytso@dcl>
 
 	* aclocal.m4 (V5_SET_TOPDIR): Replace AC_CONFIG_FRAGMENTS,
diff --git a/src/aclocal.m4 b/src/aclocal.m4
index 23910419e..32560f3d8 100644
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -128,6 +128,7 @@ WITH_CCOPTS dnl
 WITH_LINKER dnl
 WITH_CPPOPTS dnl
 WITH_KRB4 dnl
+AC_CONST
 WITH_NETLIB dnl
 KRB_INCLUDE dnl
 AC_PUSH_MAKEFILE()dnl
@@ -372,7 +373,6 @@ AC_SUBST(KRB4_CRYPTO_LIB)
 AC_SUBST(DEPKRB4_LIB)
 AC_SUBST(DEPKDB4_LIB)
 AC_SUBST(DEPKRB4_CRYPTO_LIB)
-AC_CONST
 ])dnl
 dnl
 dnl set $(CC) from --with-cc=value
@@ -762,6 +762,8 @@ $1.[$](SHEXT): [$](LIBDONE) [$](DEPLIBS)
 
 AC_POP_MAKEFILE()dnl
 ],[
+STEXT=$krb5_cv_noshlibs_ext
+AC_SUBST(STEXT)
 DO_MAKE_SHLIB=
 AC_PUSH_MAKEFILE()
 all:: [$](DO_MAKE_SHLIB) [$](SHLIB_STATIC_TARGET)