Commit 04264316 authored by Kurt Zeilenga's avatar Kurt Zeilenga
Browse files

Fix --enabel-kbind=auto --without-kerberos detection

parent 1fb42bf9
This diff is collapsed.
......@@ -833,7 +833,10 @@ fi
dnl ----------------------------------------------------------------
dnl Kerberos
ol_link_kbind=no
ol_link_kpasswd=no
ol_link_krb5=no
ol_link_krb4=no
if test $ol_with_kerberos = auto -o $ol_with_kerberos = k5 \
-o $ol_with_kerberos = k5only -o $ol_with_kerberos = k425 ; then
......@@ -876,6 +879,10 @@ if test $ol_with_kerberos = auto -o $ol_with_kerberos = k5 \
AC_DEFINE(HAVE_KRB5, 1,
[define if you have Kerberos V])
if test $ol_enable_kpasswd != no ; then
ol_link_kpasswd=yes;
fi
if test $ol_with_kerberos = k5only ; then
ol_with_kerberos=found
fi
......@@ -887,7 +894,6 @@ if test $ol_with_kerberos = auto -o $ol_with_kerberos = k5 \
fi
fi
ol_link_krb4=no
if test $ol_link_krb5 = yes -a \
\( $ol_with_kerberos = auto -o $ol_with_kerberos = k425 \) ; then
......@@ -973,6 +979,10 @@ if test $ol_with_kerberos = auto -o $ol_with_kerberos = k4 \
fi
fi
if test $ol_link_krb4 = yes -a $ol_enable_kpasswd != no ; then
ol_link_kpasswd=yes;
fi
if test $ol_link_krb4 = yes -o $ol_link_krb5 = yes ; then
AC_DEFINE(HAVE_KERBEROS, 1, [define if you have Kerberos])
......@@ -2157,7 +2167,7 @@ if test "$ol_enable_cache" = no ; then
AC_DEFINE(LDAP_NOCACHE,1,
[define this to remove -lldap cache support])
fi
if test "$ol_enable_kbind" != no ; then
if test "$ol_link_kbind" != no ; then
AC_DEFINE(LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND,LDAP_VENDOR_VERSION)
fi
if test "$ol_enable_dns" != no ; then
......@@ -2183,7 +2193,7 @@ fi
if test "$ol_enable_crypt" != no ; then
AC_DEFINE(SLAPD_CRYPT,1,[define to support crypt(3) passwords])
fi
if test "$ol_enable_kpasswd" != no ; then
if test "$ol_link_kpasswd" != no ; then
AC_DEFINE(SLAPD_KPASSWD,1,[define to support Kerberos passwords])
fi
if test "$ol_enable_multimaster" != no ; then
......
......@@ -46,6 +46,15 @@
/* Define if on MINIX. */
#undef _MINIX
/* Define to `int' if <sys/types.h> doesn't define. */
#undef mode_t
/* Define to `long' if <sys/types.h> doesn't define. */
#undef off_t
/* Define to `int' if <sys/types.h> doesn't define. */
#undef pid_t
/* Define if the system does not provide POSIX.1 features except
with this defined. */
#undef _POSIX_1_SOURCE
......@@ -65,6 +74,9 @@
/* Define to the type of arg5 for select(). */
#undef SELECT_TYPE_ARG5
/* Define to `unsigned' if <sys/types.h> doesn't define. */
#undef size_t
/* Define if you have the ANSI C header files. */
#undef STDC_HEADERS
......@@ -124,6 +136,12 @@
LBER_TAG_T
*/
/* define to character address type */
#undef caddr_t
/* define to signed size type */
#undef ssize_t
/* Define if you have the bcopy function. */
#undef HAVE_BCOPY
......@@ -412,9 +430,6 @@
/* Define if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
/* Define if you have the <minix/config.h> header file. */
#undef HAVE_MINIX_CONFIG_H
/* Define if you have the <ncurses.h> header file. */
#undef HAVE_NCURSES_H
......@@ -460,9 +475,6 @@
/* Define if you have the <resolv.h> header file. */
#undef HAVE_RESOLV_H
/* Define if you have the <sasl.h> header file. */
#undef HAVE_SASL_H
/* Define if you have the <sched.h> header file. */
#undef HAVE_SCHED_H
......@@ -775,27 +787,9 @@
/* define if setproctitle(3) is available */
#undef HAVE_SETPROCTITLE
/* Define to `int' if <sys/types.h> does not define. */
#undef mode_t
/* Define to `long' if <sys/types.h> does not define. */
#undef off_t
/* Define to `int' if <sys/types.h> does not define. */
#undef pid_t
/* Define if system has ptrdiff_t type */
#undef HAVE_PTRDIFF_T
/* Define to `unsigned' if <sys/types.h> does not define. */
#undef size_t
/* Define to `signed int' if <sys/types.h> does not define. */
#undef ssize_t
/* Define to `char *' if <sys/types.h> does not define. */
#undef caddr_t
/* define to int if socklen_t is not available */
#undef socklen_t
......
Supports Markdown
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