Collapse lib/krb5's configure.in files into a single top-level

configure.in file.

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

40 files changed, 170 insertions, 117 deletions

diff --git a/src/lib/krb5/ChangeLog b/src/lib/krb5/ChangeLog
index 50ab980..c8a454e 100644
--- a/src/lib/krb5/ChangeLog
+++ b/src/lib/krb5/ChangeLog
@@ -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
diff --git a/src/lib/krb5/Makefile.in b/src/lib/krb5/Makefile.in
index a6b972d..9421f76 100644
--- a/src/lib/krb5/Makefile.in
+++ b/src/lib/krb5/Makefile.in
@@ -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
diff --git a/src/lib/krb5/asn.1/ChangeLog b/src/lib/krb5/asn.1/ChangeLog
index 209b8a3..f151928 100644
--- a/src/lib/krb5/asn.1/ChangeLog
+++ b/src/lib/krb5/asn.1/ChangeLog
@@ -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
diff --git a/src/lib/krb5/asn.1/Makefile.in b/src/lib/krb5/asn.1/Makefile.in
index 7b0766a..67fde15 100644
--- a/src/lib/krb5/asn.1/Makefile.in
+++ b/src/lib/krb5/asn.1/Makefile.in
@@ -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
index 106deb0..0000000
--- a/src/lib/krb5/asn.1/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/krb5/ccache/ChangeLog b/src/lib/krb5/ccache/ChangeLog
index e11dc47..5737613 100644
--- a/src/lib/krb5/ccache/ChangeLog
+++ b/src/lib/krb5/ccache/ChangeLog
@@ -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
diff --git a/src/lib/krb5/ccache/Makefile.in b/src/lib/krb5/ccache/Makefile.in
index 8189f4e..2498f41 100644
--- a/src/lib/krb5/ccache/Makefile.in
+++ b/src/lib/krb5/ccache/Makefile.in
@@ -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
index 22a9708..0000000
--- a/src/lib/krb5/ccache/configure.in
+++ /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
diff --git a/src/lib/krb5/ccache/file/ChangeLog b/src/lib/krb5/ccache/file/ChangeLog
index b9020d4..e033adf 100644
--- a/src/lib/krb5/ccache/file/ChangeLog
+++ b/src/lib/krb5/ccache/file/ChangeLog
@@ -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
diff --git a/src/lib/krb5/ccache/file/Makefile.in b/src/lib/krb5/ccache/file/Makefile.in
index e5f66ad..19e99a1 100644
--- a/src/lib/krb5/ccache/file/Makefile.in
+++ b/src/lib/krb5/ccache/file/Makefile.in
@@ -1,4 +1,4 @@
-thisconfigdir=./..
+thisconfigdir=./../..
 BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)$(S)$(U)
 CFLAGS = $(CCOPTS) $(DEFS)
 
diff --git a/src/lib/krb5/ccache/memory/ChangeLog b/src/lib/krb5/ccache/memory/ChangeLog
index 3e6484d..5b95fb6 100644
--- a/src/lib/krb5/ccache/memory/ChangeLog
+++ b/src/lib/krb5/ccache/memory/ChangeLog
@@ -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
diff --git a/src/lib/krb5/ccache/memory/Makefile.in b/src/lib/krb5/ccache/memory/Makefile.in
index 6682180..9426773 100644
--- a/src/lib/krb5/ccache/memory/Makefile.in
+++ b/src/lib/krb5/ccache/memory/Makefile.in
@@ -1,4 +1,4 @@
-thisconfigdir=./..
+thisconfigdir=./../..
 BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)$(S)$(U)
 CFLAGS = $(CCOPTS) $(DEFS)
 
diff --git a/src/lib/krb5/ccache/stdio/ChangeLog b/src/lib/krb5/ccache/stdio/ChangeLog
index 0fa44b6..f6d8517 100644
--- a/src/lib/krb5/ccache/stdio/ChangeLog
+++ b/src/lib/krb5/ccache/stdio/ChangeLog
@@ -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
diff --git a/src/lib/krb5/ccache/stdio/Makefile.in b/src/lib/krb5/ccache/stdio/Makefile.in
index 659c20c..d9f6d06 100644
--- a/src/lib/krb5/ccache/stdio/Makefile.in
+++ b/src/lib/krb5/ccache/stdio/Makefile.in
@@ -1,4 +1,4 @@
-thisconfigdir=./..
+thisconfigdir=./../..
 BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)$(S)$(U)
 CFLAGS = $(CCOPTS) $(DEFS)
 
diff --git a/src/lib/krb5/configure.in b/src/lib/krb5/configure.in
index 53f6da0..4cf6009 100644
--- a/src/lib/krb5/configure.in
+++ b/src/lib/krb5/configure.in
@@ -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
diff --git a/src/lib/krb5/error_tables/ChangeLog b/src/lib/krb5/error_tables/ChangeLog
index e810d0b..7807e0c 100644
--- a/src/lib/krb5/error_tables/ChangeLog
+++ b/src/lib/krb5/error_tables/ChangeLog
@@ -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
diff --git a/src/lib/krb5/error_tables/Makefile.in b/src/lib/krb5/error_tables/Makefile.in
index 42100dd..d224e16 100644
--- a/src/lib/krb5/error_tables/Makefile.in
+++ b/src/lib/krb5/error_tables/Makefile.in
@@ -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
index 899c67a..0000000
--- a/src/lib/krb5/error_tables/configure.in
+++ /dev/null
@@ -1,5 +0,0 @@
-AC_INIT(configure.in)
-CONFIG_RULES
-AC_PROG_AWK
-KRB5_BUILD_LIBOBJS
-V5_AC_OUTPUT_MAKEFILE
diff --git a/src/lib/krb5/keytab/ChangeLog b/src/lib/krb5/keytab/ChangeLog
index 93fa240..934b07c 100644
--- a/src/lib/krb5/keytab/ChangeLog
+++ b/src/lib/krb5/keytab/ChangeLog
@@ -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
diff --git a/src/lib/krb5/keytab/Makefile.in b/src/lib/krb5/keytab/Makefile.in
index 8b6c4f1..da8a36c 100644
--- a/src/lib/krb5/keytab/Makefile.in
+++ b/src/lib/krb5/keytab/Makefile.in
@@ -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
index f491241..0000000
--- a/src/lib/krb5/keytab/configure.in
+++ /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
diff --git a/src/lib/krb5/keytab/db/ChangeLog b/src/lib/krb5/keytab/db/ChangeLog
index 261ec32..c68ec2e 100644
--- a/src/lib/krb5/keytab/db/ChangeLog
+++ b/src/lib/krb5/keytab/db/ChangeLog
@@ -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
diff --git a/src/lib/krb5/keytab/db/Makefile.in b/src/lib/krb5/keytab/db/Makefile.in
index 65a0351..510ee4d 100644
--- a/src/lib/krb5/keytab/db/Makefile.in
+++ b/src/lib/krb5/keytab/db/Makefile.in
@@ -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
index b643c05..0000000
--- a/src/lib/krb5/keytab/db/configure.in
+++ /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
diff --git a/src/lib/krb5/keytab/file/ChangeLog b/src/lib/krb5/keytab/file/ChangeLog
index 70edaad..2120127 100644
--- a/src/lib/krb5/keytab/file/ChangeLog
+++ b/src/lib/krb5/keytab/file/ChangeLog
@@ -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
diff --git a/src/lib/krb5/keytab/file/Makefile.in b/src/lib/krb5/keytab/file/Makefile.in
index ebc9076..687cb74 100644
--- a/src/lib/krb5/keytab/file/Makefile.in
+++ b/src/lib/krb5/keytab/file/Makefile.in
@@ -1,4 +1,4 @@
-thisconfigdir=./..
+thisconfigdir=./../..
 BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)$(S)$(U)
 CFLAGS = $(CCOPTS) $(DEFS)
 
diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index 4827895..cb58a76 100644
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -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
diff --git a/src/lib/krb5/krb/Makefile.in b/src/lib/krb5/krb/Makefile.in
index 0978f8c..a13099c 100644
--- a/src/lib/krb5/krb/Makefile.in
+++ b/src/lib/krb5/krb/Makefile.in
@@ -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
index 10f5f2e..0000000
--- a/src/lib/krb5/krb/configure.in
+++ /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
diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog
index 3b012c7..12619dd 100644
--- a/src/lib/krb5/os/ChangeLog
+++ b/src/lib/krb5/os/ChangeLog
@@ -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
diff --git a/src/lib/krb5/os/Makefile.in b/src/lib/krb5/os/Makefile.in
index bd0ac7f..9e132db 100644
--- a/src/lib/krb5/os/Makefile.in
+++ b/src/lib/krb5/os/Makefile.in
@@ -1,4 +1,4 @@
-thisconfigdir=.
+thisconfigdir=./..
 BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
 CFLAGS = $(CCOPTS) $(DEFS)
 KRB5_RUN_ENV = @KRB5_RUN_ENV@
diff --git a/src/lib/krb5/os/an_to_ln.c b/src/lib/krb5/os/an_to_ln.c
index 9831caf..2df26a6 100644
--- a/src/lib/krb5/os/an_to_ln.c
+++ b/src/lib/krb5/os/an_to_ln.c
@@ -24,6 +24,12 @@
  * 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
index 7c3f343..0000000
--- a/src/lib/krb5/os/configure.in
+++ /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
diff --git a/src/lib/krb5/posix/ChangeLog b/src/lib/krb5/posix/ChangeLog
index 913076e..508930d 100644
--- a/src/lib/krb5/posix/ChangeLog
+++ b/src/lib/krb5/posix/ChangeLog
@@ -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
diff --git a/src/lib/krb5/posix/Makefile.in b/src/lib/krb5/posix/Makefile.in
index b580307..4192177 100644
--- a/src/lib/krb5/posix/Makefile.in
+++ b/src/lib/krb5/posix/Makefile.in
@@ -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
index 6d5f033..0000000
--- a/src/lib/krb5/posix/configure.in
+++ /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
diff --git a/src/lib/krb5/posix/daemon.c b/src/lib/krb5/posix/daemon.c
index fb7a62a..00dde48 100644
--- a/src/lib/krb5/posix/daemon.c
+++ b/src/lib/krb5/posix/daemon.c
@@ -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
diff --git a/src/lib/krb5/rcache/ChangeLog b/src/lib/krb5/rcache/ChangeLog
index 7ef6b44..a4e68a6 100644
--- a/src/lib/krb5/rcache/ChangeLog
+++ b/src/lib/krb5/rcache/ChangeLog
@@ -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
diff --git a/src/lib/krb5/rcache/Makefile.in b/src/lib/krb5/rcache/Makefile.in
index db3ce3f..0d4cfb3 100644
--- a/src/lib/krb5/rcache/Makefile.in
+++ b/src/lib/krb5/rcache/Makefile.in
@@ -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
index 96c0bbe..0000000
--- a/src/lib/krb5/rcache/configure.in
+++ /dev/null
@@ -1,5 +0,0 @@
-AC_INIT(configure.in)
-CONFIG_RULES
-KRB5_BUILD_LIBOBJS
-AC_TYPE_UID_T
-V5_AC_OUTPUT_MAKEFILE