Collapse configure.in files below lib/crypto into lib/crypto

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

diff --git a/src/lib/crypto/ChangeLog b/src/lib/crypto/ChangeLog
index ebc03cb36db4a47982853ad6fe5d71252d10294e..1c3f445063ba6cec27840d3d8ea1162691b895e4 100644 (file)
--- a/src/lib/crypto/ChangeLog
+++ b/src/lib/crypto/ChangeLog
@@ -1,3 +1,12 @@
+Fri Feb 13 15:19:37 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * Makefile.in: Define LOCAL_SUBDIRS to recurse into the
+               subdirectories (crc32, md5, os, etc.)
+
+       * configure.in: Create the makefiles for all of the subdirectories
+               and move all of the configure.in tests from the
+               subdirectories into this configure.in.
+       
 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

diff --git a/src/lib/crypto/Makefile.in b/src/lib/crypto/Makefile.in
index 3e1eaba8cd543836f06eb8ba388750a90f2ae861..c81599407ce1c90e926f3915245e015a8147d878 100644 (file)
--- a/src/lib/crypto/Makefile.in
+++ b/src/lib/crypto/Makefile.in
@@ -1,5 +1,6 @@
 thisconfigdir=./
 BUILDTOP=$(U)$(U)
+LOCAL_SUBDIRS=des crc32 md4 md5 sha os
 CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)/crc32 -I$(srcdir)/des -I$(srcdir)/md4 -I$(srcdir)/md5 -I$(srcdir)/sha
 
 ##DOSBUILDTOP = ..\..

diff --git a/src/lib/crypto/configure.in b/src/lib/crypto/configure.in
index ba9300cd9f21c5cf675e183880921ace6d60e941..19688e35e6412bd3da9bf5735d382cdbdb317402 100644 (file)
--- a/src/lib/crypto/configure.in
+++ b/src/lib/crypto/configure.in
@@ -1,6 +1,5 @@
 AC_INIT(configure.in)
 CONFIG_RULES
-AC_CONFIG_SUBDIRS(des crc32 md4 md5 sha os)
 AC_PROG_ARCHIVE
 AC_PROG_ARCHIVE_ADD
 AC_PROG_RANLIB
@@ -119,6 +118,22 @@ dnl else
 dnl    AC_MSG_RESULT(Disabling NIST_SHA)
 dnl fi
 
+AC_REPLACE_FUNCS(memmove)
+AC_HAVE_FUNCS(srand48 srand srandom getpid)
+AC_CHECK_HEADERS(sys/types.h)
+AC_PROG_LN_S
+KRB5_SOCKADDR_SA_LEN
+
+KRB5_RUN_FLAGS
 KRB5_BUILD_LIBOBJS
 KRB5_BUILD_LIBRARY
-V5_AC_OUTPUT_MAKEFILE
+KRB5_BUILD_PROGRAM
+
+K5_GEN_MAKEFILE(., lib libobj)
+K5_GEN_MAKEFILE(crc32, libobj)
+K5_GEN_MAKEFILE(des, libobj)
+K5_GEN_MAKEFILE(md4, libobj)
+K5_GEN_MAKEFILE(md5, libobj)
+K5_GEN_MAKEFILE(os, libobj)
+K5_GEN_MAKEFILE(sha, libobj)
+K5_AC_OUTPUT

diff --git a/src/lib/crypto/crc32/ChangeLog b/src/lib/crypto/crc32/ChangeLog
index 55707c38044271ca200e60a5d12e82934c5f7eee..0612a82a515c90334e54d46b071e70bd4a50a14e 100644 (file)
--- a/src/lib/crypto/crc32/ChangeLog
+++ b/src/lib/crypto/crc32/ChangeLog
@@ -1,3 +1,9 @@
+Fri Feb 13 15:20:54 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * Makefile.in (thisconfigdir), configure.in: Point the
+               configuration directory at our parent, and remove our
+               local configure.in
+
 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/lib/crypto/crc32/Makefile.in b/src/lib/crypto/crc32/Makefile.in
index 02379bee52d1604a2fcfd17b1999d8e9e0317c68..f13b38de312e81311755a5472b0bfef122bbb57e 100644 (file)
--- a/src/lib/crypto/crc32/Makefile.in
+++ b/src/lib/crypto/crc32/Makefile.in
@@ -1,4 +1,4 @@
-thisconfigdir=./
+thisconfigdir=./../
 BUILDTOP=$(U)$(U)$(U)
 CFLAGS = $(CCOPTS) $(DEFS)
 

diff --git a/src/lib/crypto/crc32/configure.in b/src/lib/crypto/crc32/configure.in
deleted file mode 100644 (file)
index 106deb0..0000000
--- a/src/lib/crypto/crc32/configure.in
+++ /dev/null
@@ -1,4 +0,0 @@
-AC_INIT(configure.in)
-CONFIG_RULES
-KRB5_BUILD_LIBOBJS
-V5_AC_OUTPUT_MAKEFILE

diff --git a/src/lib/crypto/des/ChangeLog b/src/lib/crypto/des/ChangeLog
index 848b01264b6d95521b7c4bb4e3398e7aa2e9e1e8..96a5999e4b90f4d6dee7f00708d5ef5469008e85 100644 (file)
--- a/src/lib/crypto/des/ChangeLog
+++ b/src/lib/crypto/des/ChangeLog
@@ -1,3 +1,9 @@
+Fri Feb 13 15:20:54 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * Makefile.in (thisconfigdir), configure.in: Point the
+               configuration directory at our parent, and remove our
+               local configure.in
+
 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/lib/crypto/des/Makefile.in b/src/lib/crypto/des/Makefile.in
index 3c7df6460729c8855a6edc5838ec31be1057968f..3bfff79a73e24708b6c1423e2342f06ff1f32fa1 100644 (file)
--- a/src/lib/crypto/des/Makefile.in
+++ b/src/lib/crypto/des/Makefile.in
@@ -1,4 +1,4 @@
-thisconfigdir=./
+thisconfigdir=./../
 BUILDTOP=$(U)$(U)$(U)
 CFLAGS = $(CCOPTS) $(DEFS)
 

diff --git a/src/lib/crypto/des/configure.in b/src/lib/crypto/des/configure.in
deleted file mode 100644 (file)
index 20cc437..0000000
--- a/src/lib/crypto/des/configure.in
+++ /dev/null
@@ -1,6 +0,0 @@
-AC_INIT(configure.in)
-CONFIG_RULES
-KRB5_RUN_FLAGS
-KRB5_BUILD_LIBOBJS
-KRB5_BUILD_PROGRAM
-V5_AC_OUTPUT_MAKEFILE

diff --git a/src/lib/crypto/md4/ChangeLog b/src/lib/crypto/md4/ChangeLog
index 8ee89d5c5b52f9d1fc3e5d79ca3e2599be3346e5..a02ce01eeb4ba46f2bffd00b2959670798daf3ee 100644 (file)
--- a/src/lib/crypto/md4/ChangeLog
+++ b/src/lib/crypto/md4/ChangeLog
@@ -1,3 +1,9 @@
+Fri Feb 13 15:20:54 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * Makefile.in (thisconfigdir), configure.in: Point the
+               configuration directory at our parent, and remove our
+               local configure.in
+
 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/lib/crypto/md4/Makefile.in b/src/lib/crypto/md4/Makefile.in
index 9c6cb96acb15bfd78e7c88eafd7286c831de9f31..4525a6d7009a6c7f45dbdbf7ec3331e2cd3c5d4d 100644 (file)
--- a/src/lib/crypto/md4/Makefile.in
+++ b/src/lib/crypto/md4/Makefile.in
@@ -1,4 +1,4 @@
-thisconfigdir=./
+thisconfigdir=./../
 BUILDTOP=$(U)$(U)$(U)
 # -I$(srcdir) is needed to pull in $(srcdir)/rsa-md4.h for ./t_mddriver.c.
 CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)/../des -I"$(srcdir)"

diff --git a/src/lib/crypto/md4/configure.in b/src/lib/crypto/md4/configure.in
deleted file mode 100644 (file)
index e4941ce..0000000
--- a/src/lib/crypto/md4/configure.in
+++ /dev/null
@@ -1,5 +0,0 @@
-AC_INIT(configure.in)
-CONFIG_RULES
-KRB5_RUN_FLAGS
-KRB5_BUILD_LIBOBJS
-V5_AC_OUTPUT_MAKEFILE

diff --git a/src/lib/crypto/md5/ChangeLog b/src/lib/crypto/md5/ChangeLog
index 8955638a26bcc241a617510b02f949c507e4999c..5970e4ca5149da410dde20c769bdaec61e88615d 100644 (file)
--- a/src/lib/crypto/md5/ChangeLog
+++ b/src/lib/crypto/md5/ChangeLog
@@ -1,3 +1,9 @@
+Fri Feb 13 15:20:54 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * Makefile.in (thisconfigdir), configure.in: Point the
+               configuration directory at our parent, and remove our
+               local configure.in
+
 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/lib/crypto/md5/Makefile.in b/src/lib/crypto/md5/Makefile.in
index 267f3ca73090c4a2263950e43d02fea729543cc7..74f4d45f7cdf3ea77c6479310739e0e60f0a1b29 100644 (file)
--- a/src/lib/crypto/md5/Makefile.in
+++ b/src/lib/crypto/md5/Makefile.in
@@ -1,4 +1,4 @@
-thisconfigdir=./
+thisconfigdir=./../
 BUILDTOP=$(U)$(U)$(U)
 CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)/../des
 

diff --git a/src/lib/crypto/md5/configure.in b/src/lib/crypto/md5/configure.in
deleted file mode 100644 (file)
index e4941ce..0000000
--- a/src/lib/crypto/md5/configure.in
+++ /dev/null
@@ -1,5 +0,0 @@
-AC_INIT(configure.in)
-CONFIG_RULES
-KRB5_RUN_FLAGS
-KRB5_BUILD_LIBOBJS
-V5_AC_OUTPUT_MAKEFILE

diff --git a/src/lib/crypto/os/ChangeLog b/src/lib/crypto/os/ChangeLog
index 94d840ae14196e00d2184e1d6ca0658b85744a76..0c2add83f4d56f0a570bf71c1bca2f1b03be2f34 100644 (file)
--- a/src/lib/crypto/os/ChangeLog
+++ b/src/lib/crypto/os/ChangeLog
@@ -1,3 +1,9 @@
+Fri Feb 13 15:20:54 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * Makefile.in (thisconfigdir), configure.in: Point the
+               configuration directory at our parent, and remove our
+               local configure.in
+
 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/lib/crypto/os/Makefile.in b/src/lib/crypto/os/Makefile.in
index 39da75a864486351e9fd457ec920c64ea9432ea7..5e086a1cb04a8b569a486039c323ead00af5a6ad 100644 (file)
--- a/src/lib/crypto/os/Makefile.in
+++ b/src/lib/crypto/os/Makefile.in
@@ -1,4 +1,4 @@
-thisconfigdir=./
+thisconfigdir=./../
 BUILDTOP=$(U)$(U)$(U)
 CFLAGS = $(CCOPTS) $(DEFS)
 

diff --git a/src/lib/crypto/os/configure.in b/src/lib/crypto/os/configure.in
deleted file mode 100644 (file)
index 7b8fcac..0000000
--- a/src/lib/crypto/os/configure.in
+++ /dev/null
@@ -1,8 +0,0 @@
-AC_INIT(configure.in)
-CONFIG_RULES
-AC_REPLACE_FUNCS(memmove)
-AC_HAVE_FUNCS(srand48 srand srandom getpid)
-AC_PROG_LN_S
-KRB5_SOCKADDR_SA_LEN
-KRB5_BUILD_LIBOBJS
-V5_AC_OUTPUT_MAKEFILE

diff --git a/src/lib/crypto/sha/ChangeLog b/src/lib/crypto/sha/ChangeLog
index d80dbcc9d24aa589db77ac25a10d6e5bc1aeb209..4ca6216a466c01a5b620d99602b006d73d5f4771 100644 (file)
--- a/src/lib/crypto/sha/ChangeLog
+++ b/src/lib/crypto/sha/ChangeLog
@@ -1,3 +1,9 @@
+Fri Feb 13 15:20:54 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * Makefile.in (thisconfigdir), configure.in: Point the
+               configuration directory at our parent, and remove our
+               local configure.in
+
 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/lib/crypto/sha/Makefile.in b/src/lib/crypto/sha/Makefile.in
index 72276f9e2c11adba4f411a73e995b7178fcc4b4c..e0926cf2df884fbf29fa150c481e5239c9a337c0 100644 (file)
--- a/src/lib/crypto/sha/Makefile.in
+++ b/src/lib/crypto/sha/Makefile.in
@@ -1,4 +1,4 @@
-thisconfigdir=./
+thisconfigdir=./../
 BUILDTOP=$(U)$(U)$(U)
 CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)/../des
 

diff --git a/src/lib/crypto/sha/configure.in b/src/lib/crypto/sha/configure.in
deleted file mode 100644 (file)
index 9bdd732..0000000
--- a/src/lib/crypto/sha/configure.in
+++ /dev/null
@@ -1,5 +0,0 @@
-AC_INIT(configure.in)
-CONFIG_RULES
-AC_CHECK_HEADERS(sys/types.h)
-KRB5_BUILD_LIBOBJS
-V5_AC_OUTPUT_MAKEFILE