Mass makefile/configure.in build system revamp

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

33 files changed, 108 insertions, 34 deletions

diff --git a/src/kadmin/ChangeLog b/src/kadmin/ChangeLog
index 03f6619..ba0e305 100644
--- a/src/kadmin/ChangeLog
+++ b/src/kadmin/ChangeLog
@@ -1,3 +1,10 @@
+Mon Feb  2 17:02:29 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* configure.in: Use AC_CONFIG_DIRS instead of CONFIG_DIRS, and
+		remove use of DO_SUBDIRS.
+
+	* Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile
+
 Wed Nov 13 19:24:36 1996  Tom Yu  <tlyu@mit.edu>
 
 	* testing/Makefile.in (clean): Remove krb5-test-root.
diff --git a/src/kadmin/Makefile.in b/src/kadmin/Makefile.in
index 2f64b25..1043979 100644
--- a/src/kadmin/Makefile.in
+++ b/src/kadmin/Makefile.in
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)
 CFLAGS = $(CCOPTS)
 
 all::
diff --git a/src/kadmin/cli/ChangeLog b/src/kadmin/cli/ChangeLog
index 190267c..12ea411 100644
--- a/src/kadmin/cli/ChangeLog
+++ b/src/kadmin/cli/ChangeLog
@@ -1,3 +1,7 @@
+Mon Feb  2 17:02:29 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile
+
 Tue Oct  7 19:57:43 1997  Ezra Peisach  <epeisach@mit.edu>
 
 	* kadmin.c (quit): Call krb5_free_context.
diff --git a/src/kadmin/cli/Makefile.in b/src/kadmin/cli/Makefile.in
index 73a13f0..d46d607 100644
--- a/src/kadmin/cli/Makefile.in
+++ b/src/kadmin/cli/Makefile.in
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/kadmin/configure.in b/src/kadmin/configure.in
index 1a86a4e..be60003 100644
--- a/src/kadmin/configure.in
+++ b/src/kadmin/configure.in
@@ -5,6 +5,5 @@ v4server=""
 else
 v4server=v4server
 fi
-CONFIG_DIRS(cli dbutil passwd ktutil server $v4server v5passwdd testing)
-DO_SUBDIRS
+AC_CONFIG_SUBDIRS(cli dbutil passwd ktutil server $v4server v5passwdd testing)
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/kadmin/dbutil/ChangeLog b/src/kadmin/dbutil/ChangeLog
index 03bf5d9..8db80a9 100644
--- a/src/kadmin/dbutil/ChangeLog
+++ b/src/kadmin/dbutil/ChangeLog
@@ -1,3 +1,7 @@
+Mon Feb  2 17:02:29 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile
+
 Sun Nov  2 19:09:17 1997  Ezra Peisach  <epeisach@mit.edu>
 
 	* kdb5_util.c: Add flag indicating that policy db is to be closed.
diff --git a/src/kadmin/dbutil/Makefile.in b/src/kadmin/dbutil/Makefile.in
index 8938121..89420ee 100644
--- a/src/kadmin/dbutil/Makefile.in
+++ b/src/kadmin/dbutil/Makefile.in
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)
 CFLAGS = $(CCOPTS) $(DEFS) -DKDB4_DISABLE -I. $(LOCALINCLUDE) @KRB4_INCLUDES@ 
 PROG_LIBPATH=-L$(TOPLIBD) $(KRB4_LIBPATH)
 PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/kadmin/kdbkeys/ChangeLog b/src/kadmin/kdbkeys/ChangeLog
index 206aea9..b512e8a 100644
--- a/src/kadmin/kdbkeys/ChangeLog
+++ b/src/kadmin/kdbkeys/ChangeLog
@@ -1,3 +1,12 @@
+Thu Feb 12 10:24:16 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* configure.in: Removed obsolete macros: USE_KADMSRV_LIBRARY,n
+		USE_GSSRPC_LIBRARY, USE_DYN_LIBRARY, USE_KDB5_LIBRARY
+
+Mon Feb  2 17:02:29 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile
+
 Thu Jul 18 19:44:10 1996  Marc Horowitz  <marc@mit.edu>
 
 	* configure.in: removed ET_RULES, replaced with AC_PROG_AWK
diff --git a/src/kadmin/kdbkeys/Makefile.in b/src/kadmin/kdbkeys/Makefile.in
index 5672bd0..a5d1ea3 100644
--- a/src/kadmin/kdbkeys/Makefile.in
+++ b/src/kadmin/kdbkeys/Makefile.in
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
 
 PROG = kdbkeys
diff --git a/src/kadmin/kdbkeys/configure.in b/src/kadmin/kdbkeys/configure.in
index 6c027fc..fe426e8 100644
--- a/src/kadmin/kdbkeys/configure.in
+++ b/src/kadmin/kdbkeys/configure.in
@@ -2,10 +2,6 @@ AC_INIT(kdbkeys.c)
 CONFIG_RULES
 AC_PROG_INSTALL
 AC_PROG_AWK
-USE_KADMSRV_LIBRARY
-USE_GSSRPC_LIBRARY
-USE_DYN_LIBRARY
-USE_KDB5_LIBRARY
 KRB5_LIBRARIES
 V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/kadmin/ktutil/ChangeLog b/src/kadmin/ktutil/ChangeLog
index 5fb5d77..a716a7c 100644
--- a/src/kadmin/ktutil/ChangeLog
+++ b/src/kadmin/ktutil/ChangeLog
@@ -1,3 +1,7 @@
+Mon Feb  2 17:02:29 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile
+
 Tue Sep 30 18:58:09 1997  Tom Yu  <tlyu@mit.edu>
 
 	* ktutil.c: Replace HAS_STDLIB_H with something more sane.
diff --git a/src/kadmin/ktutil/Makefile.in b/src/kadmin/ktutil/Makefile.in
index d0be570..c592ff5 100644
--- a/src/kadmin/ktutil/Makefile.in
+++ b/src/kadmin/ktutil/Makefile.in
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)
 CFLAGS = $(CCOPTS) $(DEFS) $(KRB4_INCLUDES)
 PROG_LIBPATH=-L$(TOPLIBD) $(KRB4_LIBPATH)
 PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/kadmin/passwd/ChangeLog b/src/kadmin/passwd/ChangeLog
index 39d5d3b..85f7801 100644
--- a/src/kadmin/passwd/ChangeLog
+++ b/src/kadmin/passwd/ChangeLog
@@ -1,3 +1,14 @@
+Thu Feb 12 10:22:47 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* configure.in: Remove unused NetBSD kludge to prevent use of
+		USE_KDB5_LIBRARY, since these macros are obsolete.
+
+Mon Feb  2 17:02:29 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* configure.in: Removed use of DO_SUBDIRS.
+
+	* Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile
+
 Fri Jan 30 15:29:28 1998  Tom Yu  <tlyu@mit.edu>
 
 	* Makefile.in: Remove install rules.
diff --git a/src/kadmin/passwd/Makefile.in b/src/kadmin/passwd/Makefile.in
index c94b724..21758f5 100644
--- a/src/kadmin/passwd/Makefile.in
+++ b/src/kadmin/passwd/Makefile.in
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) -I. -DUSE_KADM5_API_VERSION=1
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/kadmin/passwd/configure.in b/src/kadmin/passwd/configure.in
index d47ea63..cd597bb 100644
--- a/src/kadmin/passwd/configure.in
+++ b/src/kadmin/passwd/configure.in
@@ -1,32 +1,7 @@
 AC_INIT(kpasswd.c)
 CONFIG_RULES
 AC_CONFIG_SUBDIRS(unit-test)
-DO_SUBDIRS
 AC_PROG_INSTALL
 AC_PROG_AWK
-
-dnl 
-dnl The following is a kludge to get around a shared library problem
-dnl for NetBSD and Linux.  We have to include -lkdb5 under Linux, and 
-dnl we can't include -lkdb5 under NetBSD, due to various breakages in
-dnl each system's shared library implementation
-dnl
-
-dnl commented out for now --tlyu
-dnl
-ifelse([AC_MSG_CHECKING([for build host])
-AC_CACHE_VAL(krb5_cv_host, [export CC
-AC_CANONICAL_HOST
-krb5_cv_host=$host])
-AC_MSG_RESULT($krb5_cv_host)
-case $krb5_cv_host in
-*-*-*bsd*)
-  echo "Skipping USE KDB5 LIBRARY on BSD to avoid libdb incompatibilites"
-  ;;
-*)
-  USE_KDB5_LIBRARY
-  ;;
-esac])
-
 KRB5_BUILD_PROGRAM
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/kadmin/passwd/unit-test/ChangeLog b/src/kadmin/passwd/unit-test/ChangeLog
new file mode 100644
index 0000000..ff54296
--- /dev/null
+++ b/src/kadmin/passwd/unit-test/ChangeLog
@@ -0,0 +1,4 @@
+Mon Feb  2 17:02:29 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile
+
diff --git a/src/kadmin/passwd/unit-test/Makefile.in b/src/kadmin/passwd/unit-test/Makefile.in
index 8ffc57f..a98d94a 100644
--- a/src/kadmin/passwd/unit-test/Makefile.in
+++ b/src/kadmin/passwd/unit-test/Makefile.in
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)$(U)
 check unit-test:: unit-test-@DO_TEST@
 
 unit-test-:
diff --git a/src/kadmin/server/ChangeLog b/src/kadmin/server/ChangeLog
index 7983723..a27bd4d 100644
--- a/src/kadmin/server/ChangeLog
+++ b/src/kadmin/server/ChangeLog
@@ -1,3 +1,7 @@
+Mon Feb  2 17:02:29 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile
+
 Wed Jan 21 00:00:34 1998  Tom Yu  <tlyu@mit.edu>
 
 	* schpw.c: New file.  Support for Cygnus chpw.
diff --git a/src/kadmin/server/Makefile.in b/src/kadmin/server/Makefile.in
index 9d552aa..0e743f0 100644
--- a/src/kadmin/server/Makefile.in
+++ b/src/kadmin/server/Makefile.in
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
 
 PROG_LIBPATH=-L$(TOPLIBD)
diff --git a/src/kadmin/testing/ChangeLog b/src/kadmin/testing/ChangeLog
new file mode 100644
index 0000000..40303f8
--- /dev/null
+++ b/src/kadmin/testing/ChangeLog
@@ -0,0 +1,7 @@
+Mon Feb  2 17:02:29 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* configure.in: Use AC_CONFIG_DIRS instead of CONFIG_DIRS, and
+		remove use of DO_SUBDIRS.
+
+	* Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile
+
diff --git a/src/kadmin/testing/Makefile.in b/src/kadmin/testing/Makefile.in
index 0b9d609..ae1002d 100644
--- a/src/kadmin/testing/Makefile.in
+++ b/src/kadmin/testing/Makefile.in
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)
 CFLAGS = $(CCOPTS)
 
 all::
diff --git a/src/kadmin/testing/configure.in b/src/kadmin/testing/configure.in
index d157c12..60dd52a 100644
--- a/src/kadmin/testing/configure.in
+++ b/src/kadmin/testing/configure.in
@@ -1,5 +1,4 @@
 AC_INIT(configure.in)
 CONFIG_RULES
-CONFIG_DIRS(scripts util)
-DO_SUBDIRS
+AC_CONFIG_SUBDIRS(scripts util)
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/kadmin/testing/scripts/ChangeLog b/src/kadmin/testing/scripts/ChangeLog
index c21053d..9133a4a 100644
--- a/src/kadmin/testing/scripts/ChangeLog
+++ b/src/kadmin/testing/scripts/ChangeLog
@@ -1,3 +1,7 @@
+Mon Feb  2 17:02:29 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile
+
 Sun Feb  9 01:07:37 1997  Tom Yu  <tlyu@mit.edu>
 
 	* env-setup.shin: Fix to deal with multiple variables in
diff --git a/src/kadmin/testing/scripts/Makefile.in b/src/kadmin/testing/scripts/Makefile.in
index 65e646d..fda52fe 100644
--- a/src/kadmin/testing/scripts/Makefile.in
+++ b/src/kadmin/testing/scripts/Makefile.in
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)$(U)
 PERL=@PERL@
 
 .SUFFIXES: .plin .pl
diff --git a/src/kadmin/testing/scripts/configure.in b/src/kadmin/testing/scripts/configure.in
index 84277a4..eda5f77 100644
--- a/src/kadmin/testing/scripts/configure.in
+++ b/src/kadmin/testing/scripts/configure.in
@@ -7,4 +7,7 @@ RBUILD=`pwd`/../../..
 AC_SUBST(RBUILD)
 dnl The following are substituted into env-setup.sh
 AC_SUBST(SRCTOP)
-V5_AC_OUTPUT_MAKEFILE( ,env-setup.sh:env-setup.shin)
+K5_GEN_MAKEFILE(.)
+K5_GEN_FILE(env-setup.sh:env-setup.shin)
+K5_OUTPUT_FILES
+
diff --git a/src/kadmin/testing/util/ChangeLog b/src/kadmin/testing/util/ChangeLog
index c5d3d4c..48b5e63 100644
--- a/src/kadmin/testing/util/ChangeLog
+++ b/src/kadmin/testing/util/ChangeLog
@@ -1,3 +1,7 @@
+Mon Feb  2 17:02:29 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile
+
 Wed Oct 22 15:40:34 1997  Ezra Peisach  <epeisach@dumpster.rose.brandeis.edu>
 
 	* test.c, tcl_ovsec_kadm.c, tcl_krb5_hash.c, tcl_kadm5.c: Include
diff --git a/src/kadmin/testing/util/Makefile.in b/src/kadmin/testing/util/Makefile.in
index 6c6cf63..233fd8b 100644
--- a/src/kadmin/testing/util/Makefile.in
+++ b/src/kadmin/testing/util/Makefile.in
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)$(U)
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) $(TCL_INCLUDES)
 
 PROG_LIBPATH=-L$(TOPLIBD) $(TCL_LIBPATH)
diff --git a/src/kadmin/v4server/ChangeLog b/src/kadmin/v4server/ChangeLog
index a4453ca..02b4088 100644
--- a/src/kadmin/v4server/ChangeLog
+++ b/src/kadmin/v4server/ChangeLog
@@ -1,3 +1,7 @@
+Mon Feb  2 17:02:29 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile
+
 Thu Oct 23 13:07:01 1997  Ezra Peisach  <epeisach@mit.edu>
 
 	* kadm_server.h: Declare kadm_context as extern so it will not be
diff --git a/src/kadmin/v4server/Makefile.in b/src/kadmin/v4server/Makefile.in
index 395d92e..2a3106e 100644
--- a/src/kadmin/v4server/Makefile.in
+++ b/src/kadmin/v4server/Makefile.in
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) \
 	-DKADM5 -DNEED_SOCKETS @HESIOD_DEFS@
 PROG_LIBPATH=-L$(TOPLIBD) $(KRB4_LIBPATH)
diff --git a/src/kadmin/v4server/unit-test/ChangeLog b/src/kadmin/v4server/unit-test/ChangeLog
index b489175..5c678cf 100644
--- a/src/kadmin/v4server/unit-test/ChangeLog
+++ b/src/kadmin/v4server/unit-test/ChangeLog
@@ -1,3 +1,7 @@
+Mon Feb  2 17:02:29 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile
+
 Sat Feb 22 15:12:17 1997  Ezra Peisach  <epeisach@mit.edu>
 
 	* configure.in: Do not run test suite unless Athena compatibility
diff --git a/src/kadmin/v4server/unit-test/Makefile.in b/src/kadmin/v4server/unit-test/Makefile.in
index dbb2454..360ad35 100644
--- a/src/kadmin/v4server/unit-test/Makefile.in
+++ b/src/kadmin/v4server/unit-test/Makefile.in
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)$(U)
 #
 # $Id$
 #
diff --git a/src/kadmin/v5passwdd/ChangeLog b/src/kadmin/v5passwdd/ChangeLog
index aa65ef1..c8ad938 100644
--- a/src/kadmin/v5passwdd/ChangeLog
+++ b/src/kadmin/v5passwdd/ChangeLog
@@ -1,3 +1,7 @@
+Mon Feb  2 17:02:29 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile
+
 Thu Sep 25 21:17:00 1997  Tom Yu  <tlyu@mit.edu>
 
 	* srv_net.c (net_init): Replace KRB5_USE_INET with something more
diff --git a/src/kadmin/v5passwdd/Makefile.in b/src/kadmin/v5passwdd/Makefile.in
index 9d9a975..10f80a0 100644
--- a/src/kadmin/v5passwdd/Makefile.in
+++ b/src/kadmin/v5passwdd/Makefile.in
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)