aboutsummaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorKen Raeburn <raeburn@mit.edu>2006-05-31 00:09:31 +0000
committerKen Raeburn <raeburn@mit.edu>2006-05-31 00:09:31 +0000
commit246523a6906c8e5c744360f53721c83feb719581 (patch)
tree63354fa1894168d23f7d020be54163d069a3f25c /src/lib
parent47e795e735027ca77fa2f64462b77b53ac0169a8 (diff)
downloadkrb5-246523a6906c8e5c744360f53721c83feb719581.zip
krb5-246523a6906c8e5c744360f53721c83feb719581.tar.gz
krb5-246523a6906c8e5c744360f53721c83feb719581.tar.bz2
Merge about 1/3 of the remaining configure scripts into the top level. This
still leaves out appl and tests, and static library and plugin directories. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@18068 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/gssapi/Makefile.in4
-rw-r--r--src/lib/gssapi/configure.in19
-rw-r--r--src/lib/gssapi/generic/Makefile.in4
-rw-r--r--src/lib/gssapi/krb5/Makefile.in4
-rw-r--r--src/lib/kadm5/Makefile.in4
-rw-r--r--src/lib/kadm5/clnt/Makefile.in4
-rw-r--r--src/lib/kadm5/configure.in23
-rw-r--r--src/lib/kadm5/srv/Makefile.in4
-rw-r--r--src/lib/kadm5/unit-test/Makefile.in4
-rw-r--r--src/lib/krb5/Makefile.in4
-rw-r--r--src/lib/krb5/asn.1/Makefile.in4
-rw-r--r--src/lib/krb5/ccache/Makefile.in4
-rw-r--r--src/lib/krb5/configure.in23
-rw-r--r--src/lib/krb5/error_tables/Makefile.in4
-rw-r--r--src/lib/krb5/keytab/Makefile.in4
-rw-r--r--src/lib/krb5/krb/Makefile.in4
-rw-r--r--src/lib/krb5/os/Makefile.in4
-rw-r--r--src/lib/krb5/rcache/Makefile.in4
-rw-r--r--src/lib/rpc/Makefile.in8
-rw-r--r--src/lib/rpc/configure.in175
-rw-r--r--src/lib/rpc/unit-test/Makefile.in4
-rw-r--r--src/lib/rpc/unit-test/configure.in29
22 files changed, 37 insertions, 304 deletions
diff --git a/src/lib/gssapi/Makefile.in b/src/lib/gssapi/Makefile.in
index 4ef0253..daf0818 100644
--- a/src/lib/gssapi/Makefile.in
+++ b/src/lib/gssapi/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=.
+thisconfigdir=../..
myfulldir=lib/gssapi
-mydir=.
+mydir=lib/gssapi
BUILDTOP=$(REL)..$(S)..
LOCAL_SUBDIRS= generic krb5
DEFS=
diff --git a/src/lib/gssapi/configure.in b/src/lib/gssapi/configure.in
deleted file mode 100644
index 0b88059..0000000
--- a/src/lib/gssapi/configure.in
+++ /dev/null
@@ -1,19 +0,0 @@
-K5_AC_INIT(configure.in)
-CONFIG_RULES
-AC_PROG_AWK
-AC_CHECK_HEADERS(stdlib.h sys/types.h limits.h memory.h)
-AC_CHECK_HEADER(stdint.h,[
- include_stdint='awk '\''END{printf("%cinclude <stdint.h>\n", 35);}'\'' < /dev/null'],
- include_stdint='echo "/* no stdint.h */"')
-AC_SUBST(include_stdint)
-AC_CHECK_HEADER(inttypes.h,[
- include_inttypes='awk '\''END{printf("%cinclude <inttypes.h>\n", 35);}'\'' < /dev/null'],
- include_inttypes='echo "/* no inttypes.h */"')
-AC_SUBST(include_inttypes)
-AC_CHECK_HEADER(xom.h,[
- include_xom='awk '\''END{printf("%cinclude <xom.h>\n", 35);}'\'' < /dev/null'], [
- include_xom='echo "/* no xom.h */"'])
-AC_SUBST(include_xom)
-KRB5_BUILD_LIBOBJS
-KRB5_BUILD_LIBRARY_WITH_DEPS
-V5_AC_OUTPUT_MAKEFILE(. generic krb5)
diff --git a/src/lib/gssapi/generic/Makefile.in b/src/lib/gssapi/generic/Makefile.in
index cfdc1a7..9dfa68e 100644
--- a/src/lib/gssapi/generic/Makefile.in
+++ b/src/lib/gssapi/generic/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=./..
+thisconfigdir=../../..
myfulldir=lib/gssapi/generic
-mydir=generic
+mydir=lib/gssapi/generic
BUILDTOP=$(REL)..$(S)..$(S)..
LOCALINCLUDES = -I. -I$(srcdir)
DEFS=
diff --git a/src/lib/gssapi/krb5/Makefile.in b/src/lib/gssapi/krb5/Makefile.in
index 217236d..7d9e882 100644
--- a/src/lib/gssapi/krb5/Makefile.in
+++ b/src/lib/gssapi/krb5/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=./..
+thisconfigdir=../../..
myfulldir=lib/gssapi/krb5
-mydir=krb5
+mydir=lib/gssapi/krb5
BUILDTOP=$(REL)..$(S)..$(S)..
LOCALINCLUDES = -I. -I$(srcdir) -I$(srcdir)/.. -I../generic -I$(srcdir)/../generic
DEFS=
diff --git a/src/lib/kadm5/Makefile.in b/src/lib/kadm5/Makefile.in
index a198c23..a597a36 100644
--- a/src/lib/kadm5/Makefile.in
+++ b/src/lib/kadm5/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=.
+thisconfigdir=../..
myfulldir=lib/kadm5
-mydir=.
+mydir=lib/kadm5
BUILDTOP=$(REL)..$(S)..
LOCAL_SUBDIRS = clnt srv unit-test
DEFS=
diff --git a/src/lib/kadm5/clnt/Makefile.in b/src/lib/kadm5/clnt/Makefile.in
index 738f351..ed0cb41 100644
--- a/src/lib/kadm5/clnt/Makefile.in
+++ b/src/lib/kadm5/clnt/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=./..
+thisconfigdir=../../..
myfulldir=lib/kadm5/clnt
-mydir=clnt
+mydir=lib/kadm5/clnt
BUILDTOP=$(REL)..$(S)..$(S)..
LOCALINCLUDES = -I$(BUILDTOP)/include/kadm5
DEFS=
diff --git a/src/lib/kadm5/configure.in b/src/lib/kadm5/configure.in
deleted file mode 100644
index f9193a3..0000000
--- a/src/lib/kadm5/configure.in
+++ /dev/null
@@ -1,23 +0,0 @@
-K5_AC_INIT(configure.in)
-CONFIG_RULES
-AC_PROG_LEX
-AC_PROG_AWK
-AC_CHECK_HEADERS(syslog.h memory.h)
-AC_CHECK_FUNCS(openlog syslog closelog strftime vsprintf)
-KRB5_AC_REGEX_FUNCS
-dnl The following are tests for the presence of programs required for testing
-AC_CHECK_PROG(RUNTEST,runtest,runtest)
-AC_CHECK_PROG(PERL,perl,perl)
-AC_CHECK_FUNCS(srand48 srand srandom)
-AC_KRB5_TCL
-if test "$PERL" = perl -a "$RUNTEST" = runtest -a "$TCL_LIBS" != ""; then
- DO_TEST=ok
-fi
-AC_SUBST(DO_TEST)
-dnl
-KRB5_BUILD_LIBOBJS
-KRB5_BUILD_LIBRARY_WITH_DEPS
-KRB5_BUILD_PROGRAM
-KRB5_AC_PRIOCNTL_HACK
-dnl
-V5_AC_OUTPUT_MAKEFILE(. clnt srv unit-test)
diff --git a/src/lib/kadm5/srv/Makefile.in b/src/lib/kadm5/srv/Makefile.in
index 84cdb7b..63d9c5a 100644
--- a/src/lib/kadm5/srv/Makefile.in
+++ b/src/lib/kadm5/srv/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=./..
+thisconfigdir=../../..
myfulldir=lib/kadm5/srv
-mydir=srv
+mydir=lib/kadm5/srv
BUILDTOP=$(REL)..$(S)..$(S)..
LOCALINCLUDES = -I$(BUILDTOP)/include/kadm5 \
-I$(SRCTOP)/lib/gssapi/krb5 -I$(SRCTOP)/lib/gssapi/generic \
diff --git a/src/lib/kadm5/unit-test/Makefile.in b/src/lib/kadm5/unit-test/Makefile.in
index a69a113..c9c3f4f 100644
--- a/src/lib/kadm5/unit-test/Makefile.in
+++ b/src/lib/kadm5/unit-test/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=./..
+thisconfigdir=../../..
myfulldir=lib/kadm5/unit-test
-mydir=unit-test
+mydir=lib/kadm5/unit-test
BUILDTOP=$(REL)..$(S)..$(S)..
DEFINES = -DUSE_KADM5_API_VERSION=1
PROG_LIBPATH=-L$(TOPLIBD)
diff --git a/src/lib/krb5/Makefile.in b/src/lib/krb5/Makefile.in
index 222c1ee..fcf2ea2 100644
--- a/src/lib/krb5/Makefile.in
+++ b/src/lib/krb5/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=.
+thisconfigdir=../..
myfulldir=lib/krb5
-mydir=.
+mydir=lib/krb5
BUILDTOP=$(REL)..$(S)..
LOCALINCLUDES = -I$(srcdir)/ccache -I$(srcdir)/keytab -I$(srcdir)/rcache -I$(srcdir)/os
LOCAL_SUBDIRS= error_tables asn.1 ccache keytab krb os rcache
diff --git a/src/lib/krb5/asn.1/Makefile.in b/src/lib/krb5/asn.1/Makefile.in
index d903c8e..3c440fe 100644
--- a/src/lib/krb5/asn.1/Makefile.in
+++ b/src/lib/krb5/asn.1/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=./..
+thisconfigdir=../../..
myfulldir=lib/krb5/asn.1
-mydir=asn.1
+mydir=lib/krb5/asn.1
BUILDTOP=$(REL)..$(S)..$(S)..
DEFS=
diff --git a/src/lib/krb5/ccache/Makefile.in b/src/lib/krb5/ccache/Makefile.in
index 99241c9..7906aeb 100644
--- a/src/lib/krb5/ccache/Makefile.in
+++ b/src/lib/krb5/ccache/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=./..
+thisconfigdir=../../..
myfulldir=lib/krb5/ccache
-mydir=ccache
+mydir=lib/krb5/ccache
BUILDTOP=$(REL)..$(S)..$(S)..
LOCAL_SUBDIRS =
DEFS=
diff --git a/src/lib/krb5/configure.in b/src/lib/krb5/configure.in
deleted file mode 100644
index 2559d35..0000000
--- a/src/lib/krb5/configure.in
+++ /dev/null
@@ -1,23 +0,0 @@
-K5_AC_INIT(configure.in)
-CONFIG_RULES
-AC_PROG_AWK
-dnl
-AC_C_CONST
-AC_TYPE_UID_T
-AC_TYPE_OFF_T
-dnl
-dnl
-KRB5_AC_REGEX_FUNCS
-KRB5_NEED_PROTO([#include <time.h>],strptime)
-dnl
-KRB5_SIGTYPE
-CHECK_SIGNALS
-KRB5_SOCKADDR_SA_LEN
-KRB5_GETPEERNAME_ARGS
-KRB5_GETSOCKNAME_ARGS
-KRB5_BUILD_LIBRARY_WITH_DEPS
-KRB5_BUILD_LIBOBJS
-KRB5_BUILD_PROGRAM
-KRB5_RUN_FLAGS
-dnl
-V5_AC_OUTPUT_MAKEFILE(. error_tables asn.1 ccache keytab krb rcache os)
diff --git a/src/lib/krb5/error_tables/Makefile.in b/src/lib/krb5/error_tables/Makefile.in
index 3d8a8fb..df4191f 100644
--- a/src/lib/krb5/error_tables/Makefile.in
+++ b/src/lib/krb5/error_tables/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=./..
+thisconfigdir=../../..
myfulldir=lib/krb5/error_tables
-mydir=error_tables
+mydir=lib/krb5/error_tables
BUILDTOP=$(REL)..$(S)..$(S)..
DEFS=
diff --git a/src/lib/krb5/keytab/Makefile.in b/src/lib/krb5/keytab/Makefile.in
index 11ab55d..73b11f7 100644
--- a/src/lib/krb5/keytab/Makefile.in
+++ b/src/lib/krb5/keytab/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=./..
+thisconfigdir=../../..
myfulldir=lib/krb5/keytab
-mydir=keytab
+mydir=lib/krb5/keytab
BUILDTOP=$(REL)..$(S)..$(S)..
DEFS=
diff --git a/src/lib/krb5/krb/Makefile.in b/src/lib/krb5/krb/Makefile.in
index 270feab..edf6d5f 100644
--- a/src/lib/krb5/krb/Makefile.in
+++ b/src/lib/krb5/krb/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=./..
+thisconfigdir=../../..
myfulldir=lib/krb5/krb
-mydir=krb
+mydir=lib/krb5/krb
BUILDTOP=$(REL)..$(S)..$(S)..
RUN_SETUP = @KRB5_RUN_ENV@
PROG_LIBPATH=-L$(TOPLIBD)
diff --git a/src/lib/krb5/os/Makefile.in b/src/lib/krb5/os/Makefile.in
index abce069..db391ab 100644
--- a/src/lib/krb5/os/Makefile.in
+++ b/src/lib/krb5/os/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=./..
+thisconfigdir=../../..
myfulldir=lib/krb5/os
-mydir=os
+mydir=lib/krb5/os
BUILDTOP=$(REL)..$(S)..$(S)..
KRB5_RUN_ENV = @KRB5_RUN_ENV@
PROG_LIBPATH=-L$(TOPLIBD)
diff --git a/src/lib/krb5/rcache/Makefile.in b/src/lib/krb5/rcache/Makefile.in
index 2b886bf..05b7609 100644
--- a/src/lib/krb5/rcache/Makefile.in
+++ b/src/lib/krb5/rcache/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=./..
+thisconfigdir=../../..
myfulldir=lib/krb5/rcache
-mydir=rcache
+mydir=lib/krb5/rcache
BUILDTOP=$(REL)..$(S)..$(S)..
DEFS=
diff --git a/src/lib/rpc/Makefile.in b/src/lib/rpc/Makefile.in
index 02eb370..1d3c6ea 100644
--- a/src/lib/rpc/Makefile.in
+++ b/src/lib/rpc/Makefile.in
@@ -1,10 +1,12 @@
-thisconfigdir=.
+thisconfigdir=../..
myfulldir=lib/rpc
-mydir=.
+mydir=lib/rpc
BUILDTOP=$(REL)..$(S)..
DEFINES = -DGSSAPI_KRB5 -DDEBUG_GSSAPI=0 -DGSSRPC__IMPL
DEFS=
+SUBDIRS=unit-test
+
##DOSBUILDTOP = ..\..
##DOSLIBNAME=libgssrpc.lib
@@ -267,7 +269,7 @@ do-dyn-lclint::
# makefile post-processing is unconditional and would trash the makefile.
types.h: types.stamp
types.stamp: $(srcdir)/types.hin config.status
- $(SHELL) config.status
+ cd $(thisconfigdir) && $(SHELL) config.status $(mydir)/types.h
touch types.stamp
clean-unix::
diff --git a/src/lib/rpc/configure.in b/src/lib/rpc/configure.in
deleted file mode 100644
index 2b76c4a..0000000
--- a/src/lib/rpc/configure.in
+++ /dev/null
@@ -1,175 +0,0 @@
-K5_AC_INIT(auth_gssapi.c)
-CONFIG_RULES
-AC_CONFIG_SUBDIRS(unit-test)
-AC_CHECK_HEADERS(sys/uio.h sys/param.h)
-AC_TYPE_GETGROUPS
-### Check where struct rpcent is declared.
-#
-# This is necessary to determine:
-# 1. If /usr/include/netdb.h declares struct rpcent
-# 2. If /usr/include/rpc/netdb.h declares struct rpcent
-#
-# We have our own rpc/netdb.h, and if /usr/include/netdb.h includes
-# rpc/netdb.h, then nastiness could happen.
-#
-# Logic: If /usr/include/netdb.h declares struct rpcent, then check
-# rpc/netdb.h. If /usr/include/rpc/netdb.h declares struct rpcent,
-# then define STRUCT_RPCENT_IN_RPC_NETDB_H, otherwise do not. If
-# neither netdb.h nor rpc/netdb.h declares struct rpcent, then define
-# STRUCT_RPCENT_IN_RPC_NETDB_H anyway.
-#
-AC_MSG_CHECKING([where struct rpcent is declared])
-AC_TRY_COMPILE([#include <netdb.h>],
-[struct rpcent e;
-char c = e.r_name[0];
-int i = e.r_number;],
-[AC_TRY_COMPILE([#include <rpc/netdb.h>],
-[struct rpcent e;
-char c = e.r_name[0];
-int i = e.r_number;],
-[AC_MSG_RESULT([rpc/netdb.h])
-rpcent_define='#define STRUCT_RPCENT_IN_RPC_NETDB_H'],
-[AC_MSG_RESULT([netdb.h])])],
-[AC_MSG_RESULT([nowhere])
-rpcent_define='#define STRUCT_RPCENT_IN_RPC_NETDB_H'])
-AC_SUBST(rpcent_define)
-
-AC_CHECK_HEADERS(sys/select.h sys/time.h unistd.h)
-if test $ac_cv_header_sys_select_h = yes; then
- GSSRPC__SYS_SELECT_H='#include <sys/select.h>'
-else
- GSSRPC__SYS_SELECT_H='/* #include <sys/select.h> */'
-fi
-AC_SUBST(GSSRPC__SYS_SELECT_H)
-if test $ac_cv_header_sys_time_h = yes; then
- GSSRPC__SYS_TIME_H='#include <sys/time.h>'
-else
- GSSRPC__SYS_TIME_H='/* #include <sys/time.h> */'
-fi
-AC_SUBST(GSSRPC__SYS_TIME_H)
-if test $ac_cv_header_unistd_h = yes; then
- GSSRPC__UNISTD_H='#include <unistd.h>'
-else
- GSSRPC__UNISTD_H='/* #include <unistd.h> */'
-fi
-AC_SUBST(GSSRPC__UNISTD_H)
-
-AC_CACHE_CHECK([for MAXHOSTNAMELEN in sys/param.h],
- [krb5_cv_header_sys_param_h_maxhostnamelen],
- [AC_TRY_COMPILE([#include <sys/param.h>],
- [int i = MAXHOSTNAMELEN;],
- [krb5_cv_header_sys_param_h_maxhostnamelen=yes],
- [krb5_cv_header_sys_param_h_maxhostnamelen=no])])
-AC_CACHE_CHECK([for MAXHOSTNAMELEN in netdb.h],
- [krb5_cv_header_netdb_h_maxhostnamelen],
- [AC_TRY_COMPILE([#include <netdb.h>],
- [int i = MAXHOSTNAMELEN;],
- [krb5_cv_header_netdb_h_maxhostnamelen=yes],
- [krb5_cv_header_netdb_h_maxhostnamelen=no])])
-
-GSSRPC__SYS_PARAM_H='/* #include <sys/param.h> */'
-GSSRPC__NETDB_H='/* #include <netdb.h> */'
-if test $krb5_cv_header_sys_param_h_maxhostnamelen = yes; then
- GSSRPC__SYS_PARAM_H='#include <sys/param.h>'
-else
- if test $krb5_cv_header_netdb_h_maxhostnamelen = yes; then
- GSSRPC__NETDB_H='#include <netdb.h>'
- else
- AC_MSG_WARN([can't find MAXHOSTNAMELEN definition; faking it])
- fi
-fi
-AC_SUBST(GSSRPC__SYS_PARAM_H)
-AC_SUBST(GSSRPC__NETDB_H)
-
-AC_CACHE_CHECK([for uint32_t in sys/types.h],
- [krb5_cv_header_sys_types_h_uint32_t],
- [AC_TRY_COMPILE([#include <sys/types.h>],
- [uint32_t i = 0;],
- [krb5_cv_header_sys_types_h_uint32_t=yes],
- [krb5_cv_header_sys_types_h_uint32_t=no])])
-AC_CACHE_CHECK([for uint32_t in stdint.h],
- [krb5_cv_header_stdint_h_uint32_t],
- [AC_TRY_COMPILE([#include <stdint.h>],
- [uint32_t i = 0;],
- [krb5_cv_header_stdint_h_uint32_t=yes],
- [krb5_cv_header_stdint_h_uint32_t=no])])
-AC_CACHE_CHECK([for uint32_t in inttypes.h],
- [krb5_cv_header_inttypes_h_uint32_t],
- [AC_TRY_COMPILE([#include <inttypes.h>],
- [uint32_t i = 0;],
- [krb5_cv_header_inttypes_h_uint32_t=yes],
- [krb5_cv_header_inttypes_h_uint32_t=no])])
-GSSRPC__STDINT_H='/* #include <stdint.h> */'
-GSSRPC__INTTYPES_H='/* #include <inttypes.h> */'
-GSSRPC__FAKE_UINT32='/* #undef GSSRPC__FAKE_INT32 */'
-if test $krb5_cv_header_sys_types_h_uint32_t = yes; then
- : # already included sys/types.h
-else
- if test $krb5_cv_header_stdint_h_uint32_t = yes; then
- GSSRPC__STDINT_H='#include <stdint.h>'
- else
- if test $krb5_cv_header_inttypes_h_uint32_t = yes; then
- GSSRPC__INTTYPES_H='#include <inttypes.h>'
- else
- AC_MSG_WARN([can't find a fixed-width 32-bit type anywhere; faking it])
- GSSRPC__FAKE_UINT32='#define GSSRPC__FAKE_UINT32 1'
- fi
- fi
-fi
-AC_SUBST(GSSRPC__STDINT_H)
-AC_SUBST(GSSRPC__INTTYPES_H)
-AC_SUBST(GSSRPC__FAKE_UINT32)
-
-AC_CACHE_CHECK([for BSD type aliases], [krb5_cv_type_bsdaliases],
- [AC_TRY_COMPILE(
- [#include <sys/types.h>
-#if HAVE_UNISTD_H
-#include <unistd.h>
-#endif],
- [u_char c;
-u_int i;
-u_long l;], [krb5_cv_type_bsdaliases=yes], [krb5_cv_type_bsdaliases=no])])
-if test $krb5_cv_type_bsdaliases = yes; then
- GSSRPC__BSD_TYPEALIASES='/* #undef GSSRPC__BSD_TYPEALIASES */'
-else
- GSSRPC__BSD_TYPEALIASES='#define GSSRPC__BSD_TYPEALIASES 1'
-fi
-AC_SUBST(GSSRPC__BSD_TYPEALIASES)
-
-AC_CHECK_FUNCS(strerror)
-#
-# sockaddr length field checks
-#
-AC_CHECK_MEMBERS([struct sockaddr_in.sin_len], , ,
- [#include <sys/types.h>
-@%:@include <netinet/in.h>])
-AC_CHECK_MEMBERS([struct sockaddr.sa_len], , ,
- [#include <sys/types.h>
-@%:@include <sys/socket.h>])
-
-AC_MSG_CHECKING([return type of setrpcent])
-AC_CACHE_VAL(k5_cv_type_setrpcent,
-[AC_TRY_COMPILE([#include <netdb.h>
-#ifdef __cplusplus
-extern "C"
-#endif
-extern void setrpcent();],
-[int i;], k5_cv_type_setrpcent=void, k5_cv_type_setrpcent=int)])dnl
-AC_MSG_RESULT($k5_cv_type_setrpcent)
-AC_DEFINE_UNQUOTED(SETRPCENT_TYPE, $k5_cv_type_setrpcent, [Define as return type of setrpcent])
-dnl
-AC_MSG_CHECKING([return type of endrpcent])
-AC_CACHE_VAL(k5_cv_type_endrpcent,
-[AC_TRY_COMPILE([#include <netdb.h>
-#ifdef __cplusplus
-extern "C"
-#endif
-extern void endrpcent();],
-[int i;], k5_cv_type_endrpcent=void, k5_cv_type_endrpcent=int)])dnl
-AC_MSG_RESULT($k5_cv_type_endrpcent)
-AC_DEFINE_UNQUOTED(ENDRPCENT_TYPE, $k5_cv_type_endrpcent, [Define as return type of endrpcent])
-DECLARE_SYS_ERRLIST
-KRB5_BUILD_LIBOBJS
-KRB5_BUILD_LIBRARY_WITH_DEPS
-K5_GEN_FILE(types.h:types.hin)
-V5_AC_OUTPUT_MAKEFILE
diff --git a/src/lib/rpc/unit-test/Makefile.in b/src/lib/rpc/unit-test/Makefile.in
index 8cc0309..7795937 100644
--- a/src/lib/rpc/unit-test/Makefile.in
+++ b/src/lib/rpc/unit-test/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=.
+thisconfigdir=../../..
myfulldir=lib/rpc/unit-test
-mydir=.
+mydir=lib/rpc/unit-test
BUILDTOP=$(REL)..$(S)..$(S)..
LOCALINCLUDES = -I.
PROG_LIBPATH=-L$(TOPLIBD)
diff --git a/src/lib/rpc/unit-test/configure.in b/src/lib/rpc/unit-test/configure.in
deleted file mode 100644
index 6a6bcf1..0000000
--- a/src/lib/rpc/unit-test/configure.in
+++ /dev/null
@@ -1,29 +0,0 @@
-K5_AC_INIT(client.c)
-CONFIG_RULES
-dnl sets $(krb5_cv_host)
-KRB5_BUILD_PROGRAM
-dnl
-AC_CHECK_HEADERS(unistd.h)
-dnl The following are tests for the presence of programs required for testing
-AC_CHECK_PROG(RUNTEST,runtest,runtest)
-AC_CHECK_PROG(PERL,perl,perl)
-AC_KRB5_TCL
-if test "$PERL" = perl -a "$RUNTEST" = runtest -a "$TCL_LIBS" != ""; then
- DO_TEST=ok
-fi
-AC_SUBST(DO_TEST)
-changequote(<<, >>)
-case "$krb5_cv_host" in
-*-*-solaris2.[012345]*)
- PASS=tcp
- ;;
-*)
- PASS="tcp udp"
- ;;
-esac
-changequote([, ])
-AC_SUBST(PASS)
-dnl
-CHECK_SIGNALS
-KRB5_AC_PRIOCNTL_HACK
-V5_AC_OUTPUT_MAKEFILE