From: Paul Park <pjpark@mit.edu>
Date: Wed, 12 Jul 1995 18:54:21 +0000 (+0000)
Subject: Add LDFLAGS setting to KRB5_LIBRARIES rule
X-Git-Tag: krb5-1.0-beta6~1533
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7525ad4139361a6c011d90c34e2949114b608199;p=krb5.git

Add LDFLAGS setting to KRB5_LIBRARIES rule

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

diff --git a/src/ChangeLog b/src/ChangeLog
index c1c37b368..4a712f1d7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+
+Wed Jul 12 11:47:43 EDT 1995	Paul Park	(pjpark@mit.edu)
+	* aclocal.m4 - Add LDFLAGS setting to KRB5_LIBRARIES.  This allows
+		building without using the rule V5_USE_SHARED_LIBS.  Also,
+		don't pass LDFLAGS in recursion because this overrides
+		the values in individual Makefiles.
+
 Sun Jul  9 06:15:33 1995  Tom Yu  <tlyu@lothlorien.MIT.EDU>
 
 	* aclocal.m4: backslash '$' characters that go into double-quoted
diff --git a/src/aclocal.m4 b/src/aclocal.m4
index 7838cca3b..57c991859 100644
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -90,7 +90,6 @@ $2::<<<
 	for i in $(SUBDIRS) ; do \
 		if (cd $$i ; echo>>> $1 <<<"in $(CURRENT_DIR)$$i..."; \
 			$(MAKE) CC="$(CC)" CCOPTS="$(CCOPTS)" \
-			LDFLAGS="$(LDFLAGS)" \
 			CURRENT_DIR=$(CURRENT_DIR)$$i/ >>>$3<<<) then :; \
 		else $$e; fi; \
 	done>>>
@@ -777,6 +776,9 @@ dnl
 define(KRB5_LIBRARIES,[
 DEPLIBS="\[$](DEPLOCAL_LIBRARIES) $kadm_deplib $kdb5_deplib \[$](TOPLIBD)/libkrb5.a $kdb4_deplib $krb4_deplib \[$](TOPLIBD)/libcrypto.a $ss_deplib \[$](TOPLIBD)/libcom_err.a"
 LIBS="\[$](LOCAL_LIBRARIES) $kadm_lib $kdb5_lib -lkrb5 $kdb4_lib $krb4_lib -lcrypto $ss_lib -lcom_err $LIBS"
+LDFLAGS="$LDFLAGS -L\$(TOPLIBD)"
+AC_SUBST(LDFLAGS)
+AC_SUBST(LDARGS)
 AC_SUBST(DEPLIBS)])
 dnl
 dnl This rule supports the generation of the shared library object files