diff options
author | Greg Hudson <ghudson@mit.edu> | 1997-11-11 10:32:33 +0000 |
---|---|---|
committer | Greg Hudson <ghudson@mit.edu> | 1997-11-11 10:32:33 +0000 |
commit | c97bbe1f1a6e3f548ba3b2d631133cf6e7da16ef (patch) | |
tree | c43436b4fa8f3db0af7ef5d2ba56dfc012243188 /aclocal.m4 | |
parent | 3c9b0e8934352a5840a5a18e94225216006e86b5 (diff) |
Update aclocal.m4 from master.
Diffstat (limited to 'aclocal.m4')
-rw-r--r-- | aclocal.m4 | 22 |
1 files changed, 12 insertions, 10 deletions
@@ -180,18 +180,20 @@ dnl ----- Kerberos 4 ----- AC_DEFUN(ATHENA_KRB4_CHECK, [if test "$krb4" != yes; then CPPFLAGS="$CPPFLAGS -I$krb4/include" - LDFLAGS="$LDFLAGS -L$krb4/lib" -fi -AC_CHECK_LIB(krb, krb_rd_req, [KRB4_LIBS="-lkrb -ldes"], - [if test "$krb4" != yes; then + if test -d "$krb4/include/kerberosIV"; then CPPFLAGS="$CPPFLAGS -I$krb4/include/kerberosIV" - else - CPPFLAGS="$CPPFLAGS -I/usr/include/kerberosIV" fi - AC_CHECK_LIB(krb4, krb_rd_req, - [KRB4_LIBS="-lkrb4 -ldes425 -lkrb5 -lcrypto -lcom_err"], - [AC_MSG_ERROR(Kerberos 4 libraries not found)], - -ldes425 -lkrb5 -lcrypto -lcom_err)], -ldes)]) + LDFLAGS="$LDFLAGS -L$krb4/lib" +elif test -d /usr/include/kerberosIV; then + CPPFLAGS="$CPPFLAGS -I/usr/include/kerberosIV" +fi +AC_CHECK_LIB(krb4, krb_rd_req, + [KRB4_LIBS="-lkrb4 -ldes425 -lkrb5 -lcrypto -lcom_err"], + [AC_CHECK_LIB(krb, krb_rd_req, + [KRB4_LIBS="-lkrb -ldes"], + [AC_MSG_ERROR(Kerberos 4 libraries not found)], + -ldes)], + -ldes425 -lkrb5 -lcrypto -lcom_err)]) AC_DEFUN(ATHENA_KRB4, [AC_ARG_WITH(krb4, |