From 87f18f3c5f2bfb78cb4a0c41dc24c8da2ad97658 Mon Sep 17 00:00:00 2001 From: Theodore Tso Date: Fri, 13 Feb 1998 20:23:25 +0000 Subject: [PATCH] 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 --- src/lib/crypto/ChangeLog | 9 +++++++++ src/lib/crypto/Makefile.in | 1 + src/lib/crypto/configure.in | 19 +++++++++++++++++-- src/lib/crypto/crc32/ChangeLog | 6 ++++++ src/lib/crypto/crc32/Makefile.in | 2 +- src/lib/crypto/crc32/configure.in | 4 ---- src/lib/crypto/des/ChangeLog | 6 ++++++ src/lib/crypto/des/Makefile.in | 2 +- src/lib/crypto/des/configure.in | 6 ------ src/lib/crypto/md4/ChangeLog | 6 ++++++ src/lib/crypto/md4/Makefile.in | 2 +- src/lib/crypto/md4/configure.in | 5 ----- src/lib/crypto/md5/ChangeLog | 6 ++++++ src/lib/crypto/md5/Makefile.in | 2 +- src/lib/crypto/md5/configure.in | 5 ----- src/lib/crypto/os/ChangeLog | 6 ++++++ src/lib/crypto/os/Makefile.in | 2 +- src/lib/crypto/os/configure.in | 8 -------- src/lib/crypto/sha/ChangeLog | 6 ++++++ src/lib/crypto/sha/Makefile.in | 2 +- src/lib/crypto/sha/configure.in | 5 ----- 21 files changed, 69 insertions(+), 41 deletions(-) delete mode 100644 src/lib/crypto/crc32/configure.in delete mode 100644 src/lib/crypto/des/configure.in delete mode 100644 src/lib/crypto/md4/configure.in delete mode 100644 src/lib/crypto/md5/configure.in delete mode 100644 src/lib/crypto/os/configure.in delete mode 100644 src/lib/crypto/sha/configure.in diff --git a/src/lib/crypto/ChangeLog b/src/lib/crypto/ChangeLog index ebc03cb36..1c3f44506 100644 --- a/src/lib/crypto/ChangeLog +++ b/src/lib/crypto/ChangeLog @@ -1,3 +1,12 @@ +Fri Feb 13 15:19:37 1998 Theodore Ts'o + + * 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 * 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 3e1eaba8c..c81599407 100644 --- 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 ba9300cd9..19688e35e 100644 --- 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 55707c380..0612a82a5 100644 --- 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 + + * 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 * 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 02379bee5..f13b38de3 100644 --- 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 index 106deb0dd..000000000 --- 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 848b01264..96a5999e4 100644 --- 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 + + * 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 * 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 3c7df6460..3bfff79a7 100644 --- 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 index 20cc4376c..000000000 --- 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 8ee89d5c5..a02ce01ee 100644 --- 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 + + * 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 * 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 9c6cb96ac..4525a6d70 100644 --- 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 index e4941ce39..000000000 --- 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 8955638a2..5970e4ca5 100644 --- 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 + + * 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 * 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 267f3ca73..74f4d45f7 100644 --- 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 index e4941ce39..000000000 --- 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 94d840ae1..0c2add83f 100644 --- 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 + + * 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 * 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 39da75a86..5e086a1cb 100644 --- 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 index 7b8fcac95..000000000 --- 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 d80dbcc9d..4ca6216a4 100644 --- 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 + + * 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 * 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 72276f9e2..e0926cf2d 100644 --- 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 index 9bdd7321e..000000000 --- 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 -- 2.26.2