mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-12-20 22:59:34 -05:00
Add detection for Cyrus SASL library.
Improve detection of FreeBSD FetchURL library.
This commit is contained in:
parent
97683ac5fd
commit
6f51f4d671
3 changed files with 817 additions and 636 deletions
50
configure.in
50
configure.in
|
|
@ -72,6 +72,10 @@ OL_ARG_ENABLE(x_compile,[ --enable-x-compile enable cross compiling],
|
||||||
dnl General "with" options
|
dnl General "with" options
|
||||||
OL_ARG_ENABLE(dmalloc,[ --enable-dmalloc enable debug malloc support], no)dnl
|
OL_ARG_ENABLE(dmalloc,[ --enable-dmalloc enable debug malloc support], no)dnl
|
||||||
|
|
||||||
|
OL_ARG_WITH(cyrus_sasl,[ --with-cyrus-sasl with Cyrus SASL support],
|
||||||
|
auto, [auto yes no] )
|
||||||
|
OL_ARG_WITH(fetch,[ --with-fetch with fetch URL support],
|
||||||
|
auto, [auto yes no] )
|
||||||
OL_ARG_WITH(kerberos,[ --with-kerberos with Kerberos support],
|
OL_ARG_WITH(kerberos,[ --with-kerberos with Kerberos support],
|
||||||
auto, [auto k5 k4 afs yes no])
|
auto, [auto k5 k4 afs yes no])
|
||||||
OL_ARG_WITH(readline,[ --with-readline with readline support],
|
OL_ARG_WITH(readline,[ --with-readline with readline support],
|
||||||
|
|
@ -1635,6 +1639,46 @@ if test $ol_link_termcap = no ; then
|
||||||
TERMCAP_LIBS=
|
TERMCAP_LIBS=
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
dnl
|
||||||
|
dnl Check for fetch URL support
|
||||||
|
dnl should be extended to support other fetch URL APIs
|
||||||
|
dnl
|
||||||
|
ol_link_sasl=no
|
||||||
|
if test $ol_with_cyrus_sasl != no ; then
|
||||||
|
AC_CHECK_HEADER(sasl.h)
|
||||||
|
|
||||||
|
if test $ac_cv_header_sasl_h = yes ; then
|
||||||
|
AC_CHECK_LIB(sasl, sasl_client_init,
|
||||||
|
[have_cyrus_sasl=yes], [have_cyrus_sasl=no])
|
||||||
|
|
||||||
|
if test $have_cyrus_sasl != no ; then
|
||||||
|
LUTIL_LIBS="$LUTIL_LIBS -lsasl"
|
||||||
|
ol_link_sasl=yes
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test $ol_link_sasl = no -a $ol_with_cyrus_sasl = yes ; then
|
||||||
|
AC_MSG_ERROR(no suitable API for --with-cyrus-sasl=$ol_with_cyrus_sasl)
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
dnl
|
||||||
|
dnl Check for fetch URL support
|
||||||
|
dnl should be extended to support other fetch URL APIs
|
||||||
|
dnl
|
||||||
|
ol_link_fetch=no
|
||||||
|
if test $ol_with_fetch != no ; then
|
||||||
|
OL_LIB_FETCH
|
||||||
|
|
||||||
|
if test $ol_cv_lib_fetch != no ; then
|
||||||
|
LDIF_LIBS="$LDIF_LIBS $ol_link_fetch"
|
||||||
|
ol_link_fetch=freebsd
|
||||||
|
|
||||||
|
elif test $ol_with_fetch != auto ; then
|
||||||
|
AC_MSG_ERROR(no suitable API for --with-fetch=$ol_with_fetch)
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
dnl
|
dnl
|
||||||
dnl Check for GNU readline
|
dnl Check for GNU readline
|
||||||
dnl
|
dnl
|
||||||
|
|
@ -1697,12 +1741,6 @@ if test $ol_enable_proctitle != no ; then
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
OL_LIB_FETCH
|
|
||||||
|
|
||||||
if test $ol_cv_lib_fetch != no ; then
|
|
||||||
LDIF_LIBS="$LDIF_LIBS $ol_link_fetch"
|
|
||||||
fi
|
|
||||||
|
|
||||||
dnl ----------------------------------------------------------------
|
dnl ----------------------------------------------------------------
|
||||||
dnl Checks for typedefs, structures, and compiler characteristics.
|
dnl Checks for typedefs, structures, and compiler characteristics.
|
||||||
AC_TYPE_GETGROUPS dnl requires AC_TYPE_UID_T
|
AC_TYPE_GETGROUPS dnl requires AC_TYPE_UID_T
|
||||||
|
|
|
||||||
|
|
@ -699,6 +699,9 @@
|
||||||
/* define if you have no termcap support */
|
/* define if you have no termcap support */
|
||||||
#undef NO_TERMCAP
|
#undef NO_TERMCAP
|
||||||
|
|
||||||
|
/* define if you actually have FreeBSD fetch(3) */
|
||||||
|
#undef HAVE_FETCH
|
||||||
|
|
||||||
/* define if you have -lreadline */
|
/* define if you have -lreadline */
|
||||||
#undef HAVE_READLINE
|
#undef HAVE_READLINE
|
||||||
|
|
||||||
|
|
@ -708,9 +711,6 @@
|
||||||
/* define if setproctitle(3) is available */
|
/* define if setproctitle(3) is available */
|
||||||
#undef HAVE_SETPROCTITLE
|
#undef HAVE_SETPROCTITLE
|
||||||
|
|
||||||
/* define if you actually have FreeBSD fetch(3) */
|
|
||||||
#undef HAVE_FETCH
|
|
||||||
|
|
||||||
/* Define if system has ptrdiff_t type */
|
/* Define if system has ptrdiff_t type */
|
||||||
#undef HAVE_PTRDIFF_T
|
#undef HAVE_PTRDIFF_T
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue