diff options
author | assar <assar@FreeBSD.org> | 2001-02-13 16:46:19 +0000 |
---|---|---|
committer | assar <assar@FreeBSD.org> | 2001-02-13 16:46:19 +0000 |
commit | ebfe6dc471c206300fd82c7c0fd145f683aa52f6 (patch) | |
tree | e66aa570ad1d12c43b32a7313b0f8e28971bf8a9 /crypto/heimdal/configure.in | |
parent | e5f617598c2db0dd51906a38ecea9208123a8b70 (diff) | |
download | FreeBSD-src-ebfe6dc471c206300fd82c7c0fd145f683aa52f6.zip FreeBSD-src-ebfe6dc471c206300fd82c7c0fd145f683aa52f6.tar.gz |
import of heimdal 0.3e
Diffstat (limited to 'crypto/heimdal/configure.in')
-rw-r--r-- | crypto/heimdal/configure.in | 571 |
1 files changed, 187 insertions, 384 deletions
diff --git a/crypto/heimdal/configure.in b/crypto/heimdal/configure.in index 844aa83..b0b2e1c 100644 --- a/crypto/heimdal/configure.in +++ b/crypto/heimdal/configure.in @@ -1,9 +1,15 @@ dnl Process this file with autoconf to produce a configure script. -AC_REVISION($Revision: 1.218 $) -AC_INIT(lib/krb5/send_to_kdc.c) +AC_REVISION($Revision: 1.270 $) +AC_PREREQ(2.14.-1.1)dnl 2.14a +AC_INIT(heimdal, 0.3e, heimdal-bugs@pdc.kth.se) AM_CONFIG_HEADER(include/config.h) -AM_INIT_AUTOMAKE(heimdal,0.2p) +dnl Checks for programs. +AC_PROG_CC +AC_PROG_CPP +AC_PROG_CC_STDC + +AM_INIT_AUTOMAKE(heimdal,0.3e) AC_PREFIX_DEFAULT(/usr/heimdal) @@ -19,6 +25,9 @@ case "$host" in *-*-solaris2.7) sunos=57 ;; +*-*-solaris2.8) + sunos=58 + ;; *-*-solaris2*) sunos=50 ;; @@ -40,10 +49,6 @@ esac #test -z "$CFLAGS" && CFLAGS="-g" -dnl Checks for programs. -AC_PROG_CC - -AC_CYGWIN AC_OBJEXT AC_EXEEXT @@ -60,20 +65,25 @@ libdir="$libdir$abilibdirext" AC_C___ATTRIBUTE__ -AM_DISABLE_SHARED -AM_PROG_LIBTOOL +AC_ENABLE_SHARED(no) +AC_PROG_LIBTOOL AC_WFLAGS(-Wall -Wmissing-prototypes -Wpointer-arith -Wbad-function-cast -Wmissing-declarations -Wnested-externs) -berkeley_db=db -AC_ARG_WITH(berkeley-db, -[ --without-berkeley-db if you don't want berkeley db],[ -if test "$withval" = no; then - berkeley_db="" +rk_DB + +dnl AC_ROKEN(10,[/usr/heimdal /usr/athena],[lib/roken],[$(top_builddir)/lib/roken/libroken.la],[-I$(top_builddir)/lib/roken -I$(top_srcdir)/lib/roken]) + +rk_ROKEN(lib/roken) +LIB_roken="\$(top_builddir)/lib/vers/libvers.la $LIB_roken" + +AC_TEST_PACKAGE_NEW(openldap,[#include <ldap.h>],[-lldap -llber],,,OPENLDAP) + +if test "$openldap_libdir"; then + LIB_openldap="-R $openldap_libdir $LIB_openldap" fi -]) -AC_TEST_PACKAGE_NEW(krb4,[#include <krb.h>],-lkrb,-ldes,/usr/athena) +AC_TEST_PACKAGE_NEW(krb4,[#include <krb.h>],-lkrb,-ldes,/usr/athena, KRB4) LIB_kdb= if test "$with_krb4" != "no"; then @@ -94,6 +104,12 @@ if test "$with_krb4" != "no"; then AC_DEFINE(HAVE_FOUR_VALUED_KRB_PUT_INT, 1, [define if krb_put_int takes four arguments.]) fi + AH_BOTTOM([#if defined(HAVE_FOUR_VALUED_KRB_PUT_INT) || !defined(KRB4) +#define KRB_PUT_INT(F, T, L, S) krb_put_int((F), (T), (L), (S)) +#else +#define KRB_PUT_INT(F, T, L, S) krb_put_int((F), (T), (S)) +#endif +]) AC_CACHE_CHECK(for KRB_VERIFY_SECURE, ac_cv_func_krb_verify_secure, [AC_TRY_COMPILE([#include <krb.h>],[ int x = KRB_VERIFY_SECURE], @@ -120,42 +136,52 @@ if test "$with_krb4" != "no"; then AC_FIND_FUNC(krb_enable_debug) AC_FIND_FUNC(krb_disable_debug) AC_FIND_FUNC(krb_get_our_ip_for_realm) + AC_CACHE_CHECK(for krb_mk_req with const arguments, + ac_cv_func_krb_mk_req_const, + [AC_TRY_COMPILE([#include <krb.h> + int krb_mk_req(KTEXT a, const char *s, const char *i, + const char *r, int32_t checksum) + { return 17; }], [], + ac_cv_func_krb_mk_req_const=yes, + ac_cv_func_krb_mk_req_const=no) + ]) + if test "$ac_cv_func_krb_mk_req_const" = "yes"; then + AC_DEFINE(KRB_MK_REQ_CONST, 1, + [Define if krb_mk_req takes cons char *]) + fi + LIBS="$save_LIBS" CFLAGS="$save_CFLAGS" LIB_kdb="-lkdb -lkrb" if test "$krb4_libdir"; then - LIB_krb4="-rpath $krb4_libdir $LIB_krb4" - LIB_kdb="-rpath $krb4_libdir -L$krb4_libdir $LIB_kdb" + LIB_krb4="-R $krb4_libdir $LIB_krb4" + LIB_kdb="-R $krb4_libdir -L$krb4_libdir $LIB_kdb" fi fi AM_CONDITIONAL(KRB4, test "$with_krb4" != "no") AM_CONDITIONAL(KRB5, true) +AM_CONDITIONAL(do_roken_rename, true) + AC_DEFINE(KRB5, 1, [Enable Kerberos 5 support in applications.])dnl AC_SUBST(LIB_kdb)dnl -AM_CONDITIONAL(AIX, test "$aix" != no)dnl -AM_CONDITIONAL(AIX4, test "$aix" = 4) -aix_dynamic_afs=yes -AM_CONDITIONAL(AIX_DYNAMIC_AFS, test "$aix_dynamic_afs" = yes)dnl - -AC_FIND_FUNC_NO_LIBS(dlopen, dl) - -if test "$aix" != no; then - if test "$aix_dynamic_afs" = yes; then - if test "$ac_cv_funclib_dlopen" = yes; then - AIX_EXTRA_KAFS= - elif test "$ac_cv_funclib_dlopen" != no; then - AIX_EXTRA_KAFS="$ac_cv_funclib_dlopen" - else - AIX_EXTRA_KAFS=-lld - fi - else - AIX_EXTRA_KAFS= - fi + +AC_ARG_ENABLE(dce, [ --enable-dce if you want support for DCE/DFS PAG's.]) +if test "$enable_dce" = yes; then + AC_DEFINE(DCE, 1, [Define if you want support for DCE/DFS PAG's.]) fi +AM_CONDITIONAL(DCE, test "$enable_dce" = yes) + +## XXX quite horrible: +if test -f /etc/ibmcxx.cfg; then + dpagaix_LDADD=`sed -n '/^xlc_r4/,/^$/p' /etc/ibmcxx.cfg | sed -n -e '/libraries/{;s/^[^=]*=\(.*\)/\1/;s/,/ /gp;}'` + dpagaix_CFLAGS=`sed -n '/^xlc_r4/,/^$/p' /etc/ibmcxx.cfg | sed -n -e '/options/{;s/^[^=]*=\(.*\)/\1/;s/-q[^,]*//;s/,/ /gp;}'` +else + dpagaix_CFLAGS="-D_THREAD_SAFE -D_AIX_PTHREADS_D7 -D_AIX32_THREADS=1 -D_AES_SOURCE -D_AIX41 -I/usr/include/dce" + dpagaix_LDADD="-L/usr/lib/threads -ldcelibc_r -ldcepthreads -lpthreads_compat lpthreads -lc_r" +fi +AC_SUBST(dpagaix_CFLAGS) +AC_SUBST(dpagaix_LDADD) -AM_CONDITIONAL(HAVE_DLOPEN, test "$ac_cv_funclib_dlopen" != no)dnl -AC_SUBST(AFS_EXTRA_LD)dnl -AC_SUBST(AIX_EXTRA_KAFS)dnl AC_ARG_ENABLE(kaserver, [ --enable-kaserver if you want the KDC to try to emulate a kaserver]) @@ -196,31 +222,23 @@ AM_CONDITIONAL(OTP, test "$otp" = yes)dnl AC_CHECK_OSFC2 -AC_CHECK_MAN +rk_CHECK_MAN AC_TEST_PACKAGE_NEW(readline, [#include <stdio.h> - #include <readline.h>],-lreadline) + #include <readline.h>],-lreadline,,, READLINE) -AC_TEST_PACKAGE_NEW(hesiod,[#include <hesiod.h>],-lhesiod) +AC_TEST_PACKAGE_NEW(hesiod,[#include <hesiod.h>],-lhesiod,,, HESIOD) KRB_C_BIGENDIAN AC_C_INLINE +KRB_AIX +KRB_IRIX + KRB_CHECK_X -if test "$no_x" = "yes" ; then - MAKE_X_PROGS_BIN_PROGS="" - MAKE_X_PROGS_BIN_SCRPTS="" - MAKE_X_PROGS_LIBEXEC_PROGS="" -else - MAKE_X_PROGS_BIN_PROGS='$(X_PROGS_BIN_PROGS)' - MAKE_X_PROGS_BIN_SCRPTS='$(X_PROGS_BIN_SCRPTS)' - MAKE_X_PROGS_LIBEXEC_PROGS='$(X_PROGS_LIBEXEC_PROGS)' -fi -AC_SUBST(MAKE_X_PROGS_BIN_PROGS)dnl -AC_SUBST(MAKE_X_PROGS_BIN_SCRPTS)dnl -AC_SUBST(MAKE_X_PROGS_LIBEXEC_PROGS)dnl +AM_CONDITIONAL(HAVE_X, test "$no_x" != yes) AC_CHECK_XAU @@ -242,13 +260,6 @@ AC_STRUCT_TM dnl Checks for header files. AC_HEADER_STDC -if test "$berkeley_db"; then - AC_CHECK_HEADERS([ \ - db.h \ - db_185.h \ - ]) -fi - AC_CHECK_HEADERS([\ arpa/ftp.h \ arpa/inet.h \ @@ -265,6 +276,7 @@ AC_CHECK_HEADERS([\ errno.h \ fcntl.h \ fnmatch.h \ + gdbm/ndbm.h \ grp.h \ inttypes.h \ io.h \ @@ -333,6 +345,8 @@ AC_CHECK_HEADERS([\ tmpdir.h \ udb.h \ unistd.h \ + userconf.h \ + usersec.h \ util.h \ utmp.h \ utmpx.h \ @@ -405,39 +419,39 @@ dnl Checks for library functions. AC_BROKEN_SNPRINTF AC_BROKEN_VSNPRINTF -AC_BROKEN_GLOB - -if test "$ac_cv_func_glob_working" != yes; then - LIBOBJS="$LIBOBJS glob.o" -fi -AM_CONDITIONAL(have_glob_h, test "$ac_cv_func_glob_working" = yes) - -dnl these should happen after tests for *snprintf - -AC_FIND_FUNC_NO_LIBS(dbopen, $berkeley_db) -AC_FIND_FUNC_NO_LIBS(dbm_firstkey, $berkeley_db gdbm ndbm) - -DBLIB="$LIB_dbopen" -if test "$LIB_dbopen" != "$LIB_dbm_firstkey"; then - DBLIB="$DBLIB $LIB_dbm_firstkey" -fi -AC_SUBST(DBLIB)dnl - -AC_CHECK_FUNCS(_getpty _scrsize asnprintf asprintf cgetent fcntl) -AC_CHECK_FUNCS(getmsg getrlimit getspnam gettimeofday getuid) -AC_CHECK_FUNCS(grantpt mktime ptsname rand random setproctitle) -AC_CHECK_FUNCS(revoke select setitimer setpcred setpgid) -AC_CHECK_FUNCS(setregid setresgid setresuid setreuid setutent) -AC_CHECK_FUNCS(setsid sigaction strstr) -AC_CHECK_FUNCS(sysconf sysctl timegm ttyname ttyslot umask uname) -AC_CHECK_FUNCS(unlockpt vasnprintf vasprintf vhangup) -AC_CHECK_FUNCS(yp_get_default_domain) - -if test "$ac_cv_func_cgetent" = no; then - LIBOBJS="$LIBOBJS getcap.o" -fi - -AC_FUNC_GETLOGIN +AC_CHECK_FUNCS([ \ + _getpty \ + _scrsize \ + fcntl \ + gettimeofday \ + getuid \ + grantpt \ + mktime \ + ptsname \ + rand \ + random \ + revoke \ + select \ + setitimer \ + setpcred \ + setpgid \ + setproctitle \ + setregid \ + setresgid \ + setresuid \ + setreuid \ + setsid \ + setutent \ + sigaction \ + strstr \ + timegm \ + ttyname \ + ttyslot \ + umask \ + unlockpt \ + vhangup \ + yp_get_default_domain \ +]) KRB_CAPABILITIES @@ -463,243 +477,13 @@ AC_FIND_FUNC_NO_LIBS(setsockopt,, dnl Cray stuff AC_CHECK_FUNCS(getudbnam setlim) -AC_TYPE_SIGNAL -if test "$ac_cv_type_signal" = "void" ; then - AC_DEFINE(VOID_RETSIGTYPE, 1, [Define if signal handlers return void.]) -fi -AC_SUBST(VOID_RETSIGTYPE) - -AC_FIND_IF_NOT_BROKEN(hstrerror, resolv, -[#ifdef HAVE_NETDB_H -#include <netdb.h> -#endif], -17) -if test "$ac_cv_func_hstrerror" = yes; then -AC_NEED_PROTO([ -#ifdef HAVE_NETDB_H -#include <netdb.h> -#endif], -hstrerror) -fi - -dnl sigh, wish this could be done in a loop -if test "$ac_cv_func_asprintf" = yes; then -AC_NEED_PROTO([ -#include <stdio.h> -#include <string.h>], -asprintf)dnl -fi -if test "$ac_cv_func_vasprintf" = yes; then -AC_NEED_PROTO([ -#include <stdio.h> -#include <string.h>], -vasprintf)dnl -fi -if test "$ac_cv_func_asnprintf" = yes; then -AC_NEED_PROTO([ -#include <stdio.h> -#include <string.h>], -asnprintf)dnl -fi -if test "$ac_cv_func_vasnprintf" = yes; then -AC_NEED_PROTO([ -#include <stdio.h> -#include <string.h>], -vasnprintf)dnl -fi - -AC_BROKEN(chown copyhostent daemon err errx fchown flock fnmatch) -AC_BROKEN(freeaddrinfo freehostent gai_strerror getaddrinfo) -AC_BROKEN(getcwd getdtablesize gethostname getipnodebyaddr getipnodebyname) -AC_BROKEN(geteuid getgid getegid) -AC_BROKEN(getnameinfo getopt getusershell) -AC_BROKEN(inet_aton inet_ntop inet_pton initgroups innetgr iruserok lstat) -AC_BROKEN(memmove) -AC_BROKEN(mkstemp putenv rcmd readv recvmsg sendmsg setegid setenv seteuid) -AC_BROKEN(strcasecmp strncasecmp strdup strerror strftime) -AC_BROKEN(strlcat strlcpy strlwr) -AC_BROKEN(strndup strnlen strptime strsep strtok_r strupr) -AC_BROKEN(swab unsetenv verr verrx vsyslog) -AC_BROKEN(vwarn vwarnx warn warnx writev) - -AC_NEED_PROTO([#include <stdlib.h>], setenv) -AC_NEED_PROTO([#include <stdlib.h>], unsetenv) -AC_NEED_PROTO([#include <unistd.h>], gethostname) -AC_NEED_PROTO([#include <unistd.h>], mkstemp) -AC_NEED_PROTO([#include <unistd.h>], getusershell) - -AC_NEED_PROTO([ -#ifdef HAVE_SYS_TYPES_H -#include <sys/types.h> -#endif -#ifdef HAVE_SYS_SOCKET_H -#include <sys/socket.h> -#endif -#ifdef HAVE_NETINET_IN_H -#include <netinet/in.h> -#endif -#ifdef HAVE_ARPA_INET_H -#include <arpa/inet.h> -#endif], -inet_aton) - -AC_FIND_FUNC_NO_LIBS(crypt, crypt)dnl - -dnl -dnl libroken references crypt and dbopen -dnl - -LIB_roken='$(top_builddir)/lib/roken/libroken.la $(LIB_crypt) $(LIB_dbopen)' -AC_SUBST(LIB_roken)dnl - -AC_CACHE_CHECK(if realloc if broken, ac_cv_func_realloc_broken, [ -ac_cv_func_realloc_broken=no -AC_TRY_RUN([ -#include <stddef.h> -#include <stdlib.h> +rk_RETSIGTYPE -int main() -{ - return realloc(NULL, 17) == NULL; -} -],:, ac_cv_func_realloc_broken=yes, :) -]) -if test "$ac_cv_func_realloc_broken" = yes ; then - AC_DEFINE(BROKEN_REALLOC, 1, [Define if realloc(NULL) doesn't work.]) -fi +rk_BROKEN_REALLOC dnl AC_KRB_FUNC_GETCWD_BROKEN dnl -dnl Checks for prototypes and declarations -dnl - -AC_PROTO_COMPAT([ -#ifdef HAVE_SYS_TYPES_H -#include <sys/types.h> -#endif -#ifdef HAVE_SYS_SOCKET_H -#include <sys/socket.h> -#endif -#ifdef HAVE_NETINET_IN_H -#include <netinet/in.h> -#endif -#ifdef HAVE_ARPA_INET_H -#include <arpa/inet.h> -#endif -#ifdef HAVE_NETDB_H -#include <netdb.h> -#endif -], -gethostbyname, struct hostent *gethostbyname(const char *)) - -AC_PROTO_COMPAT([ -#ifdef HAVE_SYS_TYPES_H -#include <sys/types.h> -#endif -#ifdef HAVE_SYS_SOCKET_H -#include <sys/socket.h> -#endif -#ifdef HAVE_NETINET_IN_H -#include <netinet/in.h> -#endif -#ifdef HAVE_ARPA_INET_H -#include <arpa/inet.h> -#endif -#ifdef HAVE_NETDB_H -#include <netdb.h> -#endif -], -gethostbyaddr, struct hostent *gethostbyaddr(const void *, size_t, int)) - -AC_PROTO_COMPAT([ -#ifdef HAVE_SYS_TYPES_H -#include <sys/types.h> -#endif -#ifdef HAVE_SYS_SOCKET_H -#include <sys/socket.h> -#endif -#ifdef HAVE_NETINET_IN_H -#include <netinet/in.h> -#endif -#ifdef HAVE_ARPA_INET_H -#include <arpa/inet.h> -#endif -#ifdef HAVE_NETDB_H -#include <netdb.h> -#endif -], -getservbyname, struct servent *getservbyname(const char *, const char *)) - -AC_PROTO_COMPAT([ -#ifdef HAVE_SYSLOG_H -#include <syslog.h> -#endif -], -openlog, void openlog(const char *, int, int)) - -AC_NEED_PROTO([ -#ifdef HAVE_CRYPT_H -#include <crypt.h> -#endif -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#endif -], -crypt) - -AC_NEED_PROTO([ -#include <string.h> -], -strtok_r) - -AC_NEED_PROTO([ -#include <string.h> -], -strsep) - -AC_CHECK_VAR([#ifdef HAVE_SYS_TYPES_H -#include <sys/types.h> -#endif -#ifdef HAVE_NETDB_H -#include <netdb.h> -#endif], -h_errno) - -AC_CHECK_VAR([#ifdef HAVE_NETDB_H -#include <netdb.h> -#endif], -h_errlist) - -AC_CHECK_VAR([#ifdef HAVE_NETDB_H -#include <netdb.h> -#endif], -h_nerr) - -AC_CHECK_VAR([#ifdef HAVE_ERR_H -#include <err.h> -#endif],[__progname]) - -AC_CHECK_DECLARATION([#include <stdlib.h> -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#endif], optarg) -AC_CHECK_DECLARATION([#include <stdlib.h> -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#endif], optind) -AC_CHECK_DECLARATION([#include <stdlib.h> -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#endif], opterr) -AC_CHECK_DECLARATION([#include <stdlib.h> -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#endif], optopt) - -AC_CHECK_DECLARATION([#include <stdlib.h>], environ) - -dnl dnl Check for fields in struct utmp dnl @@ -723,9 +507,7 @@ dnl dnl or do we have a variable `timezone' ? dnl -AC_CHECK_VAR( -[#include <time.h>], -timezone) +rk_CHECK_VAR(timezone, [#include <time.h>]) AC_HAVE_TYPE([sa_family_t],[#include <sys/socket.h>]) @@ -757,60 +539,45 @@ AC_HAVE_STRUCT_FIELD(struct sockaddr, sa_len, [#include <sys/types.h> #include <sys/socket.h>]) -AC_GROK_TYPES(int8_t int16_t int32_t int64_t) -AC_GROK_TYPES(u_int8_t u_int16_t u_int32_t u_int64_t) +AC_GROK_TYPES([int8_t int16_t int32_t int64_t \ + u_int8_t u_int16_t u_int32_t u_int64_t \ + uint8_t uint16_t uint32_t uint64_t]) dnl dnl crypto functions tests dnl -AC_FIND_FUNC_NO_LIBS(MD4Init, crypto) -AC_FIND_FUNC_NO_LIBS(MD4_Init, crypto) -AC_FIND_FUNC_NO_LIBS(MD5Init, crypto) -AC_FIND_FUNC_NO_LIBS(MD5_Init, crypto) -AC_FIND_FUNC_NO_LIBS(SHA1Init, crypto) -AC_FIND_FUNC_NO_LIBS(SHA1_Init, crypto) -AC_FIND_FUNC_NO_LIBS(des_cbc_encrypt, crypto des) - -dnl -dnl Tests for editline -dnl - -dnl el_init - -AC_FIND_FUNC_NO_LIBS(el_init, edit, [], [], [$LIB_tgetent]) -if test "$ac_cv_func_el_init" = yes ; then - AC_CACHE_CHECK(for four argument el_init, ac_cv_func_el_init_four,[ - AC_TRY_COMPILE([#include <stdio.h> - #include <histedit.h>], - [el_init("", NULL, NULL, NULL);], - ac_cv_func_el_init_four=yes, - ac_cv_func_el_init_four=no)]) - if test "$ac_cv_func_el_init_four" = yes; then - AC_DEFINE(HAVE_FOUR_VALUED_EL_INIT, 1, [Define if el_init takes four arguments.]) - fi -fi - -dnl readline +AC_CHECK_HEADERS([ \ + openssl/md4.h \ + openssl/md5.h \ + openssl/sha.h \ + openssl/des.h \ + openssl/rc4.h \ +]) -ac_foo=no -if test "$with_readline" = yes; then - : -elif test "$ac_cv_func_readline" = yes; then - : -elif test "$ac_cv_func_el_init" = yes; then - ac_foo=yes - LIB_readline="\$(top_builddir)/lib/editline/libel_compat.a $LIB_el_init" +AC_FIND_FUNC_NO_LIBS2(MD4_Init, crypto des, [], [], [], [$LIB_krb4]) +AC_FIND_FUNC_NO_LIBS2(MD5_Init, crypto des, [], [], [], [$LIB_krb4]) +AC_FIND_FUNC_NO_LIBS2(SHA1_Init, crypto des, [], [], [], [$LIB_krb4]) +AC_FIND_FUNC_NO_LIBS2(des_cbc_encrypt, crypto des, [], [], [], [$LIB_krb4]) +AC_FIND_FUNC_NO_LIBS2(RC4, crypto des, [], [], [], [$LIB_krb4]) +if test "$ac_cv_func_des_cbc_encrypt" = "yes" -a \ +"$ac_cv_func_MD4_Init" = "yes" -a \ +"$ac_cv_func_MD5_Init" = "yes" -a \ +"$ac_cv_func_SHA1_Init" = "yes" -a \ +"$ac_cv_func_RC4" = "yes"; then + DIR_des='' + LIB_des="-R $krb4_libdir -L$krb4_libdir $ac_cv_funclib_MD4_Init" + LIB_des_appl="$LIB_des" else - LIB_readline='$(top_builddir)/lib/editline/libeditline.a' -fi -AM_CONDITIONAL(el_compat, test "$ac_foo" = yes) -if test "$readline_libdir"; then - LIB_readline="-rpath $readline_libdir $LIB_readline" + DIR_des='des' + LIB_des='$(top_builddir)/lib/des/libdes.la' + LIB_des_appl="-ldes" fi -LIB_readline="$LIB_readline \$(LIB_tgetent)" -AC_DEFINE(HAVE_READLINE, 1, - [Define if you have a readline compatible library.])dnl +AC_SUBST(DIR_des) +AC_SUBST(LIB_des) +AC_SUBST(LIB_des_appl) + +KRB_READLINE dnl telnet muck -------------------------------------------------- @@ -834,20 +601,46 @@ fi # # And also something wierd has happend with dec-osf1, fallback to bsd-ptys +AC_CHECK_FUNC(getmsg) + +if test "$ac_cv_func_getmsg" = "yes"; then + +AC_CACHE_CHECK(for working getmsg, ac_cv_func_getmsg_work, +AC_TRY_RUN( +[ +#include <stdio.h> +#include <errno.h> + +int main() +{ + int ret; + ret = getmsg(open("/dev/null", 0), NULL, NULL, NULL); + if(ret < 0 && errno == ENOSYS) + return 1; + return 0; +} +], ac_cv_func_getmsg_work=yes, ac_cv_func_getmsg_work=no, +ac_cv_func_getmsg_work=no)) +test "$ac_cv_func_getmsg_work" = "yes" && +AC_DEFINE(HAVE_GETMSG, 1, [Define if you have a working getmsg.]) + +fi + +if test "$ac_cv_func_getmsg_work" = yes; then AC_MSG_CHECKING(for streamspty) case "$host" in -*-*-aix3*|*-*-sunos4*|*-*-osf*|*-*-hpux10*) +*-*-aix3*|*-*-sunos4*|*-*-osf*|*-*-hpux1[[01]]*) krb_cv_sys_streamspty=no ;; *) - krb_cv_sys_streamspty="$ac_cv_func_getmsg" + krb_cv_sys_streamspty=yes ;; esac +AC_MSG_RESULT($krb_cv_sys_streamspty) +fi if test "$krb_cv_sys_streamspty" = yes; then AC_DEFINE(STREAMSPTY, 1, [Define if you have streams ptys.]) fi -dnl AC_SUBST(STREAMSPTY) -AC_MSG_RESULT($krb_cv_sys_streamspty) AC_AUTH_MODULES @@ -867,6 +660,10 @@ for i in bin lib libexec sbin; do done AC_DEFINE_UNQUOTED($foo,"$x") done +AH_BOTTOM([#undef BINDIR +#undef LIBDIR +#undef LIBEXECDIR +#undef SBINDIR]) if false; then # hack to shut up automake @@ -874,7 +671,7 @@ if false; then fi LTLIBOBJS=`echo "$LIBOBJS" | sed 's/\.o/\.lo/g'` AC_SUBST(LTLIBOBJS) -AC_OUTPUT(Makefile \ +AC_CONFIG_FILES(Makefile \ include/Makefile \ include/kadm5/Makefile \ lib/Makefile \ @@ -891,10 +688,12 @@ AC_OUTPUT(Makefile \ lib/hdb/Makefile \ lib/kadm5/Makefile \ lib/kafs/Makefile \ + lib/kdfs/Makefile \ lib/krb5/Makefile \ lib/otp/Makefile \ lib/roken/Makefile \ lib/sl/Makefile \ + lib/vers/Makefile \ kuser/Makefile \ kpasswd/Makefile \ kadmin/Makefile \ @@ -906,13 +705,13 @@ AC_OUTPUT(Makefile \ appl/ftp/common/Makefile \ appl/ftp/ftp/Makefile \ appl/ftp/ftpd/Makefile \ - appl/kauth/Makefile \ appl/kx/Makefile \ appl/login/Makefile \ appl/otp/Makefile \ appl/popper/Makefile \ appl/push/Makefile \ appl/rsh/Makefile \ + appl/rcp/Makefile \ appl/su/Makefile \ appl/xnlock/Makefile \ appl/telnet/Makefile \ @@ -921,17 +720,21 @@ AC_OUTPUT(Makefile \ appl/telnet/telnetd/Makefile \ appl/test/Makefile \ appl/kf/Makefile \ + appl/dceutils/Makefile \ doc/Makefile \ + tools/Makefile \ ) +AC_OUTPUT + dnl dnl This is the release version name-number[beta] dnl HEIMDALVERSION="$PACKAGE-$VERSION" cat > include/newversion.h.in <<EOF -char *heimdal_long_version = "@(#)\$Version: $HEIMDALVERSION by @USER@ on @HOST@ ($host) @DATE@ \$"; -char *heimdal_version = "$HEIMDALVERSION"; +const char *heimdal_long_version = "@(#)\$Version: $HEIMDALVERSION by @USER@ on @HOST@ ($host) @DATE@ \$"; +const char *heimdal_version = "$HEIMDALVERSION"; EOF if test -f include/version.h && cmp -s include/newversion.h.in include/version.h.in; then |