Makefile.in, configure.in: Move the responsibility for generating

	Makefile files for the following subdirectories to the top-level:
	util, util/send-pr, util/dyn, lib, config-files, and gen-manpages.

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 4d4de6b5ddd8c2a4bac4083ed3154d0273c8b556..27723340a3c66048a3cba063685f5276c7a7232c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+1999-01-27  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * Makefile.in, configure.in: Move the responsibility for
+               generating Makefile files for the following subdirectories
+               to the top-level: util, util/send-pr, util/dyn, lib,
+               config-files, and gen-manpages.  
+
 1999-01-26  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
        * wconfig.c: Updated to be more featureful.  It will now save the

diff --git a/src/Makefile.in b/src/Makefile.in
index 99f3d00a10dcc42fd3278cc9615c00205b66b367..9c5acc20c4fc4eaacfd0e611857ec7a5cce9aff4 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,4 +1,8 @@
 thisconfigdir=.
+myfulldir=.
+mydir=.
+MY_SUBDIRS=util include lib @krb524@ kdc kadmin slave clients appl tests \
+       config-files gen-manpages
 BUILDTOP=$(REL)$(C)
 CFLAGS = $(CCOPTS) $(DEFS)
 
@@ -123,7 +127,7 @@ config-windows:: makefile-windows
 
 ##DOS##MKFDEP= wconfig.exe config\pre.in config\post.in \
 ##DOS##        config\windows.in config\win-post.in
-##DOS##WCONFIG= .\wconfig $(WFLAGS)
+##DOS##WCONFIG= .\wconfig $(WCONFIG_FLAGS)
 
 ##DOS##makefile-windows:: $(MKFDEP) makefile \
 ##DOS##                clients\makefile clients\kdestroy\makefile \

diff --git a/src/config-files/ChangeLog b/src/config-files/ChangeLog
index 12b0a815795995813e0da44d7cc8c5b722db91ba..467ba6b196ecc804ce246711154ee77cf61b9126 100644 (file)
--- a/src/config-files/ChangeLog
+++ b/src/config-files/ChangeLog
@@ -1,3 +1,10 @@
+1999-01-27  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * Makefile.in, configure.in: Move the responsibility for
+               generating the Makefile in this directory to the top-level
+               configure script.  The local configure.in script has been
+               deleted.
+
 Wed Feb 18 15:45:44 1998  Tom Yu  <tlyu@mit.edu>
 
        * Makefile.in: Remove trailing slash from thisconfigdir.

diff --git a/src/config-files/Makefile.in b/src/config-files/Makefile.in
index 320cd565ffa5d4865160326f71f9eebe89f74dd5..52014642f3af0171c7d29624f26c67334bb0ac4f 100644 (file)
--- a/src/config-files/Makefile.in
+++ b/src/config-files/Makefile.in
@@ -1,4 +1,7 @@
-thisconfigdir=.
+thisconfigdir=./..
+myfulldir=config-files
+mydir=config-files
+MY_SUBDIRS=.
 BUILDTOP=$(REL)$(U)
 all::
 

diff --git a/src/config-files/configure.in b/src/config-files/configure.in
deleted file mode 100644 (file)
index f9dafe7..0000000
--- a/src/config-files/configure.in
+++ /dev/null
@@ -1,4 +0,0 @@
-AC_INIT(configure.in)
-CONFIG_RULES
-AC_PROG_INSTALL
-V5_AC_OUTPUT_MAKEFILE

diff --git a/src/configure.in b/src/configure.in
index c7be4dbd3967a3e98c9001f3f39a2e4fb0c093d6..d82da8b6294ee621f8a4a1e89537d95e42b10fea 100644 (file)
--- a/src/configure.in
+++ b/src/configure.in
@@ -1,4 +1,4 @@
-AC_INIT(configure.in)
+AC_INIT(aclocal.m4)
 CONFIG_RULES
 dnl
 dnl
@@ -18,6 +18,9 @@ AC_CACHE_VAL(krb5_cv_host, [export CC
 AC_CANONICAL_HOST
 krb5_cv_host=$host])
 AC_MSG_RESULT($krb5_cv_host)
+dnl
+dnl Do the shared library grot....
+dnl
 AC_ARG_ENABLE([shared],
 [  --enable-shared         build shared libraries],[
 case $krb5_cv_host in
@@ -241,6 +244,7 @@ krb5_cv_shlibs_tail_comp=
 krb5_cv_staticlibs_enabled=yes
 krb5_cv_shlibs_enabled=])
 ])
+dnl
 dnl The following lines are so that configure --help gives some global 
 dnl configuration options.
 KRB5_LIB_AUX
@@ -251,12 +255,47 @@ dnl
 if test -z "$KRB4_LIB"; then
 kadminv4=""
 krb524=""
+libkrb4=""
+KRB4=""
 else
 kadminv4=kadmin.v4
 krb524=krb524
+libkrb4=lib/krb4
+KRB4=krb4
 fi
+AC_SUBST(KRB4)
+AC_SUBST(krb524)
+dnl
+dnl Begin autoconf tests for the Makefiles generated out of the top-level
+dnl configure.in...
+dnl
+AC_PROG_INSTALL
+AC_PROG_ARCHIVE
+AC_PROG_ARCHIVE_ADD
+AC_PROG_RANLIB
+AC_CHECK_FUNCS(memmove)
+KRB5_BUILD_LIBOBJS
+KRB5_BUILD_LIBRARY
+dnl
+dnl For util/makeshlib.  (Is SHLIB_TAIL_COMP still necessary?!?)
+dnl
+if test $krb5_cv_prog_gcc = yes ; then
+     HAVE_GCC=yes
+     else HAVE_GCC=
+fi
+AC_SUBST(HAVE_GCC)
+HOST_TYPE=$krb5_cv_host
+AC_SUBST(HOST_TYPE)
+SHLIB_TAIL_COMP=$krb5_cv_shlibs_tail_comp
+AC_SUBST(SHLIB_TAIL_COMP)
+dnl
 dnl
-AC_CONFIG_SUBDIRS(util include lib $krb524 kdc kadmin slave clients appl tests config-files gen-manpages)
-dnl $kadminv4 removed from the above
-dnl AC_OUTPUT(Makefile,[EXTRA_RULES])
-V5_AC_OUTPUT_MAKEFILE
+AC_CONFIG_SUBDIRS(util/et util/ss util/profile util/pty util/db2 include lib/libcrypto lib/krb5 lib/des425 $libkrb4 lib/krb5util lib/kdb lib/gssapi lib/rpc lib/kadm5 $krb524 kdc kadmin slave clients appl tests)
+K5_GEN_MAKEFILE(.)
+K5_GEN_MAKEFILE(util)
+K5_GEN_MAKEFILE(util/send-pr)
+K5_GEN_MAKEFILE(util/dyn, lib libobj)
+K5_GEN_MAKEFILE(lib)
+K5_GEN_MAKEFILE(config-files)
+K5_GEN_MAKEFILE(gen-manpages)
+K5_AC_OUTPUT

diff --git a/src/gen-manpages/ChangeLog b/src/gen-manpages/ChangeLog
index 4c66919afb2db0eae1b085e8e0b2bfac477d1f1c..48798e89b3881e0f075f2b7317fb1f6c997d3133 100644 (file)
--- a/src/gen-manpages/ChangeLog
+++ b/src/gen-manpages/ChangeLog
@@ -1,3 +1,10 @@
+1999-01-27  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * Makefile.in, configure.in: Move the responsibility for
+               generating the Makefile in this directory to the top-level
+               configure script.  The local configure.in script has been
+               deleted.
+
 Wed Feb 18 15:46:07 1998  Tom Yu  <tlyu@mit.edu>
 
        * Makefile.in (thisconfigdir): Remove trialing slash.

diff --git a/src/gen-manpages/Makefile.in b/src/gen-manpages/Makefile.in
index ea5464eb7296162238d9a96012aaee1247468ad4..2e618ec3023b2dd357f0dbaf16c32dc8c8c2fb75 100644 (file)
--- a/src/gen-manpages/Makefile.in
+++ b/src/gen-manpages/Makefile.in
@@ -1,4 +1,7 @@
-thisconfigdir=.
+thisconfigdir=./..
+myfulldir=gen-manpages
+mydir=gen-manpages
+MY_SUBDIRS=.
 BUILDTOP=$(REL)$(U)
 all::
 

diff --git a/src/gen-manpages/configure.in b/src/gen-manpages/configure.in
deleted file mode 100644 (file)
index f9dafe7..0000000
--- a/src/gen-manpages/configure.in
+++ /dev/null
@@ -1,4 +0,0 @@
-AC_INIT(configure.in)
-CONFIG_RULES
-AC_PROG_INSTALL
-V5_AC_OUTPUT_MAKEFILE

diff --git a/src/lib/ChangeLog b/src/lib/ChangeLog
index 1f42128b470c305f789c96da28ecec8147253c35..7def7097ecba9e282e6c7d32e4a846d1e9180bf9 100644 (file)
--- a/src/lib/ChangeLog
+++ b/src/lib/ChangeLog
@@ -1,3 +1,10 @@
+1999-01-27  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * Makefile.in, configure.in: Move the responsibility for
+               generating the Makefile in this directory to the top-level
+               configure script.  The local configure.in script has been
+               deleted.
+
 Sat Dec  5 01:11:00 1998  Theodore Y. Ts'o  <tytso@mit.edu>
 
        * krb5_32.def: Fixed exports file to reflect new crypto library

diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
index e2a26139c8bc950ea85f0e9f39669e9f433c245b..cd0e13c076ced347910af5eccb14bba0b28e5428 100644 (file)
--- a/src/lib/Makefile.in
+++ b/src/lib/Makefile.in
@@ -1,4 +1,7 @@
-thisconfigdir=.
+thisconfigdir=./..
+myfulldir=lib
+mydir=lib
+MY_SUBDIRS=crypto krb5 des425 @KRB4@ krb5util kdb gssapi rpc kadm5
 BUILDTOP=$(REL)$(U)
 CFLAGS = $(CCOPTS) $(DEFS)
 

diff --git a/src/lib/configure.in b/src/lib/configure.in
deleted file mode 100644 (file)
index 3b36dd1..0000000
--- a/src/lib/configure.in
+++ /dev/null
@@ -1,13 +0,0 @@
-AC_INIT(configure.in)
-CONFIG_RULES
-if test $krb5_cv_build_krb4_libs = yes ; then
-       AC_MSG_RESULT(building Kerberos 4 libraries)
-       krb4=krb4
-else
-       AC_MSG_RESULT(skipping Kerberos 4 libraries)
-       krb4=
-fi
-AC_CONFIG_SUBDIRS(crypto krb5 des425 $krb4 krb5util kdb gssapi rpc kadm5)
-AC_PROG_ARCHIVE
-AC_PROG_RANLIB
-V5_AC_OUTPUT_MAKEFILE

diff --git a/src/util/ChangeLog b/src/util/ChangeLog
index d9eab6f9ae218a422f665e06340dc4904e777b45..0dd9117f3027d5c1607fc4fcde59dbbc173dbc21 100644 (file)
--- a/src/util/ChangeLog
+++ b/src/util/ChangeLog
@@ -1,3 +1,10 @@
+1999-01-27  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * Makefile.in, configure.in: Move the responsibility for
+               generating the Makefile in this directory to the top-level
+               configure script.  The local configure.in script has been
+               deleted.
+
 Thu Sep 24 20:05:33 1998  Tom Yu  <tlyu@mit.edu>
 
        * mkrel: Add fixes to deal with "tails" on release directories,

diff --git a/src/util/Makefile.in b/src/util/Makefile.in
index 5d900c710e2e360aaf138dbb1f8e5ca95470f139..9777d7972ba837fe4cd855c4e2c7f56cb2c6f93f 100644 (file)
--- a/src/util/Makefile.in
+++ b/src/util/Makefile.in
@@ -1,4 +1,7 @@
-thisconfigdir=.
+thisconfigdir=./..
+myfulldir=util
+mydir=util
+MY_SUBDIRS=et ss profile pty dyn db2 send-pr
 BUILDTOP=$(REL)$(U)
 CFLAGS = $(CCOPTS)
 

diff --git a/src/util/configure.in b/src/util/configure.in
deleted file mode 100644 (file)
index ba97bdc..0000000
--- a/src/util/configure.in
+++ /dev/null
@@ -1,17 +0,0 @@
-AC_INIT(configure.in)
-CONFIG_RULES
-AC_PROG_ARCHIVE
-AC_PROG_ARCHIVE_ADD
-if test $krb5_cv_prog_gcc = yes ; then
-     HAVE_GCC=yes
-     else HAVE_GCC=
-fi
-
-AC_SUBST(HAVE_GCC)
-HOST_TYPE=$krb5_cv_host
-AC_SUBST(HOST_TYPE)
-SHLIB_TAIL_COMP=$krb5_cv_shlibs_tail_comp
-AC_SUBST(SHLIB_TAIL_COMP)
-
-AC_CONFIG_SUBDIRS(et ss profile pty dyn db2 send-pr)
-V5_AC_OUTPUT_MAKEFILE

diff --git a/src/util/dyn/ChangeLog b/src/util/dyn/ChangeLog
index 49a61fcbf2b6edb6dd997ea98949f7e0ab491d57..d5102d5a5f6e22877b5d99e69f1eec9624dfaa10 100644 (file)
--- a/src/util/dyn/ChangeLog
+++ b/src/util/dyn/ChangeLog
@@ -1,3 +1,10 @@
+1999-01-27  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * Makefile.in, configure.in: Move the responsibility for
+               generating the Makefile in this directory to the top-level
+               configure script.  The local configure.in script has been
+               deleted.
+
 Wed Feb 18 16:32:41 1998  Tom Yu  <tlyu@mit.edu>
 
        * Makefile.in: Remove trailing slash from thisconfigdir.  Fix up

diff --git a/src/util/dyn/Makefile.in b/src/util/dyn/Makefile.in
index 59b97394a308dd08fd7503e8d23904a12a319a78..00315e3719376a3e90e6598eef6d7cc0d86aeebb 100644 (file)
--- a/src/util/dyn/Makefile.in
+++ b/src/util/dyn/Makefile.in
@@ -1,4 +1,7 @@
-thisconfigdir=.
+thisconfigdir=./../..
+myfulldir=util/dyn
+mydir=util/dyn
+MY_SUBDIRS=.
 BUILDTOP=$(REL)$(U)$(S)$(U)
 RELDIR=../util/dyn
 CFLAGS = $(CCOPTS) $(DEFS)

diff --git a/src/util/dyn/configure.in b/src/util/dyn/configure.in
deleted file mode 100644 (file)
index 7b4770c..0000000
--- a/src/util/dyn/configure.in
+++ /dev/null
@@ -1,10 +0,0 @@
-AC_INIT(dyn.h)
-CONFIG_RULES
-AC_PROG_ARCHIVE
-AC_PROG_ARCHIVE_ADD
-AC_PROG_RANLIB
-AC_PROG_INSTALL
-AC_CHECK_FUNCS(memmove)
-KRB5_BUILD_LIBOBJS
-KRB5_BUILD_LIBRARY
-V5_AC_OUTPUT_MAKEFILE

diff --git a/src/util/send-pr/ChangeLog b/src/util/send-pr/ChangeLog
new file mode 100644 (file)
index 0000000..066fea2
--- /dev/null
+++ b/src/util/send-pr/ChangeLog
@@ -0,0 +1,7 @@
+1999-01-27  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * Makefile.in, configure.in: Move the responsibility for
+               generating the Makefile in this directory to the top-level
+               configure script.  The local configure.in script has been
+               deleted.
+

diff --git a/src/util/send-pr/Makefile.in b/src/util/send-pr/Makefile.in
index 5a74290e2b4d1781b9cca5424f9c554eaf93bf09..bafa04504558ba2ec43578ff4c067b54084cbfee 100644 (file)
--- a/src/util/send-pr/Makefile.in
+++ b/src/util/send-pr/Makefile.in
@@ -1,4 +1,7 @@
-thisconfigdir=.
+thisconfigdir=./../..
+myfulldir=util/send-pr
+mydir=util/send-pr
+MY_SUBDIRS=.
 BUILDTOP=$(REL)$(U)$(S)$(U)
 #
 # Makefile for building a standalone send-pr.

diff --git a/src/util/send-pr/configure.in b/src/util/send-pr/configure.in
deleted file mode 100644 (file)
index 58a989c..0000000
--- a/src/util/send-pr/configure.in
+++ /dev/null
@@ -1,6 +0,0 @@
-AC_INIT(configure.in)
-CONFIG_RULES
-
-
-
-V5_AC_OUTPUT_MAKEFILE