OL_ARG_ENABLE(proctitle,[ --enable-proctitle enable proctitle support], yes)dnl
OL_ARG_ENABLE(cache,[ --enable-cache enable caching], yes)dnl
OL_ARG_ENABLE(referrals,[ --enable-referrals enable V2 Referrals extension], yes)dnl
-OL_ARG_ENABLE(kbind,[ --enable-kbind enable V2 Kerberos IV bind], auto)dnl
+OL_ARG_ENABLE(kbind,[ --enable-kbind enable V2 Kerberos IV bind], no)dnl
OL_ARG_ENABLE(ipv6,[ --enable-ipv6 enable IPv6 support], auto)dnl
OL_ARG_ENABLE(local,[ --enable-local enable AF_LOCAL (AF_UNIX) socket support], auto)dnl
OL_ARG_ENABLE(x_compile,[ --enable-x-compile enable cross compiling],
if test $ol_with_kerberos = no ; then
AC_MSG_ERROR([options require --with-kerberos])
fi
+ ol_with_kerberos=yes
elif test $ol_enable_kbind = no -o $ol_enable_kpasswd = no ; then
- if test $ol_with_kerberos != auto ; then
+ if test $ol_with_kerberos != no -a $ol_with_kerberos != auto ; then
AC_MSG_WARN([Kerberos detection enabled unnecessarily]);
- else
- ol_with_kerberos=no
fi
+ ol_with_kerberos=no
fi
if test $ol_enable_spasswd = yes ; then
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
+if test $ol_with_kerberos = yes -o $ol_with_kerberos = auto \
+ -o $ol_with_kerberos = k5 -o $ol_with_kerberos = k5only \
+ -o $ol_with_kerberos = k425 ; then
AC_CHECK_HEADERS(krb5.h)
fi
fi
-if test $ol_link_krb5 = yes -a \
- \( $ol_with_kerberos = auto -o $ol_with_kerberos = k425 \) ; then
+if test $ol_link_krb5 = yes -a \( $ol_with_kerberos = yes -o \
+ $ol_with_kerberos = auto -o $ol_with_kerberos = k425 \) ; then
AC_CHECK_HEADERS(kerberosIV/krb.h kerberosIV/des.h)
ol_with_kerberos=found
fi
-if test $ol_with_kerberos = auto -o $ol_with_kerberos = k4 \
- -o $ol_with_kerberos = kth ; then
+if test $ol_with_kerberos = yes -o $ol_with_kerberos = auto \
+ -o $ol_with_kerberos = k4 -o $ol_with_kerberos = kth ; then
AC_CHECK_HEADERS(krb.h des.h krb-archaeology.h )
fi
if test $ol_link_krb4 = yes -a $ol_enable_kpasswd != no ; then
- ol_link_kpasswd=yes;
+ ol_link_kpasswd=yes
+fi
+
+if test $ol_link_krb4 = yes -a $ol_enable_kbind != no ; then
+ ol_link_kbind=yes
+
+elif test $ol_enable_kbind = yes ; then
+ AC_MSG_ERROR([Kerberos IV detection failed])
fi
if test $ol_link_krb4 = yes -o $ol_link_krb5 = yes ; then
AC_DEFINE(HAVE_KERBEROS, 1, [define if you have Kerberos])
elif test $ol_with_kerberos != auto -a $ol_with_kerberos != no ; then
- AC_MSG_ERROR([Kerberos detection failed.])
+ AC_MSG_ERROR([Kerberos detection failed])
fi
dnl ----------------------------------------------------------------
else
AC_CHECK_LIB(odbc,SQLDriverConnect,[have_odbc=yes],[have_odbc=no])
if test $have_odbc = yes ; then
- ol_link_sql="-liodbc"
+ ol_link_sql="-lodbc"
fi
fi
ol_link_sasl=no
ol_link_spasswd=no
if test $ol_with_cyrus_sasl != no ; then
- AC_CHECK_HEADER(sasl.h)
+ AC_CHECK_HEADERS(sasl.h)
if test $ac_cv_header_sasl_h = yes ; then
AC_CHECK_LIB(sasl, sasl_client_init,