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

make 'configure --with-gssapi=yes' fatal if support is not found

parent c9cb567f
Pipeline #13717 passed with stages
in 16 minutes and 32 seconds
...@@ -841,7 +841,6 @@ infodir ...@@ -841,7 +841,6 @@ infodir
docdir docdir
oldincludedir oldincludedir
includedir includedir
runstatedir
localstatedir localstatedir
sharedstatedir sharedstatedir
sysconfdir sysconfdir
...@@ -999,7 +998,6 @@ datadir='${datarootdir}' ...@@ -999,7 +998,6 @@ datadir='${datarootdir}'
sysconfdir='${prefix}/etc' sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com' sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var' localstatedir='${prefix}/var'
runstatedir='${localstatedir}/run'
includedir='${prefix}/include' includedir='${prefix}/include'
oldincludedir='/usr/include' oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
...@@ -1252,15 +1250,6 @@ do ...@@ -1252,15 +1250,6 @@ do
| -silent | --silent | --silen | --sile | --sil) | -silent | --silent | --silen | --sile | --sil)
silent=yes ;; silent=yes ;;
-runstatedir | --runstatedir | --runstatedi | --runstated \
| --runstate | --runstat | --runsta | --runst | --runs \
| --run | --ru | --r)
ac_prev=runstatedir ;;
-runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
| --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
| --run=* | --ru=* | --r=*)
runstatedir=$ac_optarg ;;
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;; ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
...@@ -1398,7 +1387,7 @@ fi ...@@ -1398,7 +1387,7 @@ fi
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \ datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
libdir localedir mandir runstatedir libdir localedir mandir
do do
eval ac_val=\$$ac_var eval ac_val=\$$ac_var
# Remove trailing slashes. # Remove trailing slashes.
...@@ -1551,7 +1540,6 @@ Fine tuning of the installation directories: ...@@ -1551,7 +1540,6 @@ Fine tuning of the installation directories:
--sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var] --localstatedir=DIR modifiable single-machine data [PREFIX/var]
--runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib] --libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include] --includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include] --oldincludedir=DIR C header files for non-gcc [/usr/include]
...@@ -1648,7 +1636,7 @@ Optional Packages: ...@@ -1648,7 +1636,7 @@ Optional Packages:
PKCS11 provider) PKCS11 provider)
--with-gssapi=PATH|/path/krb5-config --with-gssapi=PATH|/path/krb5-config
Specify path for system-supplied GSSAPI Specify path for system-supplied GSSAPI
[default=yes] [default=auto]
--with-lmdb=PATH build with LMDB library [yes|no|path] --with-lmdb=PATH build with LMDB library [yes|no|path]
--with-libxml2=PATH build with libxml2 library [yes|no|path] --with-libxml2=PATH build with libxml2 library [yes|no|path]
--with-libjson=PATH build with libjson0 library [yes|no|path] --with-libjson=PATH build with libjson0 library [yes|no|path]
...@@ -3939,7 +3927,7 @@ else ...@@ -3939,7 +3927,7 @@ else
We can't simply define LARGE_OFF_T to be 9223372036854775807, We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */ incorrectly reject 9223372036854775807. */
#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1) && LARGE_OFF_T % 2147483647 == 1)
? 1 : -1]; ? 1 : -1];
...@@ -3985,7 +3973,7 @@ else ...@@ -3985,7 +3973,7 @@ else
We can't simply define LARGE_OFF_T to be 9223372036854775807, We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */ incorrectly reject 9223372036854775807. */
#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1) && LARGE_OFF_T % 2147483647 == 1)
? 1 : -1]; ? 1 : -1];
...@@ -4009,7 +3997,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ...@@ -4009,7 +3997,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
We can't simply define LARGE_OFF_T to be 9223372036854775807, We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */ incorrectly reject 9223372036854775807. */
#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1) && LARGE_OFF_T % 2147483647 == 1)
? 1 : -1]; ? 1 : -1];
...@@ -4054,7 +4042,7 @@ else ...@@ -4054,7 +4042,7 @@ else
We can't simply define LARGE_OFF_T to be 9223372036854775807, We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */ incorrectly reject 9223372036854775807. */
#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1) && LARGE_OFF_T % 2147483647 == 1)
? 1 : -1]; ? 1 : -1];
...@@ -4078,7 +4066,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ...@@ -4078,7 +4066,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
We can't simply define LARGE_OFF_T to be 9223372036854775807, We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */ incorrectly reject 9223372036854775807. */
#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1) && LARGE_OFF_T % 2147483647 == 1)
? 1 : -1]; ? 1 : -1];
...@@ -16319,7 +16307,7 @@ $as_echo_n "checking for GSSAPI library... " >&6; } ...@@ -16319,7 +16307,7 @@ $as_echo_n "checking for GSSAPI library... " >&6; }
if test "${with_gssapi+set}" = set; then : if test "${with_gssapi+set}" = set; then :
withval=$with_gssapi; use_gssapi="$withval" withval=$with_gssapi; use_gssapi="$withval"
else else
use_gssapi="yes" use_gssapi="auto"
fi fi
...@@ -16459,7 +16447,7 @@ esac ...@@ -16459,7 +16447,7 @@ esac
case "$host" in case "$host" in
*darwin*) *darwin*)
if test "yes" = "$use_gssapi" if test "yes" = "$use_gssapi" -o "auto" = "$use_gssapi"
then then
use_gssapi=framework use_gssapi=framework
fi fi
...@@ -16472,7 +16460,7 @@ esac ...@@ -16472,7 +16460,7 @@ esac
# for the specification of gssapi and krb5 headers in different locations, # for the specification of gssapi and krb5 headers in different locations,
# which probably ought to be fixed although fixing might raise the issue of # which probably ought to be fixed although fixing might raise the issue of
# trying to build with incompatible versions of gssapi and krb5. # 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 then
# first, deal with the obvious # first, deal with the obvious
if test \( -f /usr/include/kerberosv5/krb5.h -o \ if test \( -f /usr/include/kerberosv5/krb5.h -o \
...@@ -16496,8 +16484,11 @@ then ...@@ -16496,8 +16484,11 @@ then
break break
fi fi
fi fi
use_gssapi="no"
done done
if test "auto" = "$use_gssapi"
then
use_gssapi="no"
fi
fi fi
fi fi
......
...@@ -932,8 +932,8 @@ AC_MSG_CHECKING(for GSSAPI library) ...@@ -932,8 +932,8 @@ AC_MSG_CHECKING(for GSSAPI library)
AC_ARG_WITH(gssapi, AC_ARG_WITH(gssapi,
AS_HELP_STRING([--with-gssapi=[PATH|[/path/]krb5-config]], AS_HELP_STRING([--with-gssapi=[PATH|[/path/]krb5-config]],
[Specify path for system-supplied GSSAPI [Specify path for system-supplied GSSAPI
[default=yes]]), [default=auto]]),
use_gssapi="$withval", use_gssapi="yes") use_gssapi="$withval", use_gssapi="auto")
# first try using krb5-config, if that does not work then fall back to "yes" method. # first try using krb5-config, if that does not work then fall back to "yes" method.
...@@ -987,7 +987,7 @@ esac ...@@ -987,7 +987,7 @@ esac
case "$host" in case "$host" in
*darwin*) *darwin*)
if test "yes" = "$use_gssapi" if test "yes" = "$use_gssapi" -o "auto" = "$use_gssapi"
then then
use_gssapi=framework use_gssapi=framework
fi fi
...@@ -1000,7 +1000,7 @@ esac ...@@ -1000,7 +1000,7 @@ esac
# for the specification of gssapi and krb5 headers in different locations, # for the specification of gssapi and krb5 headers in different locations,
# which probably ought to be fixed although fixing might raise the issue of # which probably ought to be fixed although fixing might raise the issue of
# trying to build with incompatible versions of gssapi and krb5. # 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 then
# first, deal with the obvious # first, deal with the obvious
if test \( -f /usr/include/kerberosv5/krb5.h -o \ if test \( -f /usr/include/kerberosv5/krb5.h -o \
...@@ -1024,8 +1024,11 @@ then ...@@ -1024,8 +1024,11 @@ then
break break
fi fi
fi fi
use_gssapi="no"
done done
if test "auto" = "$use_gssapi"
then
use_gssapi="no"
fi
fi 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