Lines 1-15
Link Here
|
1 |
--- configure.orig 2015-11-01 10:46:19 UTC |
1 |
--- configure.orig 2015-11-01 10:46:19 UTC |
2 |
+++ configure |
2 |
+++ configure |
3 |
@@ -27107,9 +27107,6 @@ |
3 |
@@ -27729,9 +27729,11 @@ |
4 |
if test "x$ac_cv_path_krb5_config" != "xno" ; then |
4 |
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
5 |
krb5confpath="`dirname $ac_cv_path_krb5_config`" |
5 |
test $ac_status = 0; }; then |
6 |
ac_heimdal="`$ac_cv_path_krb5_config --version 2>/dev/null | grep -c -i heimdal`" |
6 |
squid_pc_krb5_name="heimdal-gssapi" |
7 |
- if test "x$with_heimdal_krb5" = "xyes"; then |
7 |
+ else |
8 |
- as_fn_error $? "Could not find pkg-config or krb5-config for Heimdal Kerberos" "$LINENO" 5 |
8 |
+ squid_pc_krb5_name="heimdal-gssapi" |
9 |
- fi |
9 |
fi |
10 |
else |
10 |
fi |
11 |
if test "x$with_heimdal_krb5" = "xyes"; then |
11 |
- if test "x$squid_pc_krb5_name" != "x" -a "$cross_compiling" = "no"; then |
12 |
as_fn_error $? "Could not find krb5-config in path" "$LINENO" 5 |
12 |
+ if test "x$squid_pc_krb5_name" = "x" -a "$cross_compiling" = "no"; then |
|
|
13 |
# Look for krb5-config (unless cross-compiling) |
14 |
# Extract the first word of "krb5-config", so it can be a program name with args. |
15 |
set dummy krb5-config; ac_word=$2 |
13 |
@@ -32038,7 +32040,7 @@ done |
16 |
@@ -32038,7 +32040,7 @@ done |
14 |
## |
17 |
## |
15 |
|
18 |
|