Merge configuration of kdc, krb524, and slave directories into top

level configure script.

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

11 files changed, 131 insertions, 116 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 5c5edcf..2ab311c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2004-03-05  Ken Raeburn  <raeburn@mit.edu>
+
+	* configure.in: Integrate config commands from kdc, krb524, and
+	slave directories.  Don't configure those directories; generate
+	their makefiles directly.  Use AC_HELP_STRING in AC_ARG_ENABLE
+	and AC_ARG_WITH messages.  Substitute @LIBUTIL@.
+
 2004-02-25  Ken Raeburn  <raeburn@mit.edu>
 
 	* configure.in: Configure lib/apputils, not util/apputils.
diff --git a/src/configure.in b/src/configure.in
index f2d3f7e..bb5e52d 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -20,9 +20,6 @@ dnl
 dnl The following lines are so that configure --help gives some global 
 dnl configuration options.
 dnl
-AC_ARG_ENABLE([kdc-replay-cache],
-AC_HELP_STRING([--enable-kdc-replay-cache],[check for replayed/retransmitted KDC requests (recommended for replay attack detection when hardware preauthentication is in use)])
-AC_HELP_STRING([--disable-kdc-replay-cache],[omit replay detection]))dnl
 KRB5_LIB_AUX
 AC_KRB5_TCL
 AC_ARG_ENABLE([athena],
@@ -49,6 +46,92 @@ AC_CHECK_FUNCS(memmove)
 KRB5_BUILD_LIBOBJS
 KRB5_BUILD_LIBRARY
 KRB5_BUILD_PROGRAM
+dnl for slave
+AC_TYPE_MODE_T
+AC_PROG_INSTALL
+KRB5_AC_NEED_DAEMON
+KRB5_GETSOCKNAME_ARGS
+KRB5_GETPEERNAME_ARGS
+LIBUTIL=
+AC_CHECK_LIB(util,main,[AC_DEFINE(HAVE_LIBUTIL)
+LIBUTIL=-lutil
+])
+AC_SUBST(LIBUTIL)
+dnl for kdc
+AC_CHECK_HEADERS(syslog.h stdarg.h sys/select.h sys/sockio.h ifaddrs.h unistd.h)
+AC_CHECK_FUNCS(openlog syslog closelog strftime vsprintf)
+KRB5_NEED_PROTO([#include <string.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+/* Solaris 8 declares swab in stdlib.h.  */
+#include <stdlib.h>
+],swab,1)
+dnl
+AC_PROG_AWK
+KRB5_AC_INET6
+KRB5_SOCKADDR_SA_LEN
+CHECK_SIGNALS
+dnl
+dnl --with-vague-errors disables useful error messages.
+dnl
+AC_ARG_WITH([vague-errors],
+AC_HELP_STRING([--with-vague-errors],[Do not supply helpful error messages to clients])
+AC_HELP_STRING([--without-vague-errors],[Supply helpful error messages to clients (default)]),
+,
+withval=no)dnl
+if test "$withval" = yes; then
+	AC_MSG_RESULT(Supplying vague error messages to KDC clients)
+	AC_DEFINE(KRBCONF_VAGUE_ERRORS)
+fi
+dnl
+dnl --with-kdc-kdb-update makes the KDC update the database with last request
+dnl information and failure information.
+dnl
+AC_ARG_WITH([kdc-kdb-update],
+AC_HELP_STRING([--with-kdc-kdb-update],[Update the database])
+AC_HELP_STRING([--without-kdc-kdb-update],[Do not update the database (default)]),
+,
+withval=no)dnl
+if test "$withval" = yes; then
+	AC_MSG_RESULT(Updating KDC database with each request)
+	AC_DEFINE(KRBCONF_KDC_MODIFIES_KDB)
+fi
+dnl
+dnl Needed for hw-preauth replay detection on KDC.
+dnl
+dnl USE_RCACHE enables the replay cache
+dnl NOCACHE disables the lookaside cache
+dnl
+dnl The lookaside cache is checked first; if *exactly* the same message
+dnl comes in twice, e.g., because the (legitimate) client resent it,
+dnl the previous response will be resent.  Otherwise, the replay cache
+dnl is used to check for attempts to fake out the KDC.  Some hardware
+dnl preauth methods are weak enough that we *really* want to have this
+dnl checking turned on.
+dnl
+AC_ARG_ENABLE([kdc-replay-cache],
+AC_HELP_STRING([--enable-kdc-replay-cache],[check for replayed/retransmitted KDC requests (recommended for replay attack detection when hardware preauthentication is in use)])
+AC_HELP_STRING([--disable-kdc-replay-cache],[omit replay detection]), , enableval=yes)dnl
+if test "$enableval" = yes ; then
+	AC_DEFINE(USE_RCACHE)
+else
+	AC_DEFINE(NOCACHE)
+fi
+AC_ARG_ENABLE([fakeka],
+AC_HELP_STRING([--enable-fakeka],[Enable the build of the Fake KA server (emulates an AFS kaserver)])
+AC_HELP_STRING([--disable-fakeka],[Do not build the fakeka server (default)]), , enableval=no)dnl
+if test "$enableval" = yes; then
+	FAKEKA=fakeka
+else
+	FAKEKA=
+fi
+AC_SUBST(FAKEKA)
+KRB5_RUN_FLAGS
+dnl
+dnl for krb524
+AC_TYPE_SIGNAL
+dnl
 dnl
 HOST_TYPE=$krb5_cv_host
 AC_SUBST(HOST_TYPE)
@@ -69,10 +152,10 @@ if test -n "$KRB4_LIB"; then
   AC_CONFIG_SUBDIRS(lib/krb4)
 fi
 AC_CONFIG_SUBDIRS(lib/kdb lib/gssapi lib/rpc lib/kadm5)
-if test -n "$KRB4_LIB"; then
-  AC_CONFIG_SUBDIRS(krb524)
-fi
+dnl if test -n "$KRB4_LIB"; then
+dnl   AC_CONFIG_SUBDIRS(krb524)
+dnl fi
 
-AC_CONFIG_SUBDIRS(kdc kadmin slave clients appl tests)
+AC_CONFIG_SUBDIRS(kadmin clients appl tests)
 AC_CONFIG_FILES(krb5-config, [chmod +x krb5-config])
-V5_AC_OUTPUT_MAKEFILE(. util util/send-pr lib config-files gen-manpages)
+V5_AC_OUTPUT_MAKEFILE(. util util/send-pr lib kdc slave krb524 config-files gen-manpages)
diff --git a/src/kdc/ChangeLog b/src/kdc/ChangeLog
index 0c631bc..96af4b1 100644
--- a/src/kdc/ChangeLog
+++ b/src/kdc/ChangeLog
@@ -1,3 +1,10 @@
+2004-03-05  Ken Raeburn  <raeburn@mit.edu>
+
+	* configure.in: Removed.  Directory configured from top level
+	now.
+	* Makefile.in (thisconfigdir, mydir): Updated.
+	(MY_SUBDIRS): Define to just ".".
+
 2004-03-04  Ken Raeburn  <raeburn@mit.edu>
 
 	* configure.in: Don't check for --enable-athena and don't define
diff --git a/src/kdc/Makefile.in b/src/kdc/Makefile.in
index d3079f6..d288b4f 100644
--- a/src/kdc/Makefile.in
+++ b/src/kdc/Makefile.in
@@ -1,6 +1,7 @@
-thisconfigdir=.
+thisconfigdir=..
 myfulldir=kdc
-mydir=.
+mydir=kdc
+MY_SUBDIRS=.
 BUILDTOP=$(REL)..
 # -DUSE_RCACHE - enable replay cache for KDC
 # -DNOCACHE    - disable lookaside cache, which is used to resend previous
diff --git a/src/kdc/configure.in b/src/kdc/configure.in
deleted file mode 100644
index 450a8e9..0000000
--- a/src/kdc/configure.in
+++ /dev/null
@@ -1,82 +0,0 @@
-AC_INIT(main.c)
-CONFIG_RULES
-AC_PROG_INSTALL
-AC_CHECK_HEADERS(syslog.h stdarg.h sys/select.h sys/sockio.h ifaddrs.h unistd.h)
-AC_CHECK_FUNCS(openlog syslog closelog strftime vsprintf)
-KRB5_NEED_PROTO([#include <string.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-/* Solaris 8 declares swab in stdlib.h.  */
-#include <stdlib.h>
-],swab,1)
-dnl
-KRB5_AC_NEED_DAEMON
-dnl
-AC_PROG_AWK
-KRB5_AC_INET6
-KRB5_SOCKADDR_SA_LEN
-CHECK_SIGNALS
-dnl
-dnl --with-vague-errors disables useful error messages.
-dnl
-AC_ARG_WITH([vague-errors],
-[  --with-vague-errors		Do not supply helpful error messages to clients
-  --without-vague-errors	Supply helpful error messages to clients (default)],
-,
-withval=no)dnl
-if test "$withval" = yes; then
-	AC_MSG_RESULT(Supplying vague error messages to KDC clients)
-	AC_DEFINE(KRBCONF_VAGUE_ERRORS)
-fi
-dnl
-dnl --with-kdc-kdb-update makes the KDC update the database with last request
-dnl information and failure information.
-dnl
-AC_ARG_WITH([kdc-kdb-update],
-[  --with-kdc-kdb-update	Update the database
-  --without-kdc-kdb-update	Do not update the database (default)],
-,
-withval=no)dnl
-if test "$withval" = yes; then
-	AC_MSG_RESULT(Updating KDC database with each request)
-	AC_DEFINE(KRBCONF_KDC_MODIFIES_KDB)
-fi
-dnl
-dnl Needed for hw-preauth replay detection on KDC.
-dnl
-dnl USE_RCACHE enables the replay cache
-dnl NOCACHE disables the lookaside cache
-dnl
-dnl The lookaside cache is checked first; if *exactly* the same message
-dnl comes in twice, e.g., because the (legitimate) client resent it,
-dnl the previous response will be resent.  Otherwise, the replay cache
-dnl is used to check for attempts to fake out the KDC.  Some hardware
-dnl preauth methods are weak enough that we *really* want to have this
-dnl checking turned on.
-dnl
-AC_ARG_ENABLE([kdc-replay-cache],
-[  --enable-kdc-replay-cache	check for replayed/retransmitted KDC requests
-				(recommended for replay attack detection
-				 when hardware preauthentication is in use)
-  --disable-kdc-replay-cache	omit replay detection], , enableval=yes)dnl
-if test "$enableval" = yes ; then
-	AC_DEFINE(USE_RCACHE)
-else
-	AC_DEFINE(NOCACHE)
-fi
-AC_ARG_ENABLE([fakeka],
-[  --enable-fakeka              Enable the build of the Fake KA server
-			       (emulates an AFS (kaserver)
-  --disable-fakeka             Do not build the fakeka server (default)], , enableval=no)dnl
-if test "$enableval" = yes; then
-	FAKEKA=fakeka
-else
-	FAKEKA=
-fi
-AC_SUBST(FAKEKA)
-dnl
-dnl
-KRB5_RUN_FLAGS
-KRB5_BUILD_PROGRAM
-V5_AC_OUTPUT_MAKEFILE
diff --git a/src/krb524/ChangeLog b/src/krb524/ChangeLog
index c53542e..0e621f2 100644
--- a/src/krb524/ChangeLog
+++ b/src/krb524/ChangeLog
@@ -1,3 +1,10 @@
+2004-03-05  Ken Raeburn  <raeburn@mit.edu>
+
+	* configure.in: Removed.  Directory configured from top level
+	now.
+	* Makefile.in (thisconfigdir, mydir): Updated.
+	(MY_SUBDIRS): Define to just ".".
+
 2004-03-04  Ken Raeburn  <raeburn@mit.edu>
 
 	* configure.in: Don't invoke macros for library build support.
diff --git a/src/krb524/Makefile.in b/src/krb524/Makefile.in
index 8dcd19d..3f17f89 100644
--- a/src/krb524/Makefile.in
+++ b/src/krb524/Makefile.in
@@ -1,6 +1,7 @@
-thisconfigdir=.
+thisconfigdir=..
 myfulldir=krb524
-mydir=.
+mydir=krb524
+MY_SUBDIRS=.
 BUILDTOP=$(REL)..
 # Copyright 1994 by OpenVision Technologies, Inc.
 # 
diff --git a/src/krb524/configure.in b/src/krb524/configure.in
deleted file mode 100644
index cd41cc5..0000000
--- a/src/krb524/configure.in
+++ /dev/null
@@ -1,8 +0,0 @@
-AC_INIT(krb524d.c)
-CONFIG_RULES
-AC_CHECK_HEADERS(sys/select.h unistd.h) dnl
-KRB5_AC_NEED_DAEMON
-AC_TYPE_SIGNAL
-
-KRB5_BUILD_PROGRAM
-V5_AC_OUTPUT_MAKEFILE
diff --git a/src/slave/ChangeLog b/src/slave/ChangeLog
index ef54539..41cae76 100644
--- a/src/slave/ChangeLog
+++ b/src/slave/ChangeLog
@@ -1,3 +1,11 @@
+2004-03-05  Ken Raeburn  <raeburn@mit.edu>
+
+	* configure.in: Removed.  Directory configured from top level
+	now.
+	* Makefile.in (thisconfigdir, mydir): Updated.
+	(MY_SUBDIRS): Define to just ".".
+	(kprop, kpropd): Link against @LIBUTIL@.
+
 2004-02-24  Ken Raeburn  <raeburn@mit.edu>
 
 	* Makefile.in (SERVEROBJS, kpropd): Link against apputils lib
diff --git a/src/slave/Makefile.in b/src/slave/Makefile.in
index 3ef6d56..1f97c8d 100644
--- a/src/slave/Makefile.in
+++ b/src/slave/Makefile.in
@@ -1,6 +1,7 @@
-thisconfigdir=.
+thisconfigdir=..
 myfulldir=slave
-mydir=.
+mydir=slave
+MY_SUBDIRS=.
 BUILDTOP=$(REL)..
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
@@ -17,10 +18,10 @@ SRCS= $(CLIENTSRCS) $(SERVERSRCS)
 
 
 kprop: $(CLIENTOBJS) $(KRB5_BASE_DEPLIBS)
-	$(CC_LINK) -o kprop $(CLIENTOBJS) $(KRB5_BASE_LIBS)
+	$(CC_LINK) -o kprop $(CLIENTOBJS) $(KRB5_BASE_LIBS) @LIBUTIL@
 
 kpropd: $(SERVEROBJS) $(KRB5_BASE_DEPLIBS) $(APPUTILS_DEPLIB)
-	$(CC_LINK) -o kpropd $(SERVEROBJS) $(KRB5_BASE_LIBS) $(APPUTILS_LIB)
+	$(CC_LINK) -o kpropd $(SERVEROBJS) $(KRB5_BASE_LIBS) $(APPUTILS_LIB) @LIBUTIL@
 
 install::
 	for f in kprop kpropd; do \
diff --git a/src/slave/configure.in b/src/slave/configure.in
deleted file mode 100644
index 1ce9f03..0000000
--- a/src/slave/configure.in
+++ /dev/null
@@ -1,10 +0,0 @@
-AC_INIT(kprop.c)
-CONFIG_RULES
-AC_TYPE_MODE_T
-AC_PROG_INSTALL
-AC_CHECK_LIB(util,main)
-KRB5_AC_NEED_DAEMON
-KRB5_GETSOCKNAME_ARGS
-KRB5_GETPEERNAME_ARGS
-KRB5_BUILD_PROGRAM
-V5_AC_OUTPUT_MAKEFILE