Makefile.in: Build logger.o from the libkadm5 directory. This

	is prepatory work towards eliminating the dependency on
	libkadm5.  Ultimately we will probably need to rethink how
	the library structure for krb5....

configure.in: Add -lgssapi and -lgssrpc to libraries linked with
	krb5kdc since they are needed for shared libraries.  This
	is a horrible hack....

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

diff --git a/src/kdc/ChangeLog b/src/kdc/ChangeLog
index eca2edc6997943f599ab2a2a3e73fce11bc23879..c65ee193db9cd7ae24df2770507c93c5c5d3b513 100644 (file)
--- a/src/kdc/ChangeLog
+++ b/src/kdc/ChangeLog
@@ -1,3 +1,14 @@
+Tue Jul 23 22:26:29 1996  Theodore Y. Ts'o  <tytso@mit.edu>
+
+       * Makefile.in: Build logger.o from the libkadm5 directory.  This
+               is prepatory work towards eliminating the dependency on
+               libkadm5.  Ultimately we will probably need to rethink how
+               the library structure for krb5....
+
+       * configure.in: Add -lgssapi and -lgssrpc to libraries linked with
+               krb5kdc since they are needed for shared libraries.  This
+               is a horrible hack....
+
 Thu Jun 13 22:09:34 1996  Tom Yu  <tlyu@voltage-multiplier.mit.edu>
 
        * configure.in: remove ref to ET_RULES

diff --git a/src/kdc/Makefile.in b/src/kdc/Makefile.in
index 3145e1cac3734fba280918f4a129294b1edebf1d..dec56bbacfa699bdd8248e13e701d1baa5a68241 100644 (file)
--- a/src/kdc/Makefile.in
+++ b/src/kdc/Makefile.in
@@ -14,6 +14,7 @@ SRCS= \
        $(srcdir)/do_tgs_req.c \
        $(srcdir)/kdc_util.c \
        $(srcdir)/kdc_preauth.c \
+       $(SRCTOP)/lib/kadm5/logger.c \
        $(srcdir)/main.c \
        $(srcdir)/network.c \
        $(srcdir)/policy.c \
@@ -28,6 +29,7 @@ OBJS= \
        do_tgs_req.o \
        kdc_util.o \
        kdc_preauth.o \
+       logger.o \
        main.o \
        network.o \
        policy.o \
@@ -39,6 +41,11 @@ all::        krb5kdc
 
 depend:: kdc5_err.c
 
+logger.c: $(SRCTOP)/lib/kadm5/logger.c
+       $(CP) $(SRCTOP)/lib/kadm5/logger.c logger.c
+
+logger.o: logger.c
+
 kdc5_err.c: kdc5_err.et
 
 kdc5_err.h: kdc5_err.et
@@ -53,5 +60,5 @@ install::
        $(INSTALL_DATA) $(srcdir)/krb5kdc.M ${DESTDIR}$(SERVER_MANDIR)/krb5kdc.8
 
 clean::
-       $(RM) kdc5_err.h kdc5_err.c krb5kdc
+       $(RM) kdc5_err.h kdc5_err.c krb5kdc logger.c
 

diff --git a/src/kdc/configure.in b/src/kdc/configure.in
index 163060e7236fdd9029afb0033e2428c51a367335..57f59afc3700018d46236dccf16da6970bd97b6b 100644 (file)
--- a/src/kdc/configure.in
+++ b/src/kdc/configure.in
@@ -2,7 +2,8 @@ AC_INIT(main.c)
 CONFIG_RULES
 AC_PROG_INSTALL
 AC_HEADER_CHECK(termios.h,AC_FUNC_CHECK([tcsetattr],AC_DEFINE(POSIX_TERMIOS)))
-AC_CHECK_HEADERS(sys/select.h)
+AC_CHECK_HEADERS(syslog.h stdarg.h sys/select.h)
+AC_CHECK_FUNCS(openlog syslog closelog strftime vsprintf)
 AC_PROG_AWK
 HAS_ANSI_VOLATILE
 dnl
@@ -31,7 +32,20 @@ if test "$withval" = yes; then
        AC_DEFINE(KRBCONF_KDC_MODIFIES_KDB)
 fi
 dnl
+
+dnl
+dnl This is a horrible hack, based on the fact that we have to drag 
+dnl stuff from alt_prof.c, which depends on str_conv.c, which depends on
+dnl far too much other stuff!  The problem is that shared libraries require
+dnl that you link in all other libraries that depend on it.
+dnl
+dnl XXX we need to rethink where things go.
+dnl 
 USE_KADMSRV_LIBRARY
+USE_GSSRPC_LIBRARY
+USE_GSSAPI_LIBRARY
+dnl
+dnl
 USE_KDB5_LIBRARY
 USE_KRB4_LIBRARY
 KRB5_LIBRARIES