Conversion of autoconfigury to Autoconf V2

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

7 files changed, 32 insertions, 32 deletions

diff --git a/src/admin/aname/configure.in b/src/admin/aname/configure.in
index 751fb0bb1..1921a989e 100644
--- a/src/admin/aname/configure.in
+++ b/src/admin/aname/configure.in
@@ -3,11 +3,11 @@ WITH_CCOPTS
 CONFIG_RULES
 AC_SET_BUILDTOP
 AC_PROG_INSTALL
-AC_HAVE_LIBRARY(socket)
-AC_HAVE_LIBRARY(nsl)
-AC_HAVE_LIBRARY(-lndbm)
-AC_HAVE_LIBRARY(-ldbm)
+AC_CHECK_LIB(socket,main)
+AC_CHECK_LIB(nsl,main)
+AC_CHECK_LIB(ndbm,main)
+AC_CHECK_LIB(dbm,main)
 KRB_INCLUDE
 ISODE_INCLUDE
 WITH_KRB5ROOT
-AC_OUTPUT(Makefile,[EXTRA_RULES])
+V5_AC_OUTPUT_MAKEFILE
diff --git a/src/admin/configure.in b/src/admin/configure.in
index 6c3098b7e..28f5995c7 100644
--- a/src/admin/configure.in
+++ b/src/admin/configure.in
@@ -1,11 +1,11 @@
 AC_INIT(configure.in)
 WITH_CCOPTS
 AC_SET_BUILDTOP
-AC_WITH([krb4],convert=convert,convert=)
+AC_ARG_WITH([krb4],[include Kerberos V4 support],convert=convert,convert=)
 CONFIG_DIRS(create destroy edit stash aname $convert)
 MAKE_SUBDIRS("making",all)
 MAKE_SUBDIRS("cleaning",clean)
 MAKE_SUBDIRS("installing",install)
 CONFIG_RULES
 WITH_KRB5ROOT
-AC_OUTPUT(Makefile,[EXTRA_RULES])
+V5_AC_OUTPUT_MAKEFILE
diff --git a/src/admin/convert/configure.in b/src/admin/convert/configure.in
index 1f544cb41..30afbf766 100644
--- a/src/admin/convert/configure.in
+++ b/src/admin/convert/configure.in
@@ -3,12 +3,12 @@ WITH_CCOPTS
 CONFIG_RULES
 AC_SET_BUILDTOP
 AC_PROG_INSTALL
-AC_HAVE_LIBRARY(socket)
-AC_HAVE_LIBRARY(nsl)
-AC_HAVE_LIBRARY(-lndbm)
-AC_HAVE_LIBRARY(-ldbm)
+AC_CHECK_LIB(socket,main)
+AC_CHECK_LIB(nsl,main)
+AC_CHECK_LIB(ndbm,main)
+AC_CHECK_LIB(dbm,main)
 KRB_INCLUDE
 ISODE_INCLUDE
 WITH_KRB4
 WITH_KRB5ROOT
-AC_OUTPUT(Makefile,[EXTRA_RULES])
+V5_AC_OUTPUT_MAKEFILE
diff --git a/src/admin/create/configure.in b/src/admin/create/configure.in
index c440a6186..6e129292d 100644
--- a/src/admin/create/configure.in
+++ b/src/admin/create/configure.in
@@ -4,10 +4,10 @@ CONFIG_RULES
 WITH_KRB5ROOT
 AC_SET_BUILDTOP
 AC_PROG_INSTALL
-AC_HAVE_LIBRARY(socket)
-AC_HAVE_LIBRARY(nsl)
-AC_HAVE_LIBRARY(-lndbm)
-AC_HAVE_LIBRARY(-ldbm)
+AC_CHECK_LIB(socket,main)
+AC_CHECK_LIB(nsl,main)
+AC_CHECK_LIB(ndbm,main)
+AC_CHECK_LIB(dbm,main)
 KRB_INCLUDE
 ISODE_INCLUDE
-AC_OUTPUT(Makefile,[EXTRA_RULES])
+V5_AC_OUTPUT_MAKEFILE
diff --git a/src/admin/destroy/configure.in b/src/admin/destroy/configure.in
index deb3819aa..e606568b1 100644
--- a/src/admin/destroy/configure.in
+++ b/src/admin/destroy/configure.in
@@ -3,11 +3,11 @@ WITH_CCOPTS
 CONFIG_RULES
 AC_SET_BUILDTOP
 AC_PROG_INSTALL
-AC_HAVE_LIBRARY(socket)
-AC_HAVE_LIBRARY(nsl)
-AC_HAVE_LIBRARY(-lndbm)
-AC_HAVE_LIBRARY(-ldbm)
+AC_CHECK_LIB(socket,main)
+AC_CHECK_LIB(nsl,main)
+AC_CHECK_LIB(ndbm,main)
+AC_CHECK_LIB(dbm,main)
 KRB_INCLUDE
 ISODE_INCLUDE
 WITH_KRB5ROOT
-AC_OUTPUT(Makefile,[EXTRA_RULES])
+V5_AC_OUTPUT_MAKEFILE
diff --git a/src/admin/edit/configure.in b/src/admin/edit/configure.in
index 0cbedea27..79c9224ee 100644
--- a/src/admin/edit/configure.in
+++ b/src/admin/edit/configure.in
@@ -3,13 +3,13 @@ WITH_CCOPTS
 CONFIG_RULES
 AC_SET_BUILDTOP
 AC_PROG_INSTALL
-AC_HAVE_LIBRARY(socket)
-AC_HAVE_LIBRARY(nsl)
-AC_HAVE_LIBRARY(-lndbm)
-AC_HAVE_LIBRARY(-ldbm)
+AC_CHECK_LIB(socket,main)
+AC_CHECK_LIB(nsl,main)
+AC_CHECK_LIB(ndbm,main)
+AC_CHECK_LIB(dbm,main)
 AC_HAVE_FUNCS(getcwd)
 SS_RULES
 KRB_INCLUDE
 ISODE_INCLUDE
 WITH_KRB5ROOT
-AC_OUTPUT(Makefile,[EXTRA_RULES])
+V5_AC_OUTPUT_MAKEFILE
diff --git a/src/admin/stash/configure.in b/src/admin/stash/configure.in
index 4d5cde70e..030b0a98a 100644
--- a/src/admin/stash/configure.in
+++ b/src/admin/stash/configure.in
@@ -3,11 +3,11 @@ WITH_CCOPTS
 CONFIG_RULES
 AC_SET_BUILDTOP
 AC_PROG_INSTALL
-AC_HAVE_LIBRARY(socket)
-AC_HAVE_LIBRARY(nsl)
-AC_HAVE_LIBRARY(-lndbm)
-AC_HAVE_LIBRARY(-ldbm)
+AC_CHECK_LIB(socket,main)
+AC_CHECK_LIB(nsl,main)
+AC_CHECK_LIB(ndbm,main)
+AC_CHECK_LIB(dbm,main)
 KRB_INCLUDE
 ISODE_INCLUDE
 WITH_KRB5ROOT
-AC_OUTPUT(Makefile,[EXTRA_RULES])
+V5_AC_OUTPUT_MAKEFILE