diff options
| author | Mark Eichin <eichin@mit.edu> | 1995-04-27 19:23:03 +0000 |
|---|---|---|
| committer | Mark Eichin <eichin@mit.edu> | 1995-04-27 19:23:03 +0000 |
| commit | 7819f3aceba3f3ecaf477db59de311ef0f60e267 (patch) | |
| tree | c0451a7e92e9c5ef8c95421f4877b6ae65c641f1 | |
| parent | 27a6a9de2670d9c718a78401c2f53b4796d078ea (diff) | |
| download | krb5-7819f3aceba3f3ecaf477db59de311ef0f60e267.tar.gz krb5-7819f3aceba3f3ecaf477db59de311ef0f60e267.tar.xz krb5-7819f3aceba3f3ecaf477db59de311ef0f60e267.zip | |
* Makefile.in (LOCALINCLUDE): get kerberosIV headers for login.c
(login.krb): link against krb4 libs.
* configure.in: check AC_CONST so it works.
* configure.in: use WITH_KRB4 as-is.
* Makefile.in (krshd, krlogind): use KRB4_LIB directly.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@5558 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/appl/bsd/ChangeLog | 11 | ||||
| -rw-r--r-- | src/appl/bsd/Makefile.in | 9 | ||||
| -rw-r--r-- | src/appl/bsd/configure.in | 8 |
3 files changed, 17 insertions, 11 deletions
diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog index f1322b4dd9..45092a10de 100644 --- a/src/appl/bsd/ChangeLog +++ b/src/appl/bsd/ChangeLog @@ -1,3 +1,14 @@ +Thu Apr 27 14:36:54 1995 Mark Eichin <eichin@cygnus.com> + + * Makefile.in (LOCALINCLUDE): get kerberosIV headers for login.c + (login.krb): link against krb4 libs. + * configure.in: check AC_CONST so it works. + +Thu Apr 27 13:54:21 1995 Mark Eichin <eichin@cygnus.com> + + * configure.in: use WITH_KRB4 as-is. + * Makefile.in (krshd, krlogind): use KRB4_LIB directly. + Thu Apr 27 01:09:19 1995 Ezra Peisach <epeisach@kangaroo.mit.edu> * krcp.c (answer_auth): Should not call krb5_cc_close after diff --git a/src/appl/bsd/Makefile.in b/src/appl/bsd/Makefile.in index f2d5890c00..8f7cf06249 100644 --- a/src/appl/bsd/Makefile.in +++ b/src/appl/bsd/Makefile.in @@ -1,8 +1,9 @@ CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) $(DEFINES) +LOCALINCLUDE=-I$(SRCTOP)/include/kerberosIV SETENVSRC=@SETENVSRC@ SETENVOBJ=@SETENVOBJ@ COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a -K4LIB = @K4LIB@ +KRB4_LIB = @KRB4_LIB@ KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) @@ -52,21 +53,21 @@ install:: $(INSTALL_DATA) $(srcdir)/rlogin.M ${DESTDIR}$(CLIENT_MANDIR)/rlogin.1 krshd: krshd.o kcmd.o logutil.o forward.o $(SETENVOBJ) $(LIBOBJS) $(DEPKLIB) - $(CC) $(CFLAGS) -o krshd krshd.o kcmd.o logutil.o forward.o $(SETENVOBJ) $(LIBOBJS) $(KLIB) $(K4LIB) $(LIBS) + $(CC) $(CFLAGS) -o krshd krshd.o kcmd.o logutil.o forward.o $(SETENVOBJ) $(LIBOBJS) $(KLIB) $(KRB4_LIB) $(LIBS) install:: $(INSTALL_PROGRAM) krshd $(DESTDIR)$(SERVER_BINDIR)/krshd $(INSTALL_DATA) $(srcdir)/krshd.M ${DESTDIR}$(SERVER_MANDIR)/krshd.8 krlogind: krlogind.o logutil.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(DEPKLIB) - $(CC) $(CFLAGS) -o krlogind krlogind.o logutil.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(KLIB) $(K4LIB) $(LIBS) + $(CC) $(CFLAGS) -o krlogind krlogind.o logutil.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(KLIB) $(KRB4_LIB) $(LIBS) install:: $(INSTALL_PROGRAM) krlogind $(DESTDIR)$(SERVER_BINDIR)/krlogind $(INSTALL_DATA) $(srcdir)/krlogind.M ${DESTDIR}$(SERVER_MANDIR)/krlogind.8 login.krb5: login.o logutil.o $(SETENVOBJ) $(LIBOBJS) $(DEPKLIB) - $(CC) $(CFLAGS) -o login.krb5 login.o logutil.o $(SETENVOBJ) $(LIBOBJS) $(KLIB) $(LIBS) $(LOGINLIBS) + $(CC) $(CFLAGS) -o login.krb5 login.o logutil.o $(SETENVOBJ) $(LIBOBJS) $(KLIB) $(KRB4_LIB) $(LIBS) $(LOGINLIBS) install:: $(INSTALL_PROGRAM) login.krb5 $(DESTDIR)$(SERVER_BINDIR)/login.krb5 diff --git a/src/appl/bsd/configure.in b/src/appl/bsd/configure.in index cdb56ae5da..eefd9922a2 100644 --- a/src/appl/bsd/configure.in +++ b/src/appl/bsd/configure.in @@ -60,13 +60,6 @@ AC_PATH_PROG(UCB_RSH,rsh,/usr/ucb/rsh) AC_PATH_PROG(UCB_RCP,rcp,/usr/ucb/rcp) PATH=$save_path dnl -AC_ARG_WITH([krb4],[include Kerberos V4 support], -ADD_DEF(-DKRB5_KRB4_COMPAT) -K4LIB='$(KRB4)/lib/libkrb.a $(TOPLIBD)/libdes425.a', -echo "warning: no krb4 backwards compatibility support" -K4LIB=) -AC_SUBST(K4LIB) -dnl dnl AC_MSG_CHECKING([streams interface]) AC_CACHE_VAL(krb5_cv_has_streams, @@ -144,4 +137,5 @@ fi dnl dnl ADD_DEF(-DKERBEROS) +AC_CONST V5_AC_OUTPUT_MAKEFILE |