summaryrefslogtreecommitdiffstats
path: root/src/config
diff options
context:
space:
mode:
authorKen Raeburn <raeburn@mit.edu>2004-02-24 19:24:25 +0000
committerKen Raeburn <raeburn@mit.edu>2004-02-24 19:24:25 +0000
commit5579fec8bba6dbeee1290d131e4fc915ec46dd51 (patch)
treea96b7b7f92cf3e3e84d3451819ed3547cb5d2c4a /src/config
parent74b6af2609c5235a650bb15f9e8aecb998fbbd2a (diff)
Move daemon.c into a new library of utility routines for linking our programs
against but which we don't want to install as a separate library. Change Kerberos and application servers to link against the library if they might need the replacement daemon() function. Add a dummy file to the library in case daemon() is not needed, so we don't have an empty library, which we may not handle properly. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16118 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/config')
-rw-r--r--src/config/ChangeLog5
-rw-r--r--src/config/post.in6
-rw-r--r--src/config/pre.in5
3 files changed, 10 insertions, 6 deletions
diff --git a/src/config/ChangeLog b/src/config/ChangeLog
index 2b0ff32d4..20a11c330 100644
--- a/src/config/ChangeLog
+++ b/src/config/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-24 Ken Raeburn <raeburn@mit.edu>
+
+ * pre.in (APPUTILS_DEPLIB, APPUTILS_LIB): New vars.
+ * post.in (daemon.c): Delete rule for copying source file.
+
2004-02-18 Tom Yu <tlyu@mit.edu>
* shlib.conf (alpha-*-dec-osf*, mips-sgi-irix*): Use $(CC) instead
diff --git a/src/config/post.in b/src/config/post.in
index 1401a80ef..85f6bb982 100644
--- a/src/config/post.in
+++ b/src/config/post.in
@@ -193,12 +193,6 @@ $(RECURSE_TARGETS):
fi;\
exit $$status
-# Some servers need "daemon", but we're not providing it directly
-# through a library. We used to provide it through the krb5 library,
-# and the source is still there.
-daemon.c: $(SRCTOP)/lib/krb5/posix/daemon.c
- $(CP) $(SRCTOP)/lib/krb5/posix/daemon.c daemon.c
-
##
## end of post.in
############################################################
diff --git a/src/config/pre.in b/src/config/pre.in
index 34f91b7e0..4881e294a 100644
--- a/src/config/pre.in
+++ b/src/config/pre.in
@@ -296,6 +296,7 @@ SS_DEPLIB = $(SS_DEPLIB-@SS_VERSION@)
SS_DEPLIB-k5 = $(TOPLIBD)/libss.a
SS_DEPLIB-sys =
PTY_DEPLIB = $(TOPLIBD)/libpty.a
+APPUTILS_DEPLIB = $(TOPLIBD)/libapputils.a
KRB5_BASE_DEPLIBS = $(KRB5_DEPLIB) $(CRYPTO_DEPLIB) $(COM_ERR_DEPLIB)
KRB4COMPAT_DEPLIBS = $(KRB4_DEPLIB) $(DES425_DEPLIB) $(KRB5_BASE_DEPLIBS)
@@ -371,6 +372,10 @@ KADMCLNT_LIBS = -lkadm5clnt $(KADM_COMM_LIBS)
# need fixing if ever used on Mac OS X!
PTY_LIB = -lpty
+# Misc stuff for linking server programs (and maybe some others,
+# eventually) but which we don't want to install.
+APPUTILS_LIB = -lapputils
+
#
# some more stuff for --with-krb4
KRB4_LIBPATH = @KRB4_LIBPATH@