Configure appl test programs from top level

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

diff --git a/src/appl/Makefile.in b/src/appl/Makefile.in
index 2a7d80aea9fc84bca9d04e7db274db2afb2f1993..abe6c0b26e26d36198e2e9acc3fb3f2237825174 100644 (file)
--- a/src/appl/Makefile.in
+++ b/src/appl/Makefile.in
@@ -1,7 +1,8 @@
-thisconfigdir=.
+thisconfigdir=..
 myfulldir=appl
-mydir=.
+mydir=appl
 BUILDTOP=$(REL)..
 
-LOCAL_SUBDIRS= sample simple user_user gss-sample
+LOCAL_SUBDIRS= sample simple user_user gss-sample \
+       libpty bsd gssftp telnet
 

diff --git a/src/appl/configure.in b/src/appl/configure.in
deleted file mode 100644 (file)
index e8d2f65..0000000
--- a/src/appl/configure.in
+++ /dev/null
@@ -1,21 +0,0 @@
-K5_AC_INIT(configure.in)
-CONFIG_RULES
-KRB5_AC_INET6
-AC_PROG_INSTALL
-AC_CHECK_HEADERS(unistd.h stdlib.h string.h)
-AC_C_CONST
-dnl gss-misc.c needs this:
-AC_CHECK_HEADERS(sys/time.h time.h)
-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,1,[Define if socket can't be bound to 0.0.0.0])
-fi
-dnl
-dnl
-KRB5_GETSOCKNAME_ARGS
-KRB5_GETPEERNAME_ARGS
-KRB5_BUILD_PROGRAM
-AC_CONFIG_SUBDIRS(libpty bsd gssftp telnet)
-V5_AC_OUTPUT_MAKEFILE(. sample sample/sclient sample/sserver simple simple/client simple/server gss-sample user_user)

diff --git a/src/appl/gss-sample/Makefile.in b/src/appl/gss-sample/Makefile.in
index f43bdc9d6966893bf4ea384b2be806e39ee50a78..774de0c9e57757c4911f6703b9b695810d6f3b92 100644 (file)
--- a/src/appl/gss-sample/Makefile.in
+++ b/src/appl/gss-sample/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=./..
+thisconfigdir=../..
 myfulldir=appl/gss-sample
-mydir=gss-sample
+mydir=appl/gss-sample
 BUILDTOP=$(REL)..$(S)..
 DEFINES = -DUSE_AUTOCONF_H -DGSSAPI_V2
 PROG_LIBPATH=-L$(TOPLIBD)

diff --git a/src/appl/sample/Makefile.in b/src/appl/sample/Makefile.in
index a580359e4a189728625e4e28880e2baf788365f4..404779611e3daee588b3d8fa004cc9408a2c3f12 100644 (file)
--- a/src/appl/sample/Makefile.in
+++ b/src/appl/sample/Makefile.in
@@ -1,5 +1,5 @@
-thisconfigdir=./..
+thisconfigdir=../..
 myfulldir=appl/sample
-mydir=sample
+mydir=appl/sample
 LOCAL_SUBDIRS = sclient sserver
 BUILDTOP=$(REL)..$(S)..

diff --git a/src/appl/sample/sclient/Makefile.in b/src/appl/sample/sclient/Makefile.in
index 868f678eb6e62064b78f6e53ba92652e91c5f44f..db69a1375200ac02190a121c26a83fd7e27c8fc3 100644 (file)
--- a/src/appl/sample/sclient/Makefile.in
+++ b/src/appl/sample/sclient/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=./../..
+thisconfigdir=../../..
 myfulldir=appl/sample/sclient
-mydir=sample/sclient
+mydir=appl/sample/sclient
 
 BUILDTOP=$(REL)..$(S)..$(S)..
 PROG_LIBPATH=-L$(TOPLIBD)

diff --git a/src/appl/sample/sserver/Makefile.in b/src/appl/sample/sserver/Makefile.in
index 32e8864efa6d3bb2b33a9f2b40f986b511339dbf..e5ca92f69698b7fff7fef237e24562720358b273 100644 (file)
--- a/src/appl/sample/sserver/Makefile.in
+++ b/src/appl/sample/sserver/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=./../..
+thisconfigdir=../../..
 myfulldir=appl/sample/sserver
-mydir=sample/sserver
+mydir=appl/sample/sserver
 
 BUILDTOP=$(REL)..$(S)..$(S)..
 PROG_LIBPATH=-L$(TOPLIBD)

diff --git a/src/appl/simple/Makefile.in b/src/appl/simple/Makefile.in
index 9e6f16da2eab818346982fd5045857b1209be19e..11d945f529ae9db5e5c462f86f4f30a25888625c 100644 (file)
--- a/src/appl/simple/Makefile.in
+++ b/src/appl/simple/Makefile.in
@@ -1,5 +1,5 @@
-thisconfigdir=./..
+thisconfigdir=../..
 myfulldir=appl/simple
-mydir=simple
+mydir=appl/simple
 LOCAL_SUBDIRS = client server
 BUILDTOP=$(REL)..$(S)..

diff --git a/src/appl/simple/client/Makefile.in b/src/appl/simple/client/Makefile.in
index c7023ca1d16c672d9dae36d1d91503ec6542f22e..c6840fe2b4b5e1e39e83943484e7d591344e1a3b 100644 (file)
--- a/src/appl/simple/client/Makefile.in
+++ b/src/appl/simple/client/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=./../..
+thisconfigdir=../../..
 myfulldir=appl/simple/client
-mydir=simple/client
+mydir=appl/simple/client
 BUILDTOP=$(REL)..$(S)..$(S)..
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)

diff --git a/src/appl/simple/server/Makefile.in b/src/appl/simple/server/Makefile.in
index d670edaa724689154066db8c4efe716c9c69a45e..12b2b04ad272c6625dbb7d6b4914cff47e7a34d4 100644 (file)
--- a/src/appl/simple/server/Makefile.in
+++ b/src/appl/simple/server/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=./../..
+thisconfigdir=../../..
 myfulldir=appl/simple/server
-mydir=simple/server
+mydir=appl/simple/server
 BUILDTOP=$(REL)..$(S)..$(S)..
 
 LOCALINCLUDES= -I.. -I$(srcdir)/..

diff --git a/src/appl/user_user/Makefile.in b/src/appl/user_user/Makefile.in
index e55eda8a2131fac8bc8a7f7c94fffb8e8ec0cea1..b321cc5d144d80b227224f7886ee18245c73a9c8 100644 (file)
--- a/src/appl/user_user/Makefile.in
+++ b/src/appl/user_user/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=./..
+thisconfigdir=../..
 myfulldir=appl/user_user
-mydir=user_user
+mydir=appl/user_user
 BUILDTOP=$(REL)..$(S)..
 DEFINES = -DDEBUG
 PROG_LIBPATH=-L$(TOPLIBD)

diff --git a/src/configure.in b/src/configure.in
index 5870854308596c98a62848009dfcb61e1b5a8d14..5ab463272cd6048a32e0f9b0edfa327ab1dbf048 100644 (file)
--- a/src/configure.in
+++ b/src/configure.in
@@ -923,6 +923,15 @@ AC_CONFIG_SUBDIRS(plugins/kdb/db2 plugins/preauth/wpse plugins/preauth/cksum_bod
 
 AC_CHECK_HEADERS(Python.h python2.3/Python.h)
 
+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,1,[Define if socket can't be bound to 0.0.0.0])
+fi
+dnl
+AC_CONFIG_SUBDIRS(appl/libpty appl/bsd appl/gssftp appl/telnet)
+
 AC_CONFIG_FILES(krb5-config, [chmod +x krb5-config])
 V5_AC_OUTPUT_MAKEFILE(.
 
@@ -960,4 +969,8 @@ V5_AC_OUTPUT_MAKEFILE(.
        kadmin/passwd/unit-test kadmin/ktutil kadmin/server
        kadmin/testing kadmin/testing/scripts kadmin/testing/util
 
+       appl
+       appl/sample appl/sample/sclient appl/sample/sserver
+       appl/simple appl/simple/client appl/simple/server
+       appl/gss-sample appl/user_user
 )