diff options
| author | Ezra Peisach <epeisach@mit.edu> | 1996-03-18 01:47:02 +0000 |
|---|---|---|
| committer | Ezra Peisach <epeisach@mit.edu> | 1996-03-18 01:47:02 +0000 |
| commit | 3462ed35dd3981c4e08e6341e941dac7eb470bab (patch) | |
| tree | 3c43835c4e8890bf8573acc4831dc04c661d5f06 /src | |
| parent | dc7983e00a2a88e6d6d35f9169566ffb34a0d0d4 (diff) | |
| download | krb5-3462ed35dd3981c4e08e6341e941dac7eb470bab.tar.gz krb5-3462ed35dd3981c4e08e6341e941dac7eb470bab.tar.xz krb5-3462ed35dd3981c4e08e6341e941dac7eb470bab.zip | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/krb5/os/ChangeLog | 6 | ||||
| -rw-r--r-- | src/lib/krb5/os/Makefile.in | 16 | ||||
| -rw-r--r-- | src/lib/krb5/os/configure.in | 3 |
3 files changed, 14 insertions, 11 deletions
diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog index 03a631d8e..1588e1372 100644 --- 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 2a675b2ab..f45b4478c 100644 --- 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 a41dd6173..7c7244315 100644 --- 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 |