aboutsummaryrefslogtreecommitdiff
path: root/src/appl
diff options
context:
space:
mode:
authorKen Raeburn <raeburn@mit.edu>2007-03-25 23:08:25 +0000
committerKen Raeburn <raeburn@mit.edu>2007-03-25 23:08:25 +0000
commit83262b851983c409a039b0973c57d645b37916df (patch)
treea297f067a0e7047c6aa63399170cf672610761fe /src/appl
parentb0972208c0e49a6f18e6e0d881fe0237b330c46c (diff)
downloadkrb5-83262b851983c409a039b0973c57d645b37916df.zip
krb5-83262b851983c409a039b0973c57d645b37916df.tar.gz
krb5-83262b851983c409a039b0973c57d645b37916df.tar.bz2
Configure appl test programs from top level
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19272 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/appl')
-rw-r--r--src/appl/Makefile.in7
-rw-r--r--src/appl/configure.in21
-rw-r--r--src/appl/gss-sample/Makefile.in4
-rw-r--r--src/appl/sample/Makefile.in4
-rw-r--r--src/appl/sample/sclient/Makefile.in4
-rw-r--r--src/appl/sample/sserver/Makefile.in4
-rw-r--r--src/appl/simple/Makefile.in4
-rw-r--r--src/appl/simple/client/Makefile.in4
-rw-r--r--src/appl/simple/server/Makefile.in4
-rw-r--r--src/appl/user_user/Makefile.in4
10 files changed, 20 insertions, 40 deletions
diff --git a/src/appl/Makefile.in b/src/appl/Makefile.in
index 2a7d80a..abe6c0b 100644
--- 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
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 f43bdc9..774de0c 100644
--- 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 a580359..4047796 100644
--- 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 868f678..db69a13 100644
--- 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 32e8864..e5ca92f 100644
--- 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 9e6f16d..11d945f 100644
--- 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 c7023ca..c6840fe 100644
--- 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 d670eda..12b2b04 100644
--- 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 e55eda8..b321cc5 100644
--- 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)