* 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

diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog
index f1322b4dd90d1ce40d6d652dfa4f7acadaebedbc..45092a10deb3d544fd1490069349413dba0e7312 100644 (file)
--- 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 f2d5890c00d1929917f07044c8045e3a28a8f616..8f7cf06249dd76cef346c3bd74ee17e98f51bc2f 100644 (file)
--- 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 cdb56ae5dad5fc5fa26607ca0e2a45da8581b8d6..eefd9922a2fb486367684d949b9e6dffff536aec 100644 (file)
--- 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