Commit fc9b7cea authored by Mark Andrews's avatar Mark Andrews
Browse files

Merge branch...

Merge branch '962-bind-just-disables-gssapi-support-if-no-gssapi-krb5-headers-found-v9_11' into 'v9_11'

Resolve "Bind just disables GSSAPI support if no GSSAPI/KRB5 headers found"

See merge request !1843
parents 6d390871 e55a19c8
Pipeline #13728 passed with stages
in 55 seconds
......@@ -1771,7 +1771,7 @@ Optional Packages:
--with-geoip=PATH Build with GeoIP support (yes|no|path)
--with-gssapi=PATH|/path/krb5-config
Specify path for system-supplied GSSAPI
[default=yes]
[default=auto]
--with-randomdev=PATH Specify path for random device
--with-locktype=ARG Specify mutex lock type (adaptive or standard)
--with-libtool use GNU libtool
......@@ -14870,7 +14870,7 @@ $as_echo_n "checking for GSSAPI library... " >&6; }
if test "${with_gssapi+set}" = set; then :
withval=$with_gssapi; use_gssapi="$withval"
else
use_gssapi="yes"
use_gssapi="auto"
fi
......@@ -15010,7 +15010,7 @@ esac
case "$host" in
*darwin*)
if test "yes" = "$use_gssapi"
if test "yes" = "$use_gssapi" -o "auto" = "$use_gssapi"
then
use_gssapi=framework
fi
......@@ -15023,7 +15023,7 @@ esac
# for the specification of gssapi and krb5 headers in different locations,
# which probably ought to be fixed although fixing might raise the issue of
# trying to build with incompatible versions of gssapi and krb5.
if test "yes" = "$use_gssapi"
if test "yes" = "$use_gssapi" -o "auto" = "$use_gssapi"
then
# first, deal with the obvious
if test \( -f /usr/include/kerberosv5/krb5.h -o \
......@@ -15047,8 +15047,11 @@ then
break
fi
fi
use_gssapi="no"
done
if test "auto" = "$use_gssapi"
then
use_gssapi="no"
fi
fi
fi
......
......@@ -804,8 +804,8 @@ AC_MSG_CHECKING(for GSSAPI library)
AC_ARG_WITH(gssapi,
AS_HELP_STRING([--with-gssapi=[PATH|[/path/]krb5-config]],
[Specify path for system-supplied GSSAPI
[default=yes]]),
use_gssapi="$withval", use_gssapi="yes")
[default=auto]]),
use_gssapi="$withval", use_gssapi="auto")
# first try using krb5-config, if that does not work then fall back to "yes" method.
......@@ -859,7 +859,7 @@ esac
case "$host" in
*darwin*)
if test "yes" = "$use_gssapi"
if test "yes" = "$use_gssapi" -o "auto" = "$use_gssapi"
then
use_gssapi=framework
fi
......@@ -872,7 +872,7 @@ esac
# for the specification of gssapi and krb5 headers in different locations,
# which probably ought to be fixed although fixing might raise the issue of
# trying to build with incompatible versions of gssapi and krb5.
if test "yes" = "$use_gssapi"
if test "yes" = "$use_gssapi" -o "auto" = "$use_gssapi"
then
# first, deal with the obvious
if test \( -f /usr/include/kerberosv5/krb5.h -o \
......@@ -896,8 +896,11 @@ then
break
fi
fi
use_gssapi="no"
done
if test "auto" = "$use_gssapi"
then
use_gssapi="no"
fi
fi
fi
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment