Collapse lib/krb5's configure.in files into a single top-level
authorTheodore Tso <tytso@mit.edu>
Sat, 28 Feb 1998 01:59:45 +0000 (01:59 +0000)
committerTheodore Tso <tytso@mit.edu>
Sat, 28 Feb 1998 01:59:45 +0000 (01:59 +0000)
configure.in file.

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

40 files changed:
src/lib/krb5/ChangeLog
src/lib/krb5/Makefile.in
src/lib/krb5/asn.1/ChangeLog
src/lib/krb5/asn.1/Makefile.in
src/lib/krb5/asn.1/configure.in [deleted file]
src/lib/krb5/ccache/ChangeLog
src/lib/krb5/ccache/Makefile.in
src/lib/krb5/ccache/configure.in [deleted file]
src/lib/krb5/ccache/file/ChangeLog
src/lib/krb5/ccache/file/Makefile.in
src/lib/krb5/ccache/memory/ChangeLog
src/lib/krb5/ccache/memory/Makefile.in
src/lib/krb5/ccache/stdio/ChangeLog
src/lib/krb5/ccache/stdio/Makefile.in
src/lib/krb5/configure.in
src/lib/krb5/error_tables/ChangeLog
src/lib/krb5/error_tables/Makefile.in
src/lib/krb5/error_tables/configure.in [deleted file]
src/lib/krb5/keytab/ChangeLog
src/lib/krb5/keytab/Makefile.in
src/lib/krb5/keytab/configure.in [deleted file]
src/lib/krb5/keytab/db/ChangeLog
src/lib/krb5/keytab/db/Makefile.in
src/lib/krb5/keytab/db/configure.in [deleted file]
src/lib/krb5/keytab/file/ChangeLog
src/lib/krb5/keytab/file/Makefile.in
src/lib/krb5/krb/ChangeLog
src/lib/krb5/krb/Makefile.in
src/lib/krb5/krb/configure.in [deleted file]
src/lib/krb5/os/ChangeLog
src/lib/krb5/os/Makefile.in
src/lib/krb5/os/an_to_ln.c
src/lib/krb5/os/configure.in [deleted file]
src/lib/krb5/posix/ChangeLog
src/lib/krb5/posix/Makefile.in
src/lib/krb5/posix/configure.in [deleted file]
src/lib/krb5/posix/daemon.c
src/lib/krb5/rcache/ChangeLog
src/lib/krb5/rcache/Makefile.in
src/lib/krb5/rcache/configure.in [deleted file]

index 50ab9802c157f61090c4d8c031d7448c25ba8a12..c8a454e32df51f362d6f8fd99252a4c4a689e715 100644 (file)
@@ -1,3 +1,12 @@
+Fri Feb 27 18:00:15 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * configure.in: Move tests from all of krb5's subdirectories into
+               this configure.in, and make it generate makefiles for all
+               of the subdirectories.
+
+       * Makefile.in: Add a LOCAL_SUBDIRS macro for all subdirectories in
+               the krb5 library.
+
 Wed Feb 18 16:18:18 1998  Tom Yu  <tlyu@mit.edu>
 
        * Makefile.in: Remove trailing slash from thisconfigdir.  Fix up
index a6b972d1f9efe36700c1bb69fcf2de479928b752..9421f768cfb1b7476fded1b5b9e2f833a70e6a77 100644 (file)
@@ -1,5 +1,8 @@
 thisconfigdir=.
 BUILDTOP=$(REL)$(U)$(S)$(U)
+LOCAL_SUBDIRS= error_tables asn.1 ccache ccache/stdio ccache/file \
+       ccache/memory keytab keytab/file krb os rcache posix
+
 ##DOSBUILDTOP = ..\..
 ##DOSLIBNAME=krb5.lib
 ##DOSOBJFILEDEP=asn1.lst ccache.lst err_tbls.lst keytab.lst krb.lst os.lst posix.lst rcache.lst
index 209b8a3ec8f22e1e9d5d7e4feceb4f5253abd4b7..f15192816e1b0b0e438f2493816608d36edd1bf5 100644 (file)
@@ -1,3 +1,9 @@
+Fri Feb 27 18:03:33 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * Makefile.in: Changed thisconfigdir to point at the lib/krb5
+               directory, since we've moved the configure.in tests in
+               this directory to the toplevel lib/krb5 configure.in
+
 Wed Feb 18 16:18:46 1998  Tom Yu  <tlyu@mit.edu>
 
        * Makefile.in: Remove trailing slash from thisconfigdir.  Fix up
index 7b0766a7fff78300ec5a8fcbc81cd79d3b44fd8d..67fde15ed2071efce490158906fa1030b0edf442 100644 (file)
@@ -1,4 +1,4 @@
-thisconfigdir=.
+thisconfigdir=./..
 BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
 CFLAGS=$(CCOPTS) $(DEFS)
 
diff --git a/src/lib/krb5/asn.1/configure.in b/src/lib/krb5/asn.1/configure.in
deleted file mode 100644 (file)
index 106deb0..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-AC_INIT(configure.in)
-CONFIG_RULES
-KRB5_BUILD_LIBOBJS
-V5_AC_OUTPUT_MAKEFILE
index e11dc47ae4536b4382fb36bd9cda5c17eaeef623..573761321046303b86111fed3943655327e8da78 100644 (file)
@@ -1,3 +1,9 @@
+Fri Feb 27 18:03:33 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * Makefile.in: Changed thisconfigdir to point at the lib/krb5
+               directory, since we've moved the configure.in tests in
+               this directory to the toplevel lib/krb5 configure.in
+
 Wed Feb 18 16:19:12 1998  Tom Yu  <tlyu@mit.edu>
 
        * Makefile.in: Remove trailing slash from thisconfigdir.  Fix up
index 8189f4e8ac077fb9bdab98109eb8a97474edb5ab..2498f41835079071f41f40f62880b312f655d3f0 100644 (file)
@@ -1,4 +1,4 @@
-thisconfigdir=.
+thisconfigdir=./..
 BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
 LOCAL_SUBDIRS = stdio file memory
 
diff --git a/src/lib/krb5/ccache/configure.in b/src/lib/krb5/ccache/configure.in
deleted file mode 100644 (file)
index 22a9708..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-AC_INIT(ccbase.c)
-CONFIG_RULES
-AC_HAVE_HEADERS(unistd.h)
-AC_HAVE_FUNCS(flock fchmod chmod)
-KRB5_BUILD_LIBOBJS
-K5_GEN_MAKEFILE(., libobj)
-K5_GEN_MAKEFILE(stdio, libobj)
-K5_GEN_MAKEFILE(file, libobj)
-K5_GEN_MAKEFILE(memory, libobj)
-K5_OUTPUT_FILES
-dnl AC_OUTPUT to keep autoreconf happy
index b9020d4b5732e2351f566d1f1bc916ee595f8a82..e033adfca2f7735db9401e722f2021d4ed89c29c 100644 (file)
@@ -1,3 +1,9 @@
+Fri Feb 27 18:03:33 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * Makefile.in: Changed thisconfigdir to point at the lib/krb5
+               directory, since we've moved all of the configure.in
+               tests to the toplevel lib/krb5 configure.in
+
 Wed Feb 18 16:19:40 1998  Tom Yu  <tlyu@mit.edu>
 
        * Makefile.in: Remove trailing slash from thisconfigdir.  Fix up
index e5f66add7ecbd52b19aaf8a5602a9ecb2c31a505..19e99a1f3ee2cc57704b76d581bf9d6e69f0b8b0 100644 (file)
@@ -1,4 +1,4 @@
-thisconfigdir=./..
+thisconfigdir=./../..
 BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)$(S)$(U)
 CFLAGS = $(CCOPTS) $(DEFS)
 
index 3e6484d11752a5b82d7fa5f95faac655685d61aa..5b95fb6df18a90bf01e189d7988f8f1983b9cdc8 100644 (file)
@@ -1,3 +1,9 @@
+Fri Feb 27 18:03:33 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * Makefile.in: Changed thisconfigdir to point at the lib/krb5
+               directory, since we've moved all of the configure.in
+               tests to the toplevel lib/krb5 configure.in
+
 Wed Feb 18 16:20:15 1998  Tom Yu  <tlyu@mit.edu>
 
        * Makefile.in: Remove trailing slash from thisconfigdir.  Fix up
index 6682180e1ac5c602d736a9b11c07f60558107097..94267730672d322719a47c39c4cdab5530ea0285 100644 (file)
@@ -1,4 +1,4 @@
-thisconfigdir=./..
+thisconfigdir=./../..
 BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)$(S)$(U)
 CFLAGS = $(CCOPTS) $(DEFS)
 
index 0fa44b6668f8f13d46f5c45114754745403024f3..f6d85174edff03b89ac7aac800213d2bf9b8666a 100644 (file)
@@ -1,3 +1,9 @@
+Fri Feb 27 18:03:33 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * Makefile.in: Changed thisconfigdir to point at the lib/krb5
+               directory, since we've moved all of the configure.in
+               tests to the toplevel lib/krb5 configure.in
+
 Wed Feb 18 16:20:44 1998  Tom Yu  <tlyu@mit.edu>
 
        * Makefile.in: Remove trailing slash from thisconfigdir.  Fix up
index 659c20cdf7cebfb06eca13765a4ca6742fc78f9f..d9f6d06bb71155d7e9491276467301d57734e807 100644 (file)
@@ -1,4 +1,4 @@
-thisconfigdir=./..
+thisconfigdir=./../..
 BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)$(S)$(U)
 CFLAGS = $(CCOPTS) $(DEFS)
 
index 53f6da0f8df8500171203028bbd9d1fb4de85e43..4cf6009ce06d96798f7ea4b517648118f55b793b 100644 (file)
@@ -1,10 +1,56 @@
 AC_INIT(configure.in)
 CONFIG_RULES
-AC_CONFIG_SUBDIRS(error_tables asn.1 ccache keytab krb rcache os posix)
 AC_PROG_INSTALL
+AC_PROG_AWK
+dnl
+AC_CONST
+AC_TYPE_UID_T
+HAS_ANSI_VOLATILE
+AC_HEADER_STDARG
+AC_CHECK_HEADERS(unistd.h paths.h regex.h regexp.h regexpr.h)
+AC_CHECK_FUNCS(flock fchmod chmod strftime strptime geteuid setenv unsetenv getenv setsid re_comp)
+AC_REPLACE_FUNCS(vfprintf vsprintf strdup strcasecmp strerror memmove daemon getuid sscanf syslog)
+dnl
+dnl regcomp is present but non-functional on Solaris 2.4
+dnl
+AC_C_CROSS
+AC_MSG_CHECKING(for working regcomp)
+AC_CACHE_VAL(ac_cv_func_regcomp,[
+AC_TRY_RUN([
+#include <sys/types.h>
+#include <regex.h>
+regex_t x; regmatch_t m;
+int main() { return regcomp(&x,"pat.*",0) || regexec(&x,"pattern",1,&m,0); }
+], ac_cv_func_regcomp=yes, ac_cv_func_regcomp=no)])
+AC_MSG_RESULT($ac_cv_func_regcomp)
+test $ac_cv_func_regcomp = yes && AC_DEFINE(HAVE_REGCOMP)
+save_LIBS="$LIBS"
+LIBS=-lgen
+dnl this will fail if there's no compile/step in -lgen, or if there's
+dnl no -lgen.  This is fine.
+AC_CHECK_FUNCS(compile step)
+LIBS="$save_LIBS"
 dnl
 AC_CHECK_LIB(gen,compile,SHLIB_GEN=-lgen,SHLIB_GEN='')
 AC_SUBST(SHLIB_GEN)
 dnl
 KRB5_BUILD_LIBRARY_WITH_DEPS
-V5_AC_OUTPUT_MAKEFILE
+KRB5_BUILD_LIBOBJS
+KRB5_BUILD_PROGRAM
+KRB5_RUN_FLAGS
+dnl
+K5_GEN_MAKEFILE(., lib)
+K5_GEN_MAKEFILE(error_tables, libobj)
+K5_GEN_MAKEFILE(asn.1, libobj)
+K5_GEN_MAKEFILE(ccache, libobj)
+K5_GEN_MAKEFILE(ccache/stdio, libobj)
+K5_GEN_MAKEFILE(ccache/file, libobj)
+K5_GEN_MAKEFILE(ccache/memory, libobj)
+K5_GEN_MAKEFILE(keytab, libobj)
+K5_GEN_MAKEFILE(keytab/file, libobj)
+K5_GEN_MAKEFILE(keytab/db, libobj)
+K5_GEN_MAKEFILE(krb, libobj)
+K5_GEN_MAKEFILE(rcache, libobj)
+K5_GEN_MAKEFILE(os, libobj)
+K5_GEN_MAKEFILE(posix, libobj)
+K5_AC_OUTPUT
index e810d0bb10440b5f69179d4a64bf722b07c3fa47..7807e0c58394e3890d721dcb5873da8d87d5e373 100644 (file)
@@ -1,3 +1,9 @@
+Fri Feb 27 18:03:33 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * Makefile.in: Changed thisconfigdir to point at the lib/krb5
+               directory, since we've moved the configure.in tests in
+               this directory to the toplevel lib/krb5 configure.in
+
 Wed Feb 18 16:21:57 1998  Tom Yu  <tlyu@mit.edu>
 
        * Makefile.in: Remove trailing slash from thisconfigdir.  Fix up
index 42100ddee8b96f1f6b4ec93d9e30d600a6b7a006..d224e1605931b9771609940725626f76884b2c57 100644 (file)
@@ -1,4 +1,4 @@
-thisconfigdir=.
+thisconfigdir=./..
 BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
 CFLAGS = $(CCOPTS) $(DEFS)
 
diff --git a/src/lib/krb5/error_tables/configure.in b/src/lib/krb5/error_tables/configure.in
deleted file mode 100644 (file)
index 899c67a..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-AC_INIT(configure.in)
-CONFIG_RULES
-AC_PROG_AWK
-KRB5_BUILD_LIBOBJS
-V5_AC_OUTPUT_MAKEFILE
index 93fa24040106e5206b2e0fef27ac83de43be7f80..934b07cd5cae7dbb3ce4f3c6e82248d97d890823 100644 (file)
@@ -1,3 +1,9 @@
+Fri Feb 27 18:03:33 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * Makefile.in: Changed thisconfigdir to point at the lib/krb5
+               directory, since we've moved the configure.in tests in
+               this directory to the toplevel lib/krb5 configure.in
+
 Wed Feb 18 16:22:33 1998  Tom Yu  <tlyu@mit.edu>
 
        * Makefile.in: Remove trailing slash from thisconfigdir.  Fix up
index 8b6c4f1e68746a0e416ec2af8194cdb8e90d685b..da8a36c1bd4d8cb05eafbb599e3d175fa9039ee0 100644 (file)
@@ -1,4 +1,4 @@
-thisconfigdir=.
+thisconfigdir=./..
 BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
 LOCAL_SUBDIRS = file
 
diff --git a/src/lib/krb5/keytab/configure.in b/src/lib/krb5/keytab/configure.in
deleted file mode 100644 (file)
index f491241..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-AC_INIT(configure.in)
-CONFIG_RULES
-KRB5_BUILD_LIBOBJS
-K5_GEN_MAKEFILE(., libobj)
-K5_GEN_MAKEFILE(file, libobj)
-K5_OUTPUT_FILES
-dnl AC_OUTPUT to keep autoreconf happy
index 261ec32ffdd3b15502402fa20801b4ba63aa976b..c68ec2eed0d4206eea9583ae38324d3fd14a2ddd 100644 (file)
@@ -1,3 +1,9 @@
+Fri Feb 27 18:03:33 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * Makefile.in: Changed thisconfigdir to point at the lib/krb5
+               directory, since we've moved all of the configure.in
+               tests to the toplevel lib/krb5 configure.in
+
 Wed Feb 18 16:23:03 1998  Tom Yu  <tlyu@mit.edu>
 
        * Makefile.in: Remove trailing slash from thisconfigdir.  Fix up
index 65a03517206325ab80bfdb95b75a5a4e7b4561b0..510ee4d50ba6f8520fc95b2ae6bab341d1fd3839 100644 (file)
@@ -1,27 +1,20 @@
-thisconfigdir=.
+thisconfigdir=./../..
 BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)$(S)$(U)
 CFLAGS = $(CCOPTS) $(DEFS)
 
 ##DOSBUILDTOP = ..\..\..\..
 ##DOSLIBNAME=..\..\krb5.lib
+##DOS##PREFIXDIR=keytab\db
+##DOS##OBJFILE= file.lst
 
-.c.o:
-       $(CC) $(CFLAGS) -c $(srcdir)/$*.c
-@SHARED_RULE@
+STLIBOBJS = dbkeytab.o
 
 SRCS= $(srcdir)/dbkeytab.c 
 
 OBJS = dbkeytab.$(OBJEXT)      
 
-all-unix:: shared $(OBJS)
-all-mac:: $(OBJS)
-all-windows:: $(OBJS)
+##DOS##LIBOBJS = $(OBJS)
 
-shared:
-       mkdir shared
 
-clean-unix::
-       $(RM) shared/*
-
-clean-mac::
-clean-windows::
+all-unix:: all-libobjs
+clean-unix:: clean-libobjs
diff --git a/src/lib/krb5/keytab/db/configure.in b/src/lib/krb5/keytab/db/configure.in
deleted file mode 100644 (file)
index b643c05..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-AC_INIT(configure.in)
-CONFIG_RULES
-dnl
-dnl We're currently not building this directory, and the shared library
-dnl calls needs to be redone if/when we include this.
-dnl
-dnl V5_SHARED_LIB_OBJS
-dnl SubdirLibraryRule([${OBJS}])
-V5_AC_OUTPUT_MAKEFILE
index 70edaada0af75827d9a54fde93a77288526e146c..2120127db12e70df94f7d215dface21a0c72779a 100644 (file)
@@ -1,3 +1,9 @@
+Fri Feb 27 18:03:33 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * Makefile.in: Changed thisconfigdir to point at the lib/krb5
+               directory, since we've moved all of the configure.in
+               tests to the toplevel lib/krb5 configure.in
+
 Wed Feb 18 16:23:33 1998  Tom Yu  <tlyu@mit.edu>
 
        * Makefile.in: Remove trailing slash from thisconfigdir.  Fix up
index ebc9076c30f65302e941f7455a95e48e9329682a..687cb74fab117a9e7f488fe6edce141d6cd2e052 100644 (file)
@@ -1,4 +1,4 @@
-thisconfigdir=./..
+thisconfigdir=./../..
 BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)$(S)$(U)
 CFLAGS = $(CCOPTS) $(DEFS)
 
index 48278958e0bd6c5dec0c2400ec1a37f1019137a4..cb58a762f4d063692d741a475db9d946c9616671 100644 (file)
@@ -1,3 +1,9 @@
+Fri Feb 27 18:03:33 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * Makefile.in: Changed thisconfigdir to point at the lib/krb5
+               directory, since we've moved the configure.in tests in
+               this directory to the toplevel lib/krb5 configure.in
+
 Thu Feb 19 19:03:20 1998  Tom Yu  <tlyu@mit.edu>
 
        * recvauth.c (krb5_recvauth): Add some bookkeeping flags so we
index 0978f8ce52c907d13a05c15a06c79b8dd1ef91ff..a13099cf52e5a6885bdd359916736ce92c5fec4d 100644 (file)
@@ -1,4 +1,4 @@
-thisconfigdir=.
+thisconfigdir=./..
 BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
 CFLAGS = $(CCOPTS) $(DEFS)
 RUN_SETUP = @KRB5_RUN_ENV@
diff --git a/src/lib/krb5/krb/configure.in b/src/lib/krb5/krb/configure.in
deleted file mode 100644 (file)
index 10f5f2e..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-AC_INIT(configure.in)
-CONFIG_RULES
-AC_HEADER_STDARG
-AC_HAVE_FUNCS(strftime strptime geteuid)
-KRB5_RUN_FLAGS
-KRB5_BUILD_PROGRAM
-KRB5_BUILD_LIBOBJS
-V5_AC_OUTPUT_MAKEFILE
index 3b012c7e3b4cfa4c9efabc7ac7a61c4cd6794d4b..12619dd5d9b54f32771343bbf0a04832c17087b3 100644 (file)
@@ -1,3 +1,9 @@
+Fri Feb 27 18:03:33 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * Makefile.in: Changed thisconfigdir to point at the lib/krb5
+               directory, since we've moved the configure.in tests in
+               this directory to the toplevel lib/krb5 configure.in
+
 Wed Feb 18 16:24:39 1998  Tom Yu  <tlyu@mit.edu>
 
        * Makefile.in: Remove trailing slash from thisconfigdir.  Fix up
index bd0ac7fd54eca46d22209bef2ea2fc95fd9e59f4..9e132dbc86924f3714dd11810d3bba743d0ccaf7 100644 (file)
@@ -1,4 +1,4 @@
-thisconfigdir=.
+thisconfigdir=./..
 BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
 CFLAGS = $(CCOPTS) $(DEFS)
 KRB5_RUN_ENV = @KRB5_RUN_ENV@
index 9831caf640f9bdffce07aeee9e52c038734d7fe5..2df26a6c3629ee7616b3c1c4504b487a2d0c9041 100644 (file)
  * krb5_aname_to_localname()
  */
 
+/*
+ * We're only to AN_TO_LN rules at this point, and not doing the
+ * database lookup  (moved from configure script)
+ */
+#define AN_TO_LN_RULES
+
 #include "k5-int.h"
 #include <ctype.h>
 #if    HAVE_REGEX_H
diff --git a/src/lib/krb5/os/configure.in b/src/lib/krb5/os/configure.in
deleted file mode 100644 (file)
index 7c3f343..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-AC_INIT(configure.in)
-CONFIG_RULES
-AC_HAVE_HEADERS(regex.h regexp.h regexpr.h)
-
-dnl regcomp is present but non-functional on Solaris 2.4
-AC_C_CROSS
-AC_MSG_CHECKING(for working regcomp)
-AC_CACHE_VAL(ac_cv_func_regcomp,[
-AC_TRY_RUN([
-#include <sys/types.h>
-#include <regex.h>
-regex_t x; regmatch_t m;
-int main() { return regcomp(&x,"pat.*",0) || regexec(&x,"pattern",1,&m,0); }
-], ac_cv_func_regcomp=yes, ac_cv_func_regcomp=no)])
-AC_MSG_RESULT($ac_cv_func_regcomp)
-test $ac_cv_func_regcomp = yes && AC_DEFINE(HAVE_REGCOMP)
-save_LIBS="$LIBS"
-LIBS=-lgen
-dnl this will fail if there's no compile/step in -lgen, or if there's
-dnl no -lgen.  This is fine.
-AC_CHECK_FUNCS(compile step)
-LIBS="$save_LIBS"
-AC_HAVE_FUNCS(re_comp)
-HAS_ANSI_VOLATILE
-AC_DEFINE(AN_TO_LN_RULES)
-KRB5_BUILD_PROGRAM
-KRB5_RUN_FLAGS
-KRB5_BUILD_LIBOBJS
-V5_AC_OUTPUT_MAKEFILE
index 913076e8ee1db9f1cbd357c171f35dd30490ea3d..508930d40836fc6ee5586af6711642940754c6fb 100644 (file)
@@ -1,3 +1,14 @@
+Fri Feb 27 18:03:33 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * Makefile.in: Changed thisconfigdir to point at the lib/krb5
+               directory, since we've moved the configure.in tests in
+               this directory to the toplevel lib/krb5 configure.in
+
+Fri Feb 27 11:55:33 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * daemon.c: Change use of HAS_PATHS_H to be HAVE_PATHS_H.
+               Change use of HAS_SETSID to be HAVE_SETSID.
+
 Wed Feb 18 16:25:07 1998  Tom Yu  <tlyu@mit.edu>
 
        * Makefile.in: Remove trailing slash from thisconfigdir.  Fix up
index b580307e8322e93a2515a30068bcfd75cde67e48..41921779527e0e2d7b3dec0cd54143aee4618e69 100644 (file)
@@ -1,4 +1,4 @@
-thisconfigdir=.
+thisconfigdir=./..
 BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
 CFLAGS = $(CCOPTS) $(DEFS)
 
diff --git a/src/lib/krb5/posix/configure.in b/src/lib/krb5/posix/configure.in
deleted file mode 100644 (file)
index 6d5f033..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-AC_INIT(configure.in)
-CONFIG_RULES
-AC_CONST
-AC_HEADER_CHECK(paths.h,AC_DEFINE(HAS_PATHS_H))
-AC_HAVE_FUNCS(setenv unsetenv getenv)
-AC_REPLACE_FUNCS(vfprintf vsprintf strdup strcasecmp strerror memmove daemon getuid sscanf syslog)
-AC_FUNC_CHECK(setsid,AC_DEFINE(HAS_SETSID))
-KRB5_BUILD_LIBOBJS
-V5_AC_OUTPUT_MAKEFILE
index fb7a62a44f761819d3534c600c79f2d5e32ce580..00dde4882e81e20a3d5d0e5d1dce081ea9d18fd9 100644 (file)
@@ -36,7 +36,7 @@
 #include <sys/types.h>
 #include <sys/file.h>
 #include <unistd.h>
-#ifdef HAS_PATHS_H
+#ifdef HAVE_PATHS_H
 #include <paths.h>
 #endif
 
@@ -54,7 +54,7 @@ daemon(nochdir, noclose)
                return (-1);
        if (cpid)
                exit(0);
-#ifdef HAS_SETSID
+#ifdef HAVE_SETSID
        (void) setsid();
 #else
 #ifndef TIOCNOTTY
index 7ef6b44df4bdf0ca519d3097350c2ba94d24442c..a4e68a628669a62498a44a99bca4316042d70498 100644 (file)
@@ -1,3 +1,9 @@
+Fri Feb 27 18:03:33 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * Makefile.in: Changed thisconfigdir to point at the lib/krb5
+               directory, since we've moved the configure.in tests in
+               this directory to the toplevel lib/krb5 configure.in
+
 Wed Feb 18 16:25:34 1998  Tom Yu  <tlyu@mit.edu>
 
        * Makefile.in: Remove trailing slash from thisconfigdir.  Fix up
index db3ce3f2ede245df7faf38d762d5482ce64ed35b..0d4cfb3d3536c0156d5f4ae082927e138767cdf0 100644 (file)
@@ -1,4 +1,4 @@
-thisconfigdir=.
+thisconfigdir=./..
 BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
 CFLAGS = $(CCOPTS) $(DEFS)
 
diff --git a/src/lib/krb5/rcache/configure.in b/src/lib/krb5/rcache/configure.in
deleted file mode 100644 (file)
index 96c0bbe..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-AC_INIT(configure.in)
-CONFIG_RULES
-KRB5_BUILD_LIBOBJS
-AC_TYPE_UID_T
-V5_AC_OUTPUT_MAKEFILE