diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2003-08-30 01:09:41 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2003-08-30 01:09:41 +0000 |
| commit | 078fda0b90ecc040ea8d4ba2130eb46bc567f480 (patch) | |
| tree | 17742669ee50ebf48072145454fb3fa96b2b5b13 /src/kdc | |
| parent | 8b1bc6112f43e707d007f8b82d6c8c50775c4328 (diff) | |
| download | krb5-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/kdc')
| -rw-r--r-- | src/kdc/ChangeLog | 6 | ||||
| -rw-r--r-- | src/kdc/Makefile.in | 7 | ||||
| -rw-r--r-- | src/kdc/configure.in | 4 |
3 files changed, 11 insertions, 6 deletions
diff --git a/src/kdc/ChangeLog b/src/kdc/ChangeLog index e4d7a9d9ad..95ab689870 100644 --- a/src/kdc/ChangeLog +++ b/src/kdc/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 (OBJS, fakeka): Use @LIBOBJS@. + 2003-06-03 Tom Yu <tlyu@mit.edu> * extern.h (master_princ): Remove realm_mkvno, realm_tgskey, diff --git a/src/kdc/Makefile.in b/src/kdc/Makefile.in index 4608a7bfd7..c57dd4f4d4 100644 --- a/src/kdc/Makefile.in +++ b/src/kdc/Makefile.in @@ -46,7 +46,8 @@ OBJS= \ policy.o \ extern.o \ replay.o \ - kerberos_v4.o + kerberos_v4.o \ + @LIBOBJS@ RT_OBJS= rtest.o \ kdc_util.o \ @@ -73,8 +74,8 @@ krb5kdc: $(OBJS) $(KADMSRV_DEPLIBS) $(KRB4COMPAT_DEPLIBS) rtest: $(RT_OBJS) $(KDB5_DEPLIBS) $(KADM_COMM_DEPLIBS) $(KRB5_BASE_DEPLIBS) $(CC_LINK) -o rtest $(RT_OBJS) $(KDB5_LIBS) $(KADM_COMM_LIBS) $(KRB5_BASE_LIBS) -fakeka: fakeka.o $(KADMSRV_DEPLIBS) $(KRB4COMPAT_DEPLIBS) - $(CC_LINK) -o fakeka fakeka.o $(KADMSRV_LIBS) $(KRB4COMPAT_LIBS) +fakeka: fakeka.o $(KADMSRV_DEPLIBS) $(KRB4COMPAT_DEPLIBS) @LIBOBJS@ + $(CC_LINK) -o fakeka fakeka.o $(KADMSRV_LIBS) $(KRB4COMPAT_LIBS) @LIBOBJS@ check-unix:: rtest KRB5_CONFIG=$(SRCTOP)/config-files/krb5.conf ; export KRB5_CONFIG ;\ diff --git a/src/kdc/configure.in b/src/kdc/configure.in index 620510df3d..9515483ac7 100644 --- a/src/kdc/configure.in +++ b/src/kdc/configure.in @@ -11,9 +11,7 @@ KRB5_NEED_PROTO([#include <string.h> #include <stdlib.h> ],swab,1) dnl -KRB5_NEED_PROTO([#ifdef HAVE_UNISTD_H -#include <unistd.h> -#endif],daemon,1) +KRB5_AC_NEED_DAEMON dnl AC_PROG_AWK KRB5_AC_INET6 |