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 | |
parent | 3c9b0e8934352a5840a5a18e94225216006e86b5 (diff) |
Update aclocal.m4 from master.
-rw-r--r-- | aclocal.m4 | 22 | ||||
-rwxr-xr-x | configure | 34 |
2 files changed, 29 insertions, 27 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, @@ -2893,18 +2893,23 @@ fi if test "$krb4" != no; then if test "$krb4" != yes; then CPPFLAGS="$CPPFLAGS -I$krb4/include" + if test -d "$krb4/include/kerberosIV"; then + CPPFLAGS="$CPPFLAGS -I$krb4/include/kerberosIV" + fi LDFLAGS="$LDFLAGS -L$krb4/lib" +elif test -d /usr/include/kerberosIV; then + CPPFLAGS="$CPPFLAGS -I/usr/include/kerberosIV" fi -echo $ac_n "checking for krb_rd_req in -lkrb""... $ac_c" 1>&6 -echo "configure:2900: checking for krb_rd_req in -lkrb" >&5 -ac_lib_var=`echo krb'_'krb_rd_req | sed 'y%./+-%__p_%'` +echo $ac_n "checking for krb_rd_req in -lkrb4""... $ac_c" 1>&6 +echo "configure:2905: checking for krb_rd_req in -lkrb4" >&5 +ac_lib_var=`echo krb4'_'krb_rd_req | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lkrb -ldes $LIBS" +LIBS="-lkrb4 -ldes425 -lkrb5 -lcrypto -lcom_err $LIBS" cat > conftest.$ac_ext <<EOF -#line 2908 "configure" +#line 2913 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -2915,7 +2920,7 @@ int main() { krb_rd_req() ; return 0; } EOF -if { (eval echo configure:2919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2930,22 +2935,17 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - KRB4_LIBS="-lkrb -ldes" + KRB4_LIBS="-lkrb4 -ldes425 -lkrb5 -lcrypto -lcom_err" else echo "$ac_t""no" 1>&6 -if test "$krb4" != yes; then - CPPFLAGS="$CPPFLAGS -I$krb4/include/kerberosIV" - else - CPPFLAGS="$CPPFLAGS -I/usr/include/kerberosIV" - fi - echo $ac_n "checking for krb_rd_req in -lkrb4""... $ac_c" 1>&6 -echo "configure:2943: checking for krb_rd_req in -lkrb4" >&5 -ac_lib_var=`echo krb4'_'krb_rd_req | sed 'y%./+-%__p_%'` +echo $ac_n "checking for krb_rd_req in -lkrb""... $ac_c" 1>&6 +echo "configure:2943: checking for krb_rd_req in -lkrb" >&5 +ac_lib_var=`echo krb'_'krb_rd_req | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lkrb4 -ldes425 -lkrb5 -lcrypto -lcom_err $LIBS" +LIBS="-lkrb -ldes $LIBS" cat > conftest.$ac_ext <<EOF #line 2951 "configure" #include "confdefs.h" @@ -2973,7 +2973,7 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - KRB4_LIBS="-lkrb4 -ldes425 -lkrb5 -lcrypto -lcom_err" + KRB4_LIBS="-lkrb -ldes" else echo "$ac_t""no" 1>&6 { echo "configure: error: Kerberos 4 libraries not found" 1>&2; exit 1; } |