configure.in: Add USE_ANAME and KRB5_LIBRARIES

Makefile.in: Change to properly use the libraries as specified by configure

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

diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog
index 03a631d8ec04d8d35b959dd3c474518bab21cbdd..1588e1372e06c830639a07938ef032568dcdbd30 100644 (file)
--- a/src/lib/krb5/os/ChangeLog
+++ b/src/lib/krb5/os/ChangeLog
@@ -1,3 +1,9 @@
+Sun Mar 17 20:42:17 1996  Ezra Peisach  <epeisach@mit.edu>
+
+        * configure.in: Add USE_ANAME, KRB5_LIBRARIES
+
+       * Makefile.in: Properly use libraries as specified by configure
+
 Wed Mar 13 13:11:49 1996  Ezra Peisach  <epeisach@kangaroo.mit.edu>
 
        * t_std_conf.c: Include string.h

diff --git a/src/lib/krb5/os/Makefile.in b/src/lib/krb5/os/Makefile.in
index 2a675b2ab03ed0486441673f99eb2e16d046e7b8..f45b4478cf59d8b5e030edd272a382ad829f5ada 100644 (file)
--- a/src/lib/krb5/os/Makefile.in
+++ b/src/lib/krb5/os/Makefile.in
@@ -97,22 +97,18 @@ all-windows:: $(OBJS)
 shared:
        mkdir shared
 
-COMERRLIB=$(TOPLIBD)/libcom_err.a
-
 TEST_PROGS= t_std_conf t_an_to_ln
 
 T_STD_CONF_OBJS= t_std_conf.o def_realm.o get_krbhst.o realm_dom.o \
-               hst_realm.o init_os_ctx.o locate_kdc.o $(COMERRLIB) \
-               $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a
+               hst_realm.o init_os_ctx.o locate_kdc.o 
 
-T_AN_TO_LN_OBJS = t_an_to_ln.o an_to_ln.o $(TOPLIBD)/libkrb5.a \
-               $(TOPLIBD)/libcrypto.a $(COMERRLIB)
+T_AN_TO_LN_OBJS = t_an_to_ln.o an_to_ln.o 
 
-t_std_conf: $(T_STD_CONF_OBJS)
-       $(LD) -o t_std_conf $(T_STD_CONF_OBJS) $(LIBS)
+t_std_conf: $(T_STD_CONF_OBJS) $(DEPLIBS)
+       $(LD) $(LDFLAGS) $(LDARGS) -o t_std_conf $(T_STD_CONF_OBJS) $(LIBS)
 
-t_an_to_ln: $(T_AN_TO_LN_OBJS)
-       $(LD) -o t_an_to_ln $(T_AN_TO_LN_OBJS) $(LIBS)
+t_an_to_ln: $(T_AN_TO_LN_OBJS) $(DEPLIBS)
+       $(LD) $(LDFLAGS) $(LDARGS) -o t_an_to_ln $(T_AN_TO_LN_OBJS) $(LIBS)
 
 check-unix:: $(TEST_PROGS)
        KRB5_CONFIG=$(srcdir)/td_krb5.conf ; export KRB5_CONFIG ;\

diff --git a/src/lib/krb5/os/configure.in b/src/lib/krb5/os/configure.in
index a41dd6173414f3007268ae64a3823eaa734e3ce4..7c7244315757ed3acd15971cdb9fb90d16f9a321 100644 (file)
--- a/src/lib/krb5/os/configure.in
+++ b/src/lib/krb5/os/configure.in
@@ -7,8 +7,9 @@ AC_HAVE_HEADERS(unistd.h sys/time.h regex.h regexp.h)
 AC_HAVE_FUNCS(re_comp regcomp)
 AC_HEADER_EGREP(time_t, sys/types.h, AC_DEFINE(POSIX_TYPES))
 HAS_ANSI_VOLATILE
-USE_ANAME
 AC_DEFINE(AN_TO_LN_RULES)
+USE_ANAME
 V5_SHARED_LIB_OBJS
+KRB5_LIBRARIES
 SubdirLibraryRule([${OBJS}])
 V5_AC_OUTPUT_MAKEFILE