summaryrefslogtreecommitdiffstats
path: root/src/krb524
diff options
context:
space:
mode:
authorKen Raeburn <raeburn@mit.edu>2003-08-30 01:09:41 +0000
committerKen Raeburn <raeburn@mit.edu>2003-08-30 01:09:41 +0000
commit078fda0b90ecc040ea8d4ba2130eb46bc567f480 (patch)
tree17742669ee50ebf48072145454fb3fa96b2b5b13 /src/krb524
parent8b1bc6112f43e707d007f8b82d6c8c50775c4328 (diff)
downloadkrb5-078fda0b90ecc040ea8d4ba2130eb46bc567f480.tar.gz
krb5-078fda0b90ecc040ea8d4ba2130eb46bc567f480.tar.xz
krb5-078fda0b90ecc040ea8d4ba2130eb46bc567f480.zip
Copy and build daemon.c in whatever directories need it, instead of building it
into the krb5 library. * aclocal.m4 (KRB5_AC_NEED_DAEMON): New macro. * appl/bsd/configure.in, kadmin/configure.in, kdc/configure.in, krb524/configure.in, slave/configure.in: Use it. Don't directly check if prototype for daemon() is needed. * kadmin/server/Makefile.in (OBJS), kadmin/v5passwdd/Makefile.in (SERV_OBJS), kdc/Makefile.in (OBJS, fakeka), krb524/Makefile.in (SERVER_OBJS), slave/Makefile.in (SERVEROBJS): Use LIBOBJS. * config/post.in (daemon.c): New rule for copying daemon.c locally from lib/krb5/posix. ticket: 1791 git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15801 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/krb524')
-rw-r--r--src/krb524/ChangeLog6
-rw-r--r--src/krb524/Makefile.in2
-rw-r--r--src/krb524/configure.in4
3 files changed, 8 insertions, 4 deletions
diff --git a/src/krb524/ChangeLog b/src/krb524/ChangeLog
index b5e5b8377..6f7fe60d7 100644
--- a/src/krb524/ChangeLog
+++ b/src/krb524/ChangeLog
@@ -1,3 +1,9 @@
+2003-08-29 Ken Raeburn <raeburn@mit.edu>
+
+ * configure.in: Call KRB5_AC_NEED_DAEMON instead of checking
+ whether daemon() prototype is needed.
+ * Makefile.in (SERVER_OBJS): Use @LIBOBJS@.
+
2003-08-11 Tom Yu <tlyu@mit.edu>
* cnv_tkt_skey.c (krb524_convert_tkt_skey): Call krb_create_ticket
diff --git a/src/krb524/Makefile.in b/src/krb524/Makefile.in
index 3de36c818..3d903cbb5 100644
--- a/src/krb524/Makefile.in
+++ b/src/krb524/Makefile.in
@@ -74,7 +74,7 @@ all-windows:: $(OUTPRE)k524init.exe $(K524LIB)
krb524test: test.o $(KRB5_DEPLIB) $(KRB4COMPAT_DEPLIBS)
$(CC_LINK) -o krb524test test.o $(KRB5_LIB) $(KRB4COMPAT_LIBS)
-SERVER_OBJS= krb524d.o cnv_tkt_skey.o conv_princ.o
+SERVER_OBJS= krb524d.o cnv_tkt_skey.o conv_princ.o @LIBOBJS@
CLIENT_OBJS= $(OUTPRE)k524init.$(OBJEXT)
krb524d: $(SERVER_OBJS) $(KADMSRV_DEPLIBS) $(KRB5_DEPLIB) $(KRB4COMPAT_DEPLIBS)
diff --git a/src/krb524/configure.in b/src/krb524/configure.in
index 1ffdac7d7..917ce2a72 100644
--- a/src/krb524/configure.in
+++ b/src/krb524/configure.in
@@ -4,9 +4,7 @@ KRB5_BUILD_LIBRARY_STATIC
KRB5_BUILD_LIBOBJS
AC_PROG_AWK
AC_CHECK_HEADERS(sys/select.h unistd.h) dnl
-KRB5_NEED_PROTO([#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif],daemon,1)
+KRB5_AC_NEED_DAEMON
AC_TYPE_SIGNAL
KRB5_BUILD_PROGRAM