aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/ChangeLog7
-rw-r--r--src/Makefile.in6
-rw-r--r--src/config-files/ChangeLog7
-rw-r--r--src/config-files/Makefile.in5
-rw-r--r--src/config-files/configure.in4
-rw-r--r--src/configure.in49
-rw-r--r--src/gen-manpages/ChangeLog7
-rw-r--r--src/gen-manpages/Makefile.in5
-rw-r--r--src/gen-manpages/configure.in4
-rw-r--r--src/lib/ChangeLog7
-rw-r--r--src/lib/Makefile.in5
-rw-r--r--src/lib/configure.in13
-rw-r--r--src/util/ChangeLog7
-rw-r--r--src/util/Makefile.in5
-rw-r--r--src/util/configure.in17
-rw-r--r--src/util/dyn/ChangeLog7
-rw-r--r--src/util/dyn/Makefile.in5
-rw-r--r--src/util/dyn/configure.in10
-rw-r--r--src/util/send-pr/ChangeLog7
-rw-r--r--src/util/send-pr/Makefile.in5
-rw-r--r--src/util/send-pr/configure.in6
21 files changed, 122 insertions, 66 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 4d4de6b..2772334 100644
--- 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 99f3d00..9c5acc2 100644
--- 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 12b0a81..467ba6b 100644
--- 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 320cd56..5201464 100644
--- 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
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 c7be4db..d82da8b 100644
--- 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 4c66919..48798e8 100644
--- 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 ea5464e..2e618ec 100644
--- 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
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 1f42128..7def709 100644
--- 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 e2a2613..cd0e13c 100644
--- 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
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 d9eab6f..0dd9117 100644
--- 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 5d900c7..9777d79 100644
--- 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
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 49a61fc..d5102d5 100644
--- 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 59b9739..00315e3 100644
--- 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
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
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 5a74290..bafa045 100644
--- 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
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
generated by cgit v1.1 at 2024-09-08 05:24:07 +0000