configure.in: Add USE_ANAME and add proper aclocal.m4 functions to properly

tell the makefile which libraries to link to.

Makefile.in: Get the list of libraries to link from configure. Removes a
dependency on layout of build tree and allows for configure to specify
other libraries (as in aname conversion databases..)

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

diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index 4d6c3e179d7b6d1471e28c7141402747b24dd269..7983fc74c7127732310849f12db4a51c2e6918d0 100644 (file)
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -1,3 +1,11 @@
+Sun Mar 17 20:32:08 1996  Ezra Peisach  <epeisach@dumpster.rose.brandeis.edu>
+
+       * configure.in: Add USE_ANAME, USE_KRB5_LIBRAR, KRB5_LIBRARIES so
+               that Makefile does not have to know build tree layout.
+
+        * Makefile.in: Rework to be consistant with configure defines so
+               that configure can specify other needed libraries.
+
 Fri Mar 15 14:29:00 1996  Richard Basch  <basch@lehman.com>
 
        * in_tkt_ktb.c: Close the keytab if we opened it, not if the

diff --git a/src/lib/krb5/krb/Makefile.in b/src/lib/krb5/krb/Makefile.in
index 62e621a4bf51960e3d3c7c8c6eabf8ca04685a47..8a251b4cb632aa54c3dcd50413a872a6f8b80724 100644 (file)
--- a/src/lib/krb5/krb/Makefile.in
+++ b/src/lib/krb5/krb/Makefile.in
@@ -161,24 +161,21 @@ shared:
 COMERRLIB=$(TOPLIBD)/libcom_err.a
 
 T_WALK_RTREE_OBJS= t_walk_rtree.o walk_rtree.o tgtname.o unparse.o \
-       free_rtree.o bld_pr_ext.o \
-       $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) 
+       free_rtree.o bld_pr_ext.o 
 
-T_KERB_OBJS= t_kerb.o conv_princ.o unparse.o \
-       $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) 
+T_KERB_OBJS= t_kerb.o conv_princ.o unparse.o 
 
 T_SER_OBJS= t_ser.o ser_actx.o ser_adata.o ser_addr.o ser_auth.o ser_cksum.o \
-       ser_ctx.o ser_eblk.o ser_key.o ser_princ.o serialize.o \
-       $(TOPLIBD)/libkdb5.a $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB)
+       ser_ctx.o ser_eblk.o ser_key.o ser_princ.o serialize.o 
 
-t_walk_rtree: $(T_WALK_RTREE_OBJS)
-       $(LD) -o t_walk_rtree $(T_WALK_RTREE_OBJS) $(LIBS)
+t_walk_rtree: $(T_WALK_RTREE_OBJS) $(DEPLIBS)
+       $(LD) $(LDFLAGS) $(LDARGS) -o t_walk_rtree $(T_WALK_RTREE_OBJS) $(LIBS)
 
-t_kerb: $(T_KERB_OBJS)
-       $(LD) -o t_kerb $(T_KERB_OBJS) $(LIBS)
+t_kerb: $(T_KERB_OBJS) $(DEPLIBS)
+       $(LD) $(LDFLAGS) $(LDARGS) -o t_kerb $(T_KERB_OBJS) $(LIBS)
 
-t_ser: $(T_SER_OBJS)
-       $(LD) -o t_ser $(T_SER_OBJS) $(LIBS)
+t_ser: $(T_SER_OBJS) $(DEPLIBS)
+       $(LD) $(LDFLAGS) $(LDARGS) -o t_ser $(T_SER_OBJS) $(LIBS)
 
 TEST_PROGS= t_walk_rtree t_kerb t_ser
 

diff --git a/src/lib/krb5/krb/configure.in b/src/lib/krb5/krb/configure.in
index df0f057f8b1583307a5c390372df1ec390e8178c..a0e11d15912a73dabd1fe4a79a00e441397abe64 100644 (file)
--- a/src/lib/krb5/krb/configure.in
+++ b/src/lib/krb5/krb/configure.in
@@ -7,4 +7,7 @@ AC_HEADER_STDARG
 V5_SHARED_LIB_OBJS
 AC_HAVE_FUNCS(strftime strptime)
 SubdirLibraryRule([$(OBJS)])
+USE_ANAME
+USE_KDB5_LIBRARY
+KRB5_LIBRARIES
 V5_AC_OUTPUT_MAKEFILE