* Makefile.in (LOCAL_LIBRARIES): use KRB4_LIB and KDB4_LIB

	directly.
	* configure.in: just use WITH_KRB4.

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

diff --git a/src/admin/edit/ChangeLog b/src/admin/edit/ChangeLog
index 24e60eb06a8179df2277b242a1e3f226d9793628..cc871faf3b7612e2af4e1ffe4639eeb868d5f3e8 100644 (file)
--- a/src/admin/edit/ChangeLog
+++ b/src/admin/edit/ChangeLog
@@ -1,3 +1,9 @@
+Thu Apr 27 13:47:23 1995  Mark Eichin  <eichin@cygnus.com>
+
+       * Makefile.in (LOCAL_LIBRARIES): use KRB4_LIB and KDB4_LIB
+       directly.
+       * configure.in: just use WITH_KRB4.
+
 Wed Apr 19 13:59:47 1995  Ezra Peisach  <epeisach@kangaroo.mit.edu>
 
        * kdb5_edit.c (kdb5_edit_Init): If a default realm is specified

diff --git a/src/admin/edit/Makefile.in b/src/admin/edit/Makefile.in
index 40f296676089403b6a76edd7c66b633cab21276a..ac7a82e6f2a743faebab87104fd33af36c8367ee 100644 (file)
--- a/src/admin/edit/Makefile.in
+++ b/src/admin/edit/Makefile.in
@@ -1,4 +1,5 @@
-KRB4 = @KRB4@
+KRB4_LIB = @KRB4_LIB@
+KDB4_LIB = @KDB4_LIB@
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
 LDFLAGS = -g
 
@@ -8,8 +9,6 @@ DBMLIB=
 KDBLIB=$(TOPLIBD)/libkdb5.a 
 DEPKDBLIB=$(TOPLIBD)/libkdb5.a 
 
-K4LIB=@K4LIB@
-
 all::
 
 KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(SSLIB) $(COMERRLIB) $(DBMLIB)
@@ -17,7 +16,7 @@ DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(SSLIB) $(COMERRLIB) $(DB
 
 
 DEPLIBS = $(DEPKDBLIB) $(DEPKLIB)
-LOCAL_LIBRARIES = $(KDBLIB) $(KLIB) $(K4LIB)
+LOCAL_LIBRARIES = $(KDBLIB) $(KLIB) $(KDB4_LIB) $(KRB4_LIB)
 LOCALINCLUDE=-I$(SRCTOP)/include/kerberosIV -I$(BUILDTOP)/include/kerberosIV
 
 OBJS= kdb5_edit.o \

diff --git a/src/admin/edit/configure.in b/src/admin/edit/configure.in
index 3e7921ebd8b094d852aae62137a493f27cedbd4f..6281d9538515843c37cb0fc0c9ba7258001928ad 100644 (file)
--- a/src/admin/edit/configure.in
+++ b/src/admin/edit/configure.in
@@ -14,12 +14,5 @@ AC_HAVE_FUNCS(getcwd)
 SS_RULES
 KRB_INCLUDE
 WITH_KRB4
-AC_ARG_WITH([krb4],
-[  --with-krb4=KRB4DIR     build with Kerberos V4 backwards compatibility],
-ADD_DEF(-DKRB4)
-K4LIB='$(KRB4)/lib/libkdb.a $(KRB4)/lib/libkrb.a $(KRB4)/lib/libdes.a',
-echo "warning: no krb4 backwards compatibility support"
-K4LIB=)
-AC_SUBST(K4LIB)
 WITH_KRB5ROOT
 V5_AC_OUTPUT_MAKEFILE