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

diff --git a/src/appl/ChangeLog b/src/appl/ChangeLog
index 1b985c600f3cbcef50bf47973b2592af5ae6a870..2e848a3b07feee0f5ff80c59328d7b9bb8224b9a 100644 (file)
--- 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 b3274641e0d271c4a27a18825de6b68464fd0fdf..d29642a6e7e792c73cb1feb4466b479d89079ab4 100644 (file)
--- 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 54e2af32796d7c04fbef53b8aad7c6d37bca9df2..ab1a0674a0f8616920a16ef9215722c45c03fecf 100644 (file)
--- 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