diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2004-03-05 21:13:22 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2004-03-05 21:13:22 +0000 |
| commit | f88533ff0131a2ba69a4eb3e12b3f6788dbe5ea9 (patch) | |
| tree | 44aadc616c99bb25cd2c2b65896c38f952e3aa98 /src/slave | |
| parent | 3437bb669230b0fb7f9c2462044cda67554e387c (diff) | |
| download | krb5-f88533ff0131a2ba69a4eb3e12b3f6788dbe5ea9.tar.gz krb5-f88533ff0131a2ba69a4eb3e12b3f6788dbe5ea9.tar.xz krb5-f88533ff0131a2ba69a4eb3e12b3f6788dbe5ea9.zip | |
Merge configuration of kdc, krb524, and slave directories into top
level configure script.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16147 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/slave')
| -rw-r--r-- | src/slave/ChangeLog | 8 | ||||
| -rw-r--r-- | src/slave/Makefile.in | 9 | ||||
| -rw-r--r-- | src/slave/configure.in | 10 |
3 files changed, 13 insertions, 14 deletions
diff --git a/src/slave/ChangeLog b/src/slave/ChangeLog index ef545392f..41cae76aa 100644 --- a/src/slave/ChangeLog +++ b/src/slave/ChangeLog @@ -1,3 +1,11 @@ +2004-03-05 Ken Raeburn <raeburn@mit.edu> + + * configure.in: Removed. Directory configured from top level + now. + * Makefile.in (thisconfigdir, mydir): Updated. + (MY_SUBDIRS): Define to just ".". + (kprop, kpropd): Link against @LIBUTIL@. + 2004-02-24 Ken Raeburn <raeburn@mit.edu> * Makefile.in (SERVEROBJS, kpropd): Link against apputils lib diff --git a/src/slave/Makefile.in b/src/slave/Makefile.in index 3ef6d5617..1f97c8d7c 100644 --- a/src/slave/Makefile.in +++ b/src/slave/Makefile.in @@ -1,6 +1,7 @@ -thisconfigdir=. +thisconfigdir=.. myfulldir=slave -mydir=. +mydir=slave +MY_SUBDIRS=. BUILDTOP=$(REL).. PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) @@ -17,10 +18,10 @@ SRCS= $(CLIENTSRCS) $(SERVERSRCS) kprop: $(CLIENTOBJS) $(KRB5_BASE_DEPLIBS) - $(CC_LINK) -o kprop $(CLIENTOBJS) $(KRB5_BASE_LIBS) + $(CC_LINK) -o kprop $(CLIENTOBJS) $(KRB5_BASE_LIBS) @LIBUTIL@ kpropd: $(SERVEROBJS) $(KRB5_BASE_DEPLIBS) $(APPUTILS_DEPLIB) - $(CC_LINK) -o kpropd $(SERVEROBJS) $(KRB5_BASE_LIBS) $(APPUTILS_LIB) + $(CC_LINK) -o kpropd $(SERVEROBJS) $(KRB5_BASE_LIBS) $(APPUTILS_LIB) @LIBUTIL@ install:: for f in kprop kpropd; do \ diff --git a/src/slave/configure.in b/src/slave/configure.in deleted file mode 100644 index 1ce9f0317..000000000 --- a/src/slave/configure.in +++ /dev/null @@ -1,10 +0,0 @@ -AC_INIT(kprop.c) -CONFIG_RULES -AC_TYPE_MODE_T -AC_PROG_INSTALL -AC_CHECK_LIB(util,main) -KRB5_AC_NEED_DAEMON -KRB5_GETSOCKNAME_ARGS -KRB5_GETPEERNAME_ARGS -KRB5_BUILD_PROGRAM -V5_AC_OUTPUT_MAKEFILE |