krb4 fixes

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

diff --git a/src/admin/convert/Makefile.in b/src/admin/convert/Makefile.in
index 980e4deb0449199c5eeb62858eb219994998b062..9995c85834794dab9a1b8bd11e2976f9208b79f7 100644 (file)
--- a/src/admin/convert/Makefile.in
+++ b/src/admin/convert/Makefile.in
@@ -3,7 +3,8 @@ VPATH = @srcdir@
  
 DEFS = @DEFS@
 LIBS = @LIBS@
- 
+KRB4 = @KRB4@
+
 CFLAGS = -g $(DEFS) $(LOCALINCLUDE)
 LDFLAGS = -g
 
@@ -13,9 +14,9 @@ TOPLIBD = $(BUILDTOP)/lib
 ISODELIB=$(TOPLIBD)/libisode.a
 COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
 DBMLIB=
-KDBLIB=$(TOPLIBD)/libkdb5.a 
-KDB4LIB=/usr/kerberos/lib/libkdb.a
-KRB4LIB=/usr/kerberos/lib/libkrb.a /usr/kerberos/lib/libdes.a
+KDBLIB=$(TOPLIBD)/libkdb5.a
+KDB4LIB=$(KRB4)/lib/libkdb.a
+KRB4LIB=$(KRB4)/lib/libkrb.a $(KRB4)/lib/libdes.a
 
 all::
 

diff --git a/src/admin/convert/configure.in b/src/admin/convert/configure.in
index 471a94964ad5e84c16f18361fbec4468c19afec9..14e7a1c37b5514f0586daa2768e0cbceab4a9be3 100644 (file)
--- a/src/admin/convert/configure.in
+++ b/src/admin/convert/configure.in
@@ -4,4 +4,5 @@ AC_HAVE_LIBRARY(nsl)
 CONFIG_RULES
 KRB_INCLUDE
 ISODE_INCLUDE
+WITH_KRB4
 AC_OUTPUT(Makefile,[EXTRA_RULES])