From 246523a6906c8e5c744360f53721c83feb719581 Mon Sep 17 00:00:00 2001 From: Ken Raeburn Date: Wed, 31 May 2006 00:09:31 +0000 Subject: [PATCH] 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 --- src/configure.in | 274 +++++++++++++++++++++++- src/kadmin/Makefile.in | 4 +- src/kadmin/cli/Makefile.in | 4 +- src/kadmin/configure.in | 59 ----- src/kadmin/dbutil/Makefile.in | 4 +- src/kadmin/ktutil/Makefile.in | 4 +- src/kadmin/passwd/Makefile.in | 4 +- src/kadmin/passwd/unit-test/Makefile.in | 4 +- src/kadmin/server/Makefile.in | 4 +- src/kadmin/testing/Makefile.in | 4 +- src/kadmin/testing/scripts/Makefile.in | 10 +- src/kadmin/testing/util/Makefile.in | 4 +- src/lib/gssapi/Makefile.in | 4 +- src/lib/gssapi/configure.in | 19 -- src/lib/gssapi/generic/Makefile.in | 4 +- src/lib/gssapi/krb5/Makefile.in | 4 +- src/lib/kadm5/Makefile.in | 4 +- src/lib/kadm5/clnt/Makefile.in | 4 +- src/lib/kadm5/configure.in | 23 -- src/lib/kadm5/srv/Makefile.in | 4 +- src/lib/kadm5/unit-test/Makefile.in | 4 +- src/lib/krb5/Makefile.in | 4 +- src/lib/krb5/asn.1/Makefile.in | 4 +- src/lib/krb5/ccache/Makefile.in | 4 +- src/lib/krb5/configure.in | 23 -- src/lib/krb5/error_tables/Makefile.in | 4 +- src/lib/krb5/keytab/Makefile.in | 4 +- src/lib/krb5/krb/Makefile.in | 4 +- src/lib/krb5/os/Makefile.in | 4 +- src/lib/krb5/rcache/Makefile.in | 4 +- src/lib/rpc/Makefile.in | 8 +- src/lib/rpc/configure.in | 175 --------------- src/lib/rpc/unit-test/Makefile.in | 4 +- src/lib/rpc/unit-test/configure.in | 29 --- 34 files changed, 330 insertions(+), 390 deletions(-) delete mode 100644 src/kadmin/configure.in delete mode 100644 src/lib/gssapi/configure.in delete mode 100644 src/lib/kadm5/configure.in delete mode 100644 src/lib/krb5/configure.in delete mode 100644 src/lib/rpc/configure.in delete mode 100644 src/lib/rpc/unit-test/configure.in diff --git a/src/configure.in b/src/configure.in index 81945eddb..e823bce42 100644 --- a/src/configure.in +++ b/src/configure.in @@ -591,6 +591,50 @@ dnl Nothing for autoconf.h for now. AC_MSG_RESULT($ac_cv_printf_positional) dnl dnl +dnl for kadmin +dnl +AC_PROG_YACC +ath_compat= +AC_ARG_ENABLE([athena], +[ --enable-athena build with MIT Project Athena configuration], +ath_compat=compat,) +dnl The following are tests for the presence of programs required for +dnl kadmin testing. +AC_CHECK_PROG(have_RUNTEST,runtest,runtest) +AC_CHECK_PROG(have_PERL,perl,perl) +AC_KRB5_TCL +if test "$have_PERL" = perl -a "$have_RUNTEST" = runtest -a "$TCL_LIBS" != ""; then + DO_TEST=ok +fi +AC_SUBST(DO_TEST) +dnl +DO_V4_TEST= +if test "$have_PERL" = perl -a "$have_RUNTEST" = runtest -a "$TCL_LIBS" != "" -a "$ath_compat" != ""; then + DO_V4_TEST=ok +fi +AC_SUBST(DO_V4_TEST) +dnl The following are substituted into kadmin/testing/scripts/env-setup.sh +RBUILD=`pwd` +AC_SUBST(RBUILD) +case "$srcdir" in +/*) S_TOP=$srcdir ;; +*) S_TOP=`pwd`/$srcdir ;; +esac +AC_SUBST(S_TOP) +AC_PATH_PROG(PERL_PATH,perl) +AC_PATH_PROG(EXPECT,expect) +dnl For kadmin/testing/util/Makefile.in +if test "$TCL_LIBS" != "" ; then + DO_ALL=tcl +fi +AC_SUBST(DO_ALL) +KRB5_AC_PRIOCNTL_HACK +K5_GEN_FILE(kadmin/testing/scripts/env-setup.sh:kadmin/testing/scripts/env-setup.shin) +dnl for lib/kadm5 +AC_CHECK_PROG(RUNTEST,runtest,runtest) +AC_CHECK_PROG(PERL,perl,perl) +dnl +dnl dnl for lib/krb4 case $krb5_cv_host in *-apple-darwin*) @@ -609,6 +653,199 @@ AC_SUBST([KRB_ERR]) AC_SUBST([KRB_ERR_C]) dnl dnl +dnl lib/gssapi +AC_CHECK_HEADER(stdint.h,[ + include_stdint='awk '\''END{printf("%cinclude \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 \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 \n", 35);}'\'' < /dev/null'], [ + include_xom='echo "/* no xom.h */"']) +AC_SUBST(include_xom) +dnl +dnl +dnl lib/rpc +### 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 ], +[struct rpcent e; +char c = e.r_name[0]; +int i = e.r_number;], +[AC_TRY_COMPILE([#include ], +[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 ' +else + GSSRPC__SYS_SELECT_H='/* #include */' +fi +AC_SUBST(GSSRPC__SYS_SELECT_H) +if test $ac_cv_header_sys_time_h = yes; then + GSSRPC__SYS_TIME_H='#include ' +else + GSSRPC__SYS_TIME_H='/* #include */' +fi +AC_SUBST(GSSRPC__SYS_TIME_H) +if test $ac_cv_header_unistd_h = yes; then + GSSRPC__UNISTD_H='#include ' +else + GSSRPC__UNISTD_H='/* #include */' +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 ], + [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 ], + [int i = MAXHOSTNAMELEN;], + [krb5_cv_header_netdb_h_maxhostnamelen=yes], + [krb5_cv_header_netdb_h_maxhostnamelen=no])]) + +GSSRPC__SYS_PARAM_H='/* #include */' +GSSRPC__NETDB_H='/* #include */' +if test $krb5_cv_header_sys_param_h_maxhostnamelen = yes; then + GSSRPC__SYS_PARAM_H='#include ' +else + if test $krb5_cv_header_netdb_h_maxhostnamelen = yes; then + GSSRPC__NETDB_H='#include ' + 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 ], + [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 ], + [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 ], + [uint32_t i = 0;], + [krb5_cv_header_inttypes_h_uint32_t=yes], + [krb5_cv_header_inttypes_h_uint32_t=no])]) +GSSRPC__STDINT_H='/* #include */' +GSSRPC__INTTYPES_H='/* #include */' +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 ' + else + if test $krb5_cv_header_inttypes_h_uint32_t = yes; then + GSSRPC__INTTYPES_H='#include ' + 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 +#if HAVE_UNISTD_H +#include +#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) +# +# sockaddr length field checks +# +AC_CHECK_MEMBERS([struct sockaddr_in.sin_len], , , + [#include +@%:@include ]) +AC_CHECK_MEMBERS([struct sockaddr.sa_len], , , + [#include +@%:@include ]) + +AC_MSG_CHECKING([return type of setrpcent]) +AC_CACHE_VAL(k5_cv_type_setrpcent, +[AC_TRY_COMPILE([#include +#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 +#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]) +K5_GEN_FILE(lib/rpc/types.h:lib/rpc/types.hin) +changequote(<<, >>) +case "$krb5_cv_host" in +*-*-solaris2.[012345]*) + PASS=tcp + ;; +*) + PASS="tcp udp" + ;; +esac +changequote([, ]) +AC_SUBST(PASS) +dnl +dnl dnl Check for thread safety issues. dnl (Is there a better place for this?) dnl tsfuncs="getpwnam_r getpwuid_r gethostbyname_r getservbyname_r gmtime_r localtime_r" @@ -649,16 +886,45 @@ fi if test "$SS_VERSION" = k5 ; then AC_CONFIG_SUBDIRS(util/ss) fi -AC_CONFIG_SUBDIRS(lib/krb5 lib/apputils) if test -n "$KRB4_LIB"; then K5_GEN_MAKEFILE(lib/krb4) fi -AC_CONFIG_SUBDIRS(lib/gssapi lib/rpc lib/kadm5) -AC_CONFIG_SUBDIRS(kadmin plugins/kdb/db2 appl tests) +AC_CONFIG_SUBDIRS(lib/apputils plugins/kdb/db2 appl tests) dnl if true; then AC_CHECK_HEADERS(Python.h python2.3/Python.h) AC_CONFIG_SUBDIRS(plugins/locate/python) fi AC_CONFIG_FILES(krb5-config, [chmod +x krb5-config]) -V5_AC_OUTPUT_MAKEFILE(. util util/support util/profile util/send-pr lib lib/crypto lib/crypto/crc32 lib/crypto/des lib/crypto/dk lib/crypto/enc_provider lib/crypto/hash_provider lib/crypto/keyhash_provider lib/crypto/md4 lib/crypto/md5 lib/crypto/old lib/crypto/raw lib/crypto/sha1 lib/crypto/arcfour lib/crypto/yarrow lib/crypto/aes lib/des425 lib/kdb kdc slave krb524 config-files gen-manpages include include/kerberosIV clients clients/klist clients/kinit clients/kvno clients/kdestroy clients/kpasswd clients/ksu) +V5_AC_OUTPUT_MAKEFILE(. + + util util/support util/profile util/send-pr + + lib lib/des425 lib/kdb + + lib/crypto lib/crypto/crc32 lib/crypto/des lib/crypto/dk + lib/crypto/enc_provider lib/crypto/hash_provider + lib/crypto/keyhash_provider lib/crypto/md4 lib/crypto/md5 + lib/crypto/old lib/crypto/raw lib/crypto/sha1 + lib/crypto/arcfour lib/crypto/yarrow lib/crypto/aes + + lib/krb5 lib/krb5/error_tables lib/krb5/asn.1 lib/krb5/ccache + lib/krb5/keytab lib/krb5/krb lib/krb5/rcache lib/krb5/os + + lib/gssapi lib/gssapi/generic lib/gssapi/krb5 + + lib/rpc lib/rpc/unit-test + + lib/kadm5 lib/kadm5/clnt lib/kadm5/srv lib/kadm5/unit-test + + kdc slave krb524 config-files gen-manpages include + include/kerberosIV + + clients clients/klist clients/kinit clients/kvno + clients/kdestroy clients/kpasswd clients/ksu + + kadmin kadmin/cli kadmin/dbutil kadmin/passwd + kadmin/passwd/unit-test kadmin/ktutil kadmin/server + kadmin/testing kadmin/testing/scripts kadmin/testing/util + +) diff --git a/src/kadmin/Makefile.in b/src/kadmin/Makefile.in index 3be9036a8..5c83425bc 100644 --- a/src/kadmin/Makefile.in +++ b/src/kadmin/Makefile.in @@ -1,6 +1,6 @@ -thisconfigdir=. +thisconfigdir=.. myfulldir=kadmin -mydir=. +mydir=kadmin BUILDTOP=$(REL).. LOCAL_SUBDIRS = cli dbutil passwd ktutil server testing diff --git a/src/kadmin/cli/Makefile.in b/src/kadmin/cli/Makefile.in index c58e9f9ea..3cbaa58e2 100644 --- a/src/kadmin/cli/Makefile.in +++ b/src/kadmin/cli/Makefile.in @@ -1,6 +1,6 @@ -thisconfigdir=./.. +thisconfigdir=../.. myfulldir=kadmin/cli -mydir=cli +mydir=kadmin/cli BUILDTOP=$(REL)..$(S).. PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) diff --git a/src/kadmin/configure.in b/src/kadmin/configure.in deleted file mode 100644 index e18eec56b..000000000 --- a/src/kadmin/configure.in +++ /dev/null @@ -1,59 +0,0 @@ -K5_AC_INIT(configure.in) -CONFIG_RULES -AC_PROG_INSTALL -AC_PROG_YACC -AC_PROG_AWK -AC_CHECK_HEADERS(unistd.h stdlib.h krb_db.h kdc.h regex.h alloca.h sys/time.h sys/select.h memory.h arpa/inet.h) -AC_CHECK_FUNCS(ftime timezone getcwd strstr waitpid vsprintf) -KRB5_AC_NEED_DAEMON -AC_HEADER_TIME -CHECK_SIGNALS -CHECK_WAIT_TYPE -CHECK_SETJMP -KRB5_GETSOCKNAME_ARGS -ath_compat= -AC_ARG_ENABLE([athena], -[ --enable-athena build with MIT Project Athena configuration], -ath_compat=compat,) -dnl -dnl The following are tests for the presence of programs required for testing -AC_CHECK_PROG(have_RUNTEST,runtest,runtest) -AC_CHECK_PROG(have_PERL,perl,perl) -AC_KRB5_TCL -if test "$have_PERL" = perl -a "$have_RUNTEST" = runtest -a "$TCL_LIBS" != ""; then - DO_TEST=ok -fi -AC_SUBST(DO_TEST) -dnl -DO_V4_TEST= -if test "$have_PERL" = perl -a "$have_RUNTEST" = runtest -a "$TCL_LIBS" != "" -a "$ath_compat" != ""; then - DO_V4_TEST=ok -fi -AC_SUBST(DO_V4_TEST) -dnl -dnl The following are substituted into testing/scripts/env-setup.sh -RBUILD=`pwd`/.. -AC_SUBST(RBUILD) -case "$srcdir" in -/*) - S_TOP=$srcdir/.. - ;; -*) - S_TOP=`pwd`/$srcdir/.. - ;; -esac -AC_SUBST(S_TOP) -AC_PATH_PROG(PERL,perl) -AC_PATH_PROG(EXPECT,expect) -dnl -KRB5_RUN_FLAGS -dnl For testing/util/Makefile.in -if test "$TCL_LIBS" != "" ; then - DO_ALL=tcl -fi -AC_SUBST(DO_ALL) -KRB5_BUILD_PROGRAM -KRB5_AC_PRIOCNTL_HACK -dnl -K5_GEN_FILE(testing/scripts/env-setup.sh:testing/scripts/env-setup.shin) -V5_AC_OUTPUT_MAKEFILE(. cli dbutil passwd passwd/unit-test ktutil server testing testing/scripts testing/util) diff --git a/src/kadmin/dbutil/Makefile.in b/src/kadmin/dbutil/Makefile.in index 61071382c..82b309894 100644 --- a/src/kadmin/dbutil/Makefile.in +++ b/src/kadmin/dbutil/Makefile.in @@ -1,6 +1,6 @@ -thisconfigdir=./.. +thisconfigdir=../.. myfulldir=kadmin/dbutil -mydir=dbutil +mydir=kadmin/dbutil BUILDTOP=$(REL)..$(S).. DEFINES = -DKDB4_DISABLE DEFS= diff --git a/src/kadmin/ktutil/Makefile.in b/src/kadmin/ktutil/Makefile.in index 76da34fcc..fbf0824e4 100644 --- a/src/kadmin/ktutil/Makefile.in +++ b/src/kadmin/ktutil/Makefile.in @@ -1,6 +1,6 @@ -thisconfigdir=./.. +thisconfigdir=../.. myfulldir=kadmin/ktutil -mydir=ktutil +mydir=kadmin/ktutil BUILDTOP=$(REL)..$(S).. LOCALINCLUDES = $(KRB4_INCLUDES) PROG_LIBPATH=-L$(TOPLIBD) $(KRB4_LIBPATH) diff --git a/src/kadmin/passwd/Makefile.in b/src/kadmin/passwd/Makefile.in index 7cddcb4ce..d5f06f609 100644 --- a/src/kadmin/passwd/Makefile.in +++ b/src/kadmin/passwd/Makefile.in @@ -1,6 +1,6 @@ -thisconfigdir=./.. +thisconfigdir=../.. myfulldir=kadmin/passwd -mydir=passwd +mydir=kadmin/passwd BUILDTOP=$(REL)..$(S).. LOCALINCLUDES = -I. DEFINES = -DUSE_KADM5_API_VERSION=1 diff --git a/src/kadmin/passwd/unit-test/Makefile.in b/src/kadmin/passwd/unit-test/Makefile.in index 5445a2811..969ee8207 100644 --- a/src/kadmin/passwd/unit-test/Makefile.in +++ b/src/kadmin/passwd/unit-test/Makefile.in @@ -1,6 +1,6 @@ -thisconfigdir=./../.. +thisconfigdir=../../.. myfulldir=kadmin/passwd/unit-test -mydir=passwd/unit-test +mydir=kadmin/passwd/unit-test BUILDTOP=$(REL)..$(S)..$(S).. check unit-test:: unit-test-@DO_TEST@ diff --git a/src/kadmin/server/Makefile.in b/src/kadmin/server/Makefile.in index 3e99a7094..68ffe20f8 100644 --- a/src/kadmin/server/Makefile.in +++ b/src/kadmin/server/Makefile.in @@ -1,6 +1,6 @@ -thisconfigdir=./.. +thisconfigdir=../.. myfulldir=kadmin/server -mydir=server +mydir=kadmin/server BUILDTOP=$(REL)..$(S).. KDB_DEP_LIB=$(DL_LIB) $(THREAD_LINKOPTS) DEFS= diff --git a/src/kadmin/testing/Makefile.in b/src/kadmin/testing/Makefile.in index c164a7e24..74600d1c9 100644 --- a/src/kadmin/testing/Makefile.in +++ b/src/kadmin/testing/Makefile.in @@ -1,6 +1,6 @@ -thisconfigdir=./.. +thisconfigdir=../.. myfulldir=kadmin/testing -mydir=testing +mydir=kadmin/testing BUILDTOP=$(REL)..$(S).. LOCAL_SUBDIRS = scripts util diff --git a/src/kadmin/testing/scripts/Makefile.in b/src/kadmin/testing/scripts/Makefile.in index 3f58e9248..6161b1db8 100644 --- a/src/kadmin/testing/scripts/Makefile.in +++ b/src/kadmin/testing/scripts/Makefile.in @@ -1,8 +1,8 @@ -thisconfigdir=./../.. +thisconfigdir=../../.. myfulldir=kadmin/testing/scripts -mydir=testing/scripts +mydir=kadmin/testing/scripts BUILDTOP=$(REL)..$(S)..$(S).. -PERL=@PERL@ +PERL_PATH=@PERL_PATH@ .SUFFIXES: .plin .pl @@ -17,7 +17,7 @@ env-setup.sh: env-setup.stamp env-setup.stamp: $(srcdir)/env-setup.shin $(thisconfigdir)/config.status \ Makefile cd $(thisconfigdir) && \ - CONFIG_FILES=./testing/scripts/env-setup.sh:./testing/scripts/env-setup.shin $(SHELL) \ + CONFIG_FILES=$(mydir)/env-setup.sh:$(mydir)/env-setup.shin $(SHELL) \ config.status chmod +x env-setup.sh touch env-setup.stamp @@ -28,7 +28,7 @@ restore_files.sh: .plin.pl: -rm -f $@.tmp - echo "#!$(PERL)" > $@.tmp + echo "#!$(PERL_PATH)" > $@.tmp sed 1d $< >> $@.tmp chmod +x $@.tmp mv $@.tmp $@ diff --git a/src/kadmin/testing/util/Makefile.in b/src/kadmin/testing/util/Makefile.in index fa3c3827f..cf38caec1 100644 --- a/src/kadmin/testing/util/Makefile.in +++ b/src/kadmin/testing/util/Makefile.in @@ -1,6 +1,6 @@ -thisconfigdir=./../.. +thisconfigdir=../../.. myfulldir=kadmin/testing/util -mydir=testing/util +mydir=kadmin/testing/util BUILDTOP=$(REL)..$(S)..$(S).. LOCALINCLUDES = $(TCL_INCLUDES) -I$(BUILDTOP)/lib/kdb/ # Force Tcl headers to use stdarg.h, because krb5 does too, and if diff --git a/src/lib/gssapi/Makefile.in b/src/lib/gssapi/Makefile.in index 4ef0253bd..daf0818dd 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 0b880593b..000000000 --- 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 \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 \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 \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 cfdc1a737..9dfa68e6f 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 217236d28..7d9e8826f 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 a198c2374..a597a360a 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 738f3518a..ed0cb41df 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 f9193a3f1..000000000 --- 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 84cdb7b38..63d9c5ad5 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 a69a11381..c9c3f4fb1 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 222c1ee98..fcf2ea28c 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 d903c8e8a..3c440fe56 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 99241c981..7906aebb0 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 2559d356f..000000000 --- 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 ],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 3d8a8fb5a..df4191ff6 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 11ab55de7..73b11f72a 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 270feab2f..edf6d5f2f 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 abce069ea..db391ab15 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 2b886bfe9..05b760955 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 02eb37010..1d3c6eacb 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 2b76c4ada..000000000 --- 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 ], -[struct rpcent e; -char c = e.r_name[0]; -int i = e.r_number;], -[AC_TRY_COMPILE([#include ], -[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 ' -else - GSSRPC__SYS_SELECT_H='/* #include */' -fi -AC_SUBST(GSSRPC__SYS_SELECT_H) -if test $ac_cv_header_sys_time_h = yes; then - GSSRPC__SYS_TIME_H='#include ' -else - GSSRPC__SYS_TIME_H='/* #include */' -fi -AC_SUBST(GSSRPC__SYS_TIME_H) -if test $ac_cv_header_unistd_h = yes; then - GSSRPC__UNISTD_H='#include ' -else - GSSRPC__UNISTD_H='/* #include */' -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 ], - [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 ], - [int i = MAXHOSTNAMELEN;], - [krb5_cv_header_netdb_h_maxhostnamelen=yes], - [krb5_cv_header_netdb_h_maxhostnamelen=no])]) - -GSSRPC__SYS_PARAM_H='/* #include */' -GSSRPC__NETDB_H='/* #include */' -if test $krb5_cv_header_sys_param_h_maxhostnamelen = yes; then - GSSRPC__SYS_PARAM_H='#include ' -else - if test $krb5_cv_header_netdb_h_maxhostnamelen = yes; then - GSSRPC__NETDB_H='#include ' - 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 ], - [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 ], - [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 ], - [uint32_t i = 0;], - [krb5_cv_header_inttypes_h_uint32_t=yes], - [krb5_cv_header_inttypes_h_uint32_t=no])]) -GSSRPC__STDINT_H='/* #include */' -GSSRPC__INTTYPES_H='/* #include */' -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 ' - else - if test $krb5_cv_header_inttypes_h_uint32_t = yes; then - GSSRPC__INTTYPES_H='#include ' - 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 -#if HAVE_UNISTD_H -#include -#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 -@%:@include ]) -AC_CHECK_MEMBERS([struct sockaddr.sa_len], , , - [#include -@%:@include ]) - -AC_MSG_CHECKING([return type of setrpcent]) -AC_CACHE_VAL(k5_cv_type_setrpcent, -[AC_TRY_COMPILE([#include -#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 -#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 8cc030907..77959377a 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 6a6bcf1f6..000000000 --- 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 -- 2.26.2