diff options
| author | Theodore Tso <tytso@mit.edu> | 1998-11-13 21:10:39 +0000 |
|---|---|---|
| committer | Theodore Tso <tytso@mit.edu> | 1998-11-13 21:10:39 +0000 |
| commit | f2cdf59323862bcf8f8d2ee8b73e4495712ba646 (patch) | |
| tree | 1ccdbde4ac2d191c3a0e4eb9116673246cd7fd20 | |
| parent | b144eab66fe487302900c0dbccb01be3794510fe (diff) | |
| download | krb5-f2cdf59323862bcf8f8d2ee8b73e4495712ba646.tar.gz krb5-f2cdf59323862bcf8f8d2ee8b73e4495712ba646.tar.xz krb5-f2cdf59323862bcf8f8d2ee8b73e4495712ba646.zip | |
Makefile.in: Set the myfulldir and mydir variables (which are relative
to buildtop and thisconfigdir, respectively.) Add a MY_SUBDIRS
definition to control the directories which are recursively descended
by the Makefile.
configure.in: Fold the autoconf tests from the sample, simple,
gss-sample, and user_user directories into this higher-level
configure.in file.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@11032 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/appl/ChangeLog | 11 | ||||
| -rw-r--r-- | src/appl/Makefile.in | 5 | ||||
| -rw-r--r-- | src/appl/configure.in | 25 |
3 files changed, 39 insertions, 2 deletions
diff --git a/src/appl/ChangeLog b/src/appl/ChangeLog index 1b985c600f..2e848a3b07 100644 --- a/src/appl/ChangeLog +++ b/src/appl/ChangeLog @@ -1,3 +1,14 @@ +1998-11-13 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Set the myfulldir and mydir variables (which are + relative to buildtop and thisconfigdir, respectively.) + Add a MY_SUBDIRS definition to control the directories + which are recursively descended by the Makefile. + + * configure.in: Fold the autoconf tests from the sample, simple, + gss-sample, and user_user directories into this + higher-level configure.in file. + Wed Feb 18 15:24:26 1998 Tom Yu <tlyu@mit.edu> * Makefile.in: Remove trailing slash from thisconfigdir. diff --git a/src/appl/Makefile.in b/src/appl/Makefile.in index b3274641e0..d29642a6e7 100644 --- a/src/appl/Makefile.in +++ b/src/appl/Makefile.in @@ -1,3 +1,8 @@ thisconfigdir=. +myfulldir=appl +mydir=. BUILDTOP=$(REL)$(U) CFLAGS = $(CCOPTS) + +MY_SUBDIRS= sample simple user_user bsd gss-sample gssftp telnet + diff --git a/src/appl/configure.in b/src/appl/configure.in index 54e2af3279..ab1a0674a0 100644 --- a/src/appl/configure.in +++ b/src/appl/configure.in @@ -1,4 +1,25 @@ AC_INIT(configure.in) CONFIG_RULES -AC_CONFIG_SUBDIRS(sample simple user_user bsd gss-sample gssftp telnet) -V5_AC_OUTPUT_MAKEFILE +AC_PROG_INSTALL +AC_CHECK_HEADERS(unistd.h stdlib.h string.h) +AC_CONST +dnl +dnl Kludge for simple server --- FIXME is this the best way to do this? +dnl +if test "$ac_cv_lib_socket" = "yes" -a "$ac_cv_lib_nsl" = "yes"; then + AC_DEFINE(BROKEN_STREAMS_SOCKETS) +fi +dnl +dnl +KRB5_BUILD_PROGRAM +AC_CONFIG_SUBDIRS(bsd gssftp telnet) +K5_GEN_MAKEFILE(.) +K5_GEN_MAKEFILE(sample) +K5_GEN_MAKEFILE(sample/sclient) +K5_GEN_MAKEFILE(sample/sserver) +K5_GEN_MAKEFILE(simple) +K5_GEN_MAKEFILE(simple/client) +K5_GEN_MAKEFILE(simple/server) +K5_GEN_MAKEFILE(gss-sample) +K5_GEN_MAKEFILE(user_user) +K5_AC_OUTPUT |