Conversion of autoconfigury to Autoconf V2

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

26 files changed, 33 insertions, 30 deletions

diff --git a/src/lib/configure.in b/src/lib/configure.in
index baeb28605..328fe2113 100644
--- a/src/lib/configure.in
+++ b/src/lib/configure.in
@@ -15,4 +15,4 @@ LinkFile(libgssapi_krb5.a, gssapi/libgssapi_krb5.a)
 AppendRule([all:: libkrb5.a libcrypto.a])
 AppendRule([all:: libgssapi_krb5.a])
 WITH_KRB5ROOT
-AC_OUTPUT(Makefile,[EXTRA_RULES])
+V5_AC_OUTPUT_MAKEFILE
diff --git a/src/lib/crypto/configure.in b/src/lib/crypto/configure.in
index ff28db286..e4cc97542 100644
--- a/src/lib/crypto/configure.in
+++ b/src/lib/crypto/configure.in
@@ -13,4 +13,4 @@ MAKE_SUBDIRS("checking",check)
 AppendRule([all:: libcrypto.a])
 KRB_INCLUDE
 WITH_KRB5ROOT
-AC_OUTPUT(Makefile,[EXTRA_RULES])
+V5_AC_OUTPUT_MAKEFILE
diff --git a/src/lib/crypto/crc32/configure.in b/src/lib/crypto/crc32/configure.in
index 52832f2ac..f5e1ec7be 100644
--- a/src/lib/crypto/crc32/configure.in
+++ b/src/lib/crypto/crc32/configure.in
@@ -4,4 +4,4 @@ AC_SET_BUILDTOP
 CONFIG_RULES
 SubdirLibraryRule([${OBJS}])
 KRB_INCLUDE
-AC_OUTPUT(Makefile,[EXTRA_RULES])
+V5_AC_OUTPUT_MAKEFILE
diff --git a/src/lib/crypto/des/configure.in b/src/lib/crypto/des/configure.in
index 344288171..7a45f40e0 100644
--- a/src/lib/crypto/des/configure.in
+++ b/src/lib/crypto/des/configure.in
@@ -2,9 +2,9 @@ AC_INIT(configure.in)
 WITH_CCOPTS
 AC_SET_BUILDTOP
 CONFIG_RULES
-AC_HAVE_LIBRARY(socket)
-AC_HAVE_LIBRARY(nsl)
+AC_CHECK_LIB(socket,main)
+AC_CHECK_LIB(nsl,main)
 SubdirLibraryRule([${OBJS}])
 KRB_INCLUDE
 ISODE_INCLUDE
-AC_OUTPUT(Makefile,[EXTRA_RULES])
+V5_AC_OUTPUT_MAKEFILE
diff --git a/src/lib/crypto/md4/configure.in b/src/lib/crypto/md4/configure.in
index 52832f2ac..f5e1ec7be 100644
--- a/src/lib/crypto/md4/configure.in
+++ b/src/lib/crypto/md4/configure.in
@@ -4,4 +4,4 @@ AC_SET_BUILDTOP
 CONFIG_RULES
 SubdirLibraryRule([${OBJS}])
 KRB_INCLUDE
-AC_OUTPUT(Makefile,[EXTRA_RULES])
+V5_AC_OUTPUT_MAKEFILE
diff --git a/src/lib/crypto/md5/configure.in b/src/lib/crypto/md5/configure.in
index 52832f2ac..f5e1ec7be 100644
--- a/src/lib/crypto/md5/configure.in
+++ b/src/lib/crypto/md5/configure.in
@@ -4,4 +4,4 @@ AC_SET_BUILDTOP
 CONFIG_RULES
 SubdirLibraryRule([${OBJS}])
 KRB_INCLUDE
-AC_OUTPUT(Makefile,[EXTRA_RULES])
+V5_AC_OUTPUT_MAKEFILE
diff --git a/src/lib/crypto/os/configure.in b/src/lib/crypto/os/configure.in
index dc3860edc..4ce58eb8e 100644
--- a/src/lib/crypto/os/configure.in
+++ b/src/lib/crypto/os/configure.in
@@ -7,4 +7,4 @@ KRB_INCLUDE
 AC_LN_S
 AC_REPLACE_FUNCS(memmove)
 AC_HAVE_FUNCS(srand48 srand srandom getpid)
-AC_OUTPUT(Makefile,[EXTRA_RULES])
+V5_AC_OUTPUT_MAKEFILE
diff --git a/src/lib/des425/configure.in b/src/lib/des425/configure.in
index e36bba092..a37d5364d 100644
--- a/src/lib/des425/configure.in
+++ b/src/lib/des425/configure.in
@@ -9,4 +9,4 @@ AC_PROG_INSTALL
 AppendRule([all:: libdes425.a])
 KRB_INCLUDE
 WITH_KRB5ROOT
-AC_OUTPUT(Makefile,[EXTRA_RULES])
+V5_AC_OUTPUT_MAKEFILE
diff --git a/src/lib/gssapi/configure.in b/src/lib/gssapi/configure.in
index 4f1adba59..108c924e0 100644
--- a/src/lib/gssapi/configure.in
+++ b/src/lib/gssapi/configure.in
@@ -11,4 +11,4 @@ MAKE_SUBDIRS("cleaning",clean)
 AppendRule([all:: libgssapi_krb5.a])
 WITH_CCOPTS
 WITH_KRB5ROOT
-AC_OUTPUT(Makefile,[EXTRA_RULES])
+V5_AC_OUTPUT_MAKEFILE
diff --git a/src/lib/gssapi/generic/configure.in b/src/lib/gssapi/generic/configure.in
index c8b2873f6..7a95a174b 100644
--- a/src/lib/gssapi/generic/configure.in
+++ b/src/lib/gssapi/generic/configure.in
@@ -8,4 +8,4 @@ KRB_INCLUDE
 AC_SIZE_T
 CopySrcHeader(gssapi.h,[$(EHDRDIR)])
 CopySrcHeader(gssapi_generic.h,[$(EHDRDIR)])
-AC_OUTPUT(Makefile,[EXTRA_RULES])
+V5_AC_OUTPUT_MAKEFILE
diff --git a/src/lib/gssapi/krb5/configure.in b/src/lib/gssapi/krb5/configure.in
index 812fd469c..19ec1e360 100644
--- a/src/lib/gssapi/krb5/configure.in
+++ b/src/lib/gssapi/krb5/configure.in
@@ -5,4 +5,4 @@ AC_SET_BUILDTOP
 ET_RULES
 SubdirLibraryRule([${OBJS}])
 KRB_INCLUDE
-AC_OUTPUT(Makefile,[EXTRA_RULES])
+V5_AC_OUTPUT_MAKEFILE
diff --git a/src/lib/kdb/configure.in b/src/lib/kdb/configure.in
index 4bf1be7cb..b7d421363 100644
--- a/src/lib/kdb/configure.in
+++ b/src/lib/kdb/configure.in
@@ -10,4 +10,4 @@ AC_HAVE_HEADERS(unistd.h)
 AppendRule([all:: libkdb5.a])
 KRB_INCLUDE
 WITH_KRB5ROOT
-AC_OUTPUT(Makefile,[EXTRA_RULES])
+V5_AC_OUTPUT_MAKEFILE
diff --git a/src/lib/krb425/configure.in b/src/lib/krb425/configure.in
index 36b1eb3bc..a06894852 100644
--- a/src/lib/krb425/configure.in
+++ b/src/lib/krb425/configure.in
@@ -12,4 +12,4 @@ KRB_INCLUDE
 WITH_KRB5ROOT
 ISODE_INCLUDE
 CopyHeader(krb_err.h,[$(EHDRDIR)])
-AC_OUTPUT(Makefile,[EXTRA_RULES])
+V5_AC_OUTPUT_MAKEFILE
diff --git a/src/lib/krb5/asn.1/configure.in b/src/lib/krb5/asn.1/configure.in
index 23e19a34b..9e62843a9 100644
--- a/src/lib/krb5/asn.1/configure.in
+++ b/src/lib/krb5/asn.1/configure.in
@@ -4,7 +4,7 @@ WITH_CC dnl since we're not doing CONFIG_RULES
 dnl CONFIG_RULES
 AC_SET_BUILDTOP
 SubdirLibraryRule([${OBJS}])
-AC_ENABLE([isode],[
+AC_ARG_ENABLE([isode],[build and use ISODE to generate ASN.1 stubs],[
 UsePepsy
 PepsyTarget(KRB5)
 ISODEMAKEFILE=Makefile.isode],[
@@ -29,4 +29,7 @@ Krb5InstallHeaders(krb5_encode.h krb5_decode.h, [$(KRB5_INCDIR)/krb5/asn.1])
 KRB_INCLUDE
 ISODE_INCLUDE
 WITH_KRB5ROOT
-AC_OUTPUT(Makefile Makefile.isode Makefile.sane,[EXTRA_RULES_IN($ISODEMAKEFILE)])
+EXTRA_RULES_OUT(includes.out)
+AC_OUTPUT(pre.out:[$]ac_prepend Makefile.out:Makefile.in post.out:[$]ac_postpend Makefile.isode.out:Makefile.isode.in Makefile.sane.out:Makefile.sane.in,
+	,
+	[cat pre.out Makefile.out post.out > Makefile; cat pre.out [$]{ISODEMAKEFILE}.out post.out includes.out > [$]{ISODEMAKEFILE}])
diff --git a/src/lib/krb5/ccache/configure.in b/src/lib/krb5/ccache/configure.in
index 187ff7975..44193b49e 100644
--- a/src/lib/krb5/ccache/configure.in
+++ b/src/lib/krb5/ccache/configure.in
@@ -11,4 +11,4 @@ MAKE_SUBDIRS("making",all)
 MAKE_SUBDIRS("cleaning",clean)
 SubdirLibraryRule([$(OBJS)])
 KRB_INCLUDE
-AC_OUTPUT(Makefile,[EXTRA_RULES])
+V5_AC_OUTPUT_MAKEFILE
diff --git a/src/lib/krb5/ccache/file/configure.in b/src/lib/krb5/ccache/file/configure.in
index ae3fdc4c9..20561dac0 100644
--- a/src/lib/krb5/ccache/file/configure.in
+++ b/src/lib/krb5/ccache/file/configure.in
@@ -6,4 +6,4 @@ ISODE_DEFS
 AC_HAVE_HEADERS(unistd.h)
 SubdirLibraryRule([${OBJS}])
 KRB_INCLUDE
-AC_OUTPUT(Makefile,[EXTRA_RULES])
+V5_AC_OUTPUT_MAKEFILE
diff --git a/src/lib/krb5/ccache/stdio/configure.in b/src/lib/krb5/ccache/stdio/configure.in
index 634100934..4ef9516be 100644
--- a/src/lib/krb5/ccache/stdio/configure.in
+++ b/src/lib/krb5/ccache/stdio/configure.in
@@ -5,4 +5,4 @@ CONFIG_RULES
 ISODE_DEFS
 SubdirLibraryRule([${OBJS}])
 KRB_INCLUDE
-AC_OUTPUT(Makefile,[EXTRA_RULES])
+V5_AC_OUTPUT_MAKEFILE
diff --git a/src/lib/krb5/configure.in b/src/lib/krb5/configure.in
index 482e82497..90d1a8167 100644
--- a/src/lib/krb5/configure.in
+++ b/src/lib/krb5/configure.in
@@ -11,4 +11,4 @@ MAKE_SUBDIRS("cleaning",clean)
 AppendRule([all:: libkrb5.a])
 WITH_CCOPTS
 WITH_KRB5ROOT
-AC_OUTPUT(Makefile,[EXTRA_RULES])
+V5_AC_OUTPUT_MAKEFILE
diff --git a/src/lib/krb5/error_tables/configure.in b/src/lib/krb5/error_tables/configure.in
index dd8375b40..42512e334 100644
--- a/src/lib/krb5/error_tables/configure.in
+++ b/src/lib/krb5/error_tables/configure.in
@@ -6,7 +6,7 @@ AC_SET_BUILDTOP
 ET_RULES
 SS_RULES
 KRB_INCLUDE
-AC_ENABLE([isode],[
+AC_ARG_ENABLE([isode],[build and use ISODE to generate ASN.1 stubs],[
 ASN1_HDRS=isode_err.h
 ASN1_OBJS=isode_err.o
 ASN1_SRCS=isode_err.c
@@ -25,4 +25,4 @@ CopyHeader(krb5_err.h,[$(EHDRDIR)])
 CopyHeader(kdb5_err.h,[$(EHDRDIR)])
 CopyHeader(adm_err.h,[$(EHDRDIR)])
 CopyHeader(asn1_err.h,[$(EHDRDIR)])
-AC_OUTPUT(Makefile,[EXTRA_RULES])
+V5_AC_OUTPUT_MAKEFILE
diff --git a/src/lib/krb5/free/configure.in b/src/lib/krb5/free/configure.in
index 054fe2405..70598a5c0 100644
--- a/src/lib/krb5/free/configure.in
+++ b/src/lib/krb5/free/configure.in
@@ -6,4 +6,4 @@ ISODE_DEFS
 SubdirLibraryRule([${OBJS}])
 KRB_INCLUDE
 ISODE_INCLUDE
-AC_OUTPUT(Makefile,[EXTRA_RULES])
+V5_AC_OUTPUT_MAKEFILE
diff --git a/src/lib/krb5/keytab/configure.in b/src/lib/krb5/keytab/configure.in
index 4d25a76cf..ede7ee0a7 100644
--- a/src/lib/krb5/keytab/configure.in
+++ b/src/lib/krb5/keytab/configure.in
@@ -11,4 +11,4 @@ MAKE_SUBDIRS("making",all)
 MAKE_SUBDIRS("cleaning",clean)
 SubdirLibraryRule([$(OBJS)])
 KRB_INCLUDE
-AC_OUTPUT(Makefile,[EXTRA_RULES])
+V5_AC_OUTPUT_MAKEFILE
diff --git a/src/lib/krb5/keytab/file/configure.in b/src/lib/krb5/keytab/file/configure.in
index 634100934..4ef9516be 100644
--- a/src/lib/krb5/keytab/file/configure.in
+++ b/src/lib/krb5/keytab/file/configure.in
@@ -5,4 +5,4 @@ CONFIG_RULES
 ISODE_DEFS
 SubdirLibraryRule([${OBJS}])
 KRB_INCLUDE
-AC_OUTPUT(Makefile,[EXTRA_RULES])
+V5_AC_OUTPUT_MAKEFILE
diff --git a/src/lib/krb5/krb/configure.in b/src/lib/krb5/krb/configure.in
index beaf0041a..9af1e09cc 100644
--- a/src/lib/krb5/krb/configure.in
+++ b/src/lib/krb5/krb/configure.in
@@ -12,4 +12,4 @@ ISODE_INCLUDE
 AC_WITH([krb4],
 ADD_DEF(-DKRB5_KRB4_COMPAT),
 echo "warning: no krb4 support will be built into compat_recvauth")
-AC_OUTPUT(Makefile,[EXTRA_RULES])
+V5_AC_OUTPUT_MAKEFILE
diff --git a/src/lib/krb5/os/configure.in b/src/lib/krb5/os/configure.in
index 7ac4f5ec2..fa14918a3 100644
--- a/src/lib/krb5/os/configure.in
+++ b/src/lib/krb5/os/configure.in
@@ -11,4 +11,4 @@ AC_HEADER_EGREP(time_t, sys/types.h, AC_DEFINE(POSIX_TYPES))
 SubdirLibraryRule([${OBJS}])
 KRB_INCLUDE
 ISODE_INCLUDE
-AC_OUTPUT(Makefile,[EXTRA_RULES])
+V5_AC_OUTPUT_MAKEFILE
diff --git a/src/lib/krb5/posix/configure.in b/src/lib/krb5/posix/configure.in
index f1ee848b6..d4bd33436 100644
--- a/src/lib/krb5/posix/configure.in
+++ b/src/lib/krb5/posix/configure.in
@@ -9,4 +9,4 @@ AC_CONST
 AC_HEADER_CHECK(paths.h,AC_DEFINE(HAS_PATHS_H))
 AC_REPLACE_FUNCS(vfprintf vsprintf strdup strerror memmove daemon)
 AC_FUNC_CHECK(vsyslog, ,[LIBOBJS="[$]LIBOBJS syslog.o"])
-AC_OUTPUT(Makefile,[EXTRA_RULES])
+V5_AC_OUTPUT_MAKEFILE
diff --git a/src/lib/krb5/rcache/configure.in b/src/lib/krb5/rcache/configure.in
index 054fe2405..70598a5c0 100644
--- a/src/lib/krb5/rcache/configure.in
+++ b/src/lib/krb5/rcache/configure.in
@@ -6,4 +6,4 @@ ISODE_DEFS
 SubdirLibraryRule([${OBJS}])
 KRB_INCLUDE
 ISODE_INCLUDE
-AC_OUTPUT(Makefile,[EXTRA_RULES])
+V5_AC_OUTPUT_MAKEFILE