]>
Commit | Line | Data |
---|---|---|
e2a11a76 JR |
1 | --- amanda-3.3.6/config/amanda/krb5-security.m4~ 2015-12-27 12:57:37.000000000 +0100 |
2 | +++ amanda-3.3.6/config/amanda/krb5-security.m4 2015-12-27 13:01:46.912103153 +0100 | |
3 | @@ -40,9 +40,7 @@ | |
4 | # in autoconf at this time. -kashmir | |
5 | AC_MSG_CHECKING(for Kerberos V libraries) | |
6 | KRB5_DIR_FOUND="" | |
7 | - for dir in $KRB5_SPOTS; do | |
8 | - for lib in lib lib64; do | |
9 | - k5libdir=${dir}/${lib} | |
10 | + k5libdir=$libdir | |
11 | if test \( -f ${k5libdir}/libkrb5.a -o -f ${k5libdir}/libkrb5.so \) -a \( -f ${k5libdir}/libgssapi_krb5.so -o -f ${k5libdir}/libgssapi_krb5.a \) -a \( -f ${k5libdir}/libcom_err.a -o -f ${k5libdir}/libcom_err.so \); then | |
12 | if test -f ${k5libdir}/libk5crypto.a -o -f ${k5libdir}/libk5crypto.so; then | |
13 | K5CRYPTO=-lk5crypto | |
14 | @@ -54,19 +54,15 @@ | |
15 | else | |
16 | K5SUPPORT="" | |
17 | fi | |
18 | - KRB5_DIR_FOUND=$dir | |
19 | + KRB5_DIR_FOUND=$prefix | |
20 | KRB5_LIBDIR_FOUND=$k5libdir | |
21 | AMANDA_ADD_LIBS([-lgssapi_krb5 -lkrb5 $K5CRYPTO $K5SUPPORT -lcom_err]) | |
22 | - break | |
23 | elif test \( -f ${k5libdir}/libkrb5.a -o -f ${k5libdir}/libkrb5.so \) -a \( -f ${k5libdir}/libasn1.a -o -f ${k5libdir}/libasn1.so \) -a \( -f ${k5libdir}/libgssapi.a -o -f ${k5libdir}/libgssapi.so \); then | |
24 | - KRB5_DIR_FOUND=$dir | |
25 | + KRB5_DIR_FOUND=$prefix | |
26 | KRB5_LIBDIR_FOUND=$k5libdir | |
27 | AMANDA_ADD_LIBS([-lgssapi -lkrb5 -lasn1]) | |
28 | AMANDA_ADD_CPPFLAGS([-DKRB5_HEIMDAL_INCLUDES]) | |
29 | - break | |
30 | fi | |
31 | - done | |
32 | - done | |
33 | ||
34 | if test "$KRB5_DIR_FOUND"; then | |
35 | AC_MSG_RESULT(found in $KRB5_DIR_FOUND) |