* configure.in (in all relevant subdirs):

	* Makefile.in (in all relevant subdirs): back out changes because
	they were causing breakage under Ultrix

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

13 files changed, 12 insertions, 24 deletions

diff --git a/src/admin/ChangeLog b/src/admin/ChangeLog
index 147d13048..f6dc3c673 100644
--- a/src/admin/ChangeLog
+++ b/src/admin/ChangeLog
@@ -1,3 +1,9 @@
+Fri Jul  8 00:41:41 1994  Tom Yu  (tlyu at dragons-lair)
+
+	* configure.in (in all relevant subdirs):
+	* Makefile.in (in all relevant subdirs): back out changes because
+	they were causing breakage under Ultrix
+
 Wed Jul  6 23:03:16 1994  Tom Yu  (tlyu at dragons-lair)
 
 	* configure.in (in all relevant subdirs):
diff --git a/src/admin/aname/Makefile.in b/src/admin/aname/Makefile.in
index ac7eb66dc..f4e40ccec 100644
--- a/src/admin/aname/Makefile.in
+++ b/src/admin/aname/Makefile.in
@@ -3,7 +3,7 @@ LDFLAGS = -g
 
 ISODELIB=@ISODELIB@
 COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
-DBMLIB=@DBMLIB@
+DBMLIB=
 KDBLIB=$(TOPLIBD)/libkdb5.a 
 
 all::
diff --git a/src/admin/aname/configure.in b/src/admin/aname/configure.in
index 68a5aabfe..fe63cb081 100644
--- a/src/admin/aname/configure.in
+++ b/src/admin/aname/configure.in
@@ -4,9 +4,6 @@ CONFIG_RULES
 AC_SET_BUILDTOP
 AC_HAVE_LIBRARY(socket)
 AC_HAVE_LIBRARY(nsl)
-AC_HAVE_LIBRARY(ndbm, DBMLIB="-lndbm")
-AC_HAVE_LIBRARY(dbm, DBMLIB="-ldbm")
-AC_SUBST(DBMLIB)
 KRB_INCLUDE
 ISODE_INCLUDE
 WITH_KRB5ROOT
diff --git a/src/admin/convert/Makefile.in b/src/admin/convert/Makefile.in
index d90cad902..d20e9f984 100644
--- a/src/admin/convert/Makefile.in
+++ b/src/admin/convert/Makefile.in
@@ -5,7 +5,7 @@ LDFLAGS = -g
 
 ISODELIB=@ISODELIB@
 COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
-DBMLIB=@DBMLIB@
+DBMLIB=
 KDBLIB=$(TOPLIBD)/libkdb5.a
 KDB4LIB=$(KRB4)/lib/libkdb.a
 KRB4LIB=$(KRB4)/lib/libkrb.a $(TOPLIBD)/libdes425.a
diff --git a/src/admin/convert/configure.in b/src/admin/convert/configure.in
index edfdcab7e..4d5f22464 100644
--- a/src/admin/convert/configure.in
+++ b/src/admin/convert/configure.in
@@ -4,9 +4,6 @@ CONFIG_RULES
 AC_SET_BUILDTOP
 AC_HAVE_LIBRARY(socket)
 AC_HAVE_LIBRARY(nsl)
-AC_HAVE_LIBRARY(ndbm, DBMLIB="-lndbm")
-AC_HAVE_LIBRARY(dbm, DBMLIB="-ldbm")
-AC_SUBST(DBMLIB)
 KRB_INCLUDE
 ISODE_INCLUDE
 WITH_KRB4
diff --git a/src/admin/create/Makefile.in b/src/admin/create/Makefile.in
index 37b79f5da..635f22d09 100644
--- a/src/admin/create/Makefile.in
+++ b/src/admin/create/Makefile.in
@@ -3,7 +3,7 @@ LDFLAGS = -g
 
 ISODELIB=@ISODELIB@
 COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
-DBMLIB=@DBMLIB@
+DBMLIB=
 KDBLIB=$(TOPLIBD)/libkdb5.a 
 
 all::
diff --git a/src/admin/create/configure.in b/src/admin/create/configure.in
index 0391dc437..7498ab533 100644
--- a/src/admin/create/configure.in
+++ b/src/admin/create/configure.in
@@ -5,9 +5,6 @@ WITH_KRB5ROOT
 AC_SET_BUILDTOP
 AC_HAVE_LIBRARY(socket)
 AC_HAVE_LIBRARY(nsl)
-AC_HAVE_LIBRARY(ndbm, DBMLIB="-lndbm")
-AC_HAVE_LIBRARY(dbm, DBMLIB="-ldbm")
-AC_SUBST(DBMLIB)
 KRB_INCLUDE
 ISODE_INCLUDE
 AC_OUTPUT(Makefile,[EXTRA_RULES])
diff --git a/src/admin/destroy/Makefile.in b/src/admin/destroy/Makefile.in
index ddfd70e82..a6a59f9e6 100644
--- a/src/admin/destroy/Makefile.in
+++ b/src/admin/destroy/Makefile.in
@@ -3,7 +3,7 @@ LDFLAGS = -g
 
 ISODELIB=@ISODELIB@
 COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
-DBMLIB=@DBMLIB@
+DBMLIB=
 KDBLIB=$(TOPLIBD)/libkdb5.a 
 
 all::
diff --git a/src/admin/destroy/configure.in b/src/admin/destroy/configure.in
index 3b82e589d..340d34d3c 100644
--- a/src/admin/destroy/configure.in
+++ b/src/admin/destroy/configure.in
@@ -4,9 +4,6 @@ CONFIG_RULES
 AC_SET_BUILDTOP
 AC_HAVE_LIBRARY(socket)
 AC_HAVE_LIBRARY(nsl)
-AC_HAVE_LIBRARY(ndbm, DBMLIB="-lndbm")
-AC_HAVE_LIBRARY(dbm, DBMLIB="-ldbm")
-AC_SUBST(DBMLIB)
 KRB_INCLUDE
 ISODE_INCLUDE
 WITH_KRB5ROOT
diff --git a/src/admin/edit/Makefile.in b/src/admin/edit/Makefile.in
index 86b2ea628..ac6138d69 100644
--- a/src/admin/edit/Makefile.in
+++ b/src/admin/edit/Makefile.in
@@ -4,7 +4,7 @@ LDFLAGS = -g
 ISODELIB=@ISODELIB@
 COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
 SSLIB=$(BUILDTOP)/util/ss/libss.a
-DBMLIB=@DBMLIB@
+DBMLIB=
 KDBLIB=$(TOPLIBD)/libkdb5.a 
 
 all::
diff --git a/src/admin/edit/configure.in b/src/admin/edit/configure.in
index 553627834..c365f62a2 100644
--- a/src/admin/edit/configure.in
+++ b/src/admin/edit/configure.in
@@ -4,9 +4,6 @@ CONFIG_RULES
 AC_SET_BUILDTOP
 AC_HAVE_LIBRARY(socket)
 AC_HAVE_LIBRARY(nsl)
-AC_HAVE_LIBRARY(ndbm, DBMLIB="-lndbm")
-AC_HAVE_LIBRARY(dbm, DBMLIB="-ldbm")
-AC_SUBST(DBMLIB)
 AC_HAVE_FUNCS(getcwd)
 SS_RULES
 KRB_INCLUDE
diff --git a/src/admin/stash/Makefile.in b/src/admin/stash/Makefile.in
index 4d086626d..f5d211ccf 100644
--- a/src/admin/stash/Makefile.in
+++ b/src/admin/stash/Makefile.in
@@ -3,7 +3,7 @@ LDFLAGS = -g
 
 ISODELIB=@ISODELIB@
 COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
-DBMLIB=@DBMLIB@
+DBMLIB=
 KDBLIB=$(TOPLIBD)/libkdb5.a 
 
 all::
diff --git a/src/admin/stash/configure.in b/src/admin/stash/configure.in
index f61b15677..df58c1cf9 100644
--- a/src/admin/stash/configure.in
+++ b/src/admin/stash/configure.in
@@ -4,9 +4,6 @@ CONFIG_RULES
 AC_SET_BUILDTOP
 AC_HAVE_LIBRARY(socket)
 AC_HAVE_LIBRARY(nsl)
-AC_HAVE_LIBRARY(ndbm, DBMLIB="-lndbm")
-AC_HAVE_LIBRARY(dbm, DBMLIB="-ldbm")
-AC_SUBST(DBMLIB)
 KRB_INCLUDE
 ISODE_INCLUDE
 WITH_KRB5ROOT