OL_ARG_ENABLE(dynamic,[ --enable-dynamic enable linking built binaries with dynamic libs], no)dnl
dnl SLAPD Backend options
-OL_ARG_ENABLE(bdb2,[ --enable-bdb2 enable bdb2 backend], no)dnl
-OL_ARG_WITH(bdb2_module,[ --with-bdb2-module module type], static,
- [static dynamic])
-OL_ARG_ENABLE(dnssrv,[ --enable-dnssrv enable bdb2 backend], no)dnl
+OL_ARG_ENABLE(dnssrv,[ --enable-dnssrv enable dnssrv backend], no)dnl
OL_ARG_WITH(dnssrv_module,[ --with-dnssrv-module module type], static,
[static dynamic])
OL_ARG_ENABLE(ldap,[ --enable-ldap enable ldap backend], no)dnl
# validate options
if test $ol_enable_slapd = no ; then
dnl SLAPD was specificallly disabled
- if test $ol_enable_bdb2 = yes ; then
- AC_MSG_WARN([slapd disabled, ignoring --enable-bdb2 argument])
- fi
if test $ol_enable_dnssrv = yes ; then
AC_MSG_WARN([slapd disabled, ignoring --enable-dnssrv argument])
fi
if test $ol_with_ldbm_type != auto ; then
AC_MSG_WARN([slapd disabled, ignoring --with-ldbm-type argument])
fi
- if test $ol_with_bdb2_module != static ; then
- AC_MSG_WARN([slapd disabled, ignoring --with-bdb2-module argument])
- fi
if test $ol_with_dnssrv_module != static ; then
AC_MSG_WARN([slapd disabled, ignoring --with-dnssrv-module argument])
fi
fi
# force settings to no
- ol_enable_bdb2=no
ol_enable_dnssrv=no
ol_enable_ldap=no
ol_enable_ldbm=no
ol_with_ldbm_api=no
ol_with_ldbm_type=no
- ol_with_bdb2_module=static
ol_with_dnssrv_module=static
ol_with_ldap_module=static
ol_with_ldbm_module=static
AC_MSG_WARN([LDBM disabled, ignoring --with-ldbm-module argument])
fi
- if test $ol_enable_bdb2 = yes ; then
- AC_MSG_ERROR([BDB2 requires --enable-ldbm])
- fi
-
if test $ol_enable_modules != yes -a \
$ol_enable_dnssrv = no -a \
$ol_enable_ldap = no -a \
ol_with_ldbm_type=no
ol_with_ldbm_module=static
-elif test $ol_enable_bdb2 = yes ; then
- dnl SLAPD with BDB2
-
- if test $ol_with_ldbm_api != auto -a \
- $ol_with_ldbm_api != berkeley ; then
- AC_MSG_ERROR([BDB2 requires LDBM API berkeley or auto])
- fi
-
- ol_with_ldbm_api=db2
-
else
dnl SLAPD with LDBM
-
- if test $ol_enable_bdb2 != no ; then
- if test $ol_with_ldbm_api != auto -a \
- $ol_with_ldbm_api != berkeley ; then
- AC_MSG_WARN([BDB2 requires LDBM api berkeley or auto])
- ol_enable_bdb2=no
- fi
- fi
-
if test $ol_with_ldbm_api = gdbm -a \
$ol_with_ldbm_type = btree ; then
AC_MSG_ERROR([GDBM only supports LDBM type hash])
BUILD_QUIPU=no
BUILD_THREAD=no
-BUILD_BDB2=no
BUILD_DNSSRV=no
BUILD_LDAP=no
BUILD_LDBM=no
BUILD_SQL=no
BUILD_TCL=no
-BUILD_BDB2_DYNAMIC=static
BUILD_DNSSRV_DYNAMIC=static
BUILD_LDAP_DYNAMIC=static
BUILD_LDBM_DYNAMIC=static
fi
ol_link_modules=yes
else
- ol_with_bdb2_module=static
ol_with_dnssrv_module=static
ol_with_ldap_module=static
ol_with_ldbm_module=static
dnl ----------------------------------------------------------------
dnl Check for resolver routines
-AC_CHECK_FUNC(res_search,:)
-if test $ac_cv_func_res_search = no ; then
- AC_CHECK_LIB(bind, res_search)
- ac_cv_func_res_search=$ac_cv_lib_bind_res_search
+ol_link_dnssrv=no
+AC_CHECK_FUNC(res_query,:)
+if test $ac_cv_func_res_query = no ; then
+ AC_CHECK_LIB(bind, res_query)
+ ac_cv_func_res_query=$ac_cv_lib_bind_res_query
fi
-if test $ac_cv_func_res_search = no ; then
- AC_CHECK_LIB(bind, __res_search)
- ac_cv_func_res_search=$ac_cv_lib_bind___res_search
+if test $ac_cv_func_res_query = no ; then
+ AC_CHECK_LIB(bind, __res_query)
+ ac_cv_func_res_query=$ac_cv_lib_bind___res_query
fi
-if test $ac_cv_func_res_search = no ; then
- AC_CHECK_LIB(resolv, res_search)
- ac_cv_func_res_search=$ac_cv_lib_resolv_res_search
+if test $ac_cv_func_res_query = no ; then
+ AC_CHECK_LIB(resolv, res_query)
+ ac_cv_func_res_query=$ac_cv_lib_resolv_res_query
fi
-if test "$ac_cv_func_res_search" = yes ; then
- AC_DEFINE(HAVE_RES_SEARCH,1,
- [define if you have res_search()])
+if test "$ac_cv_func_res_query" = yes ; then
+ AC_DEFINE(HAVE_RES_QUERY,1,
+ [define if you have res_query()])
+
+ if test $ol_enable_dnssrv != no ; then
+ ol_link_dnssrv=yes
+ fi
fi
+if test "$ol_enable_dnssrv" = yes -a "$ol_link_dnssrv" = no ; then
+ AC_MSG_ERROR([DNSSRV requires res_query()])
+fi
dnl ----------------------------------------------------------------
dnl QUIPU
ol_enable_ldbm=no
fi
-dnl ----------------------------------------------------------------
-ol_link_bdb2=no
-if test $ol_enable_bdb2 != no ; then
- if test $ol_enable_bdb2 = yes -a $ol_link_ldbm != berkeley ; then
- AC_MSG_ERROR(BDB2 requires LDBM BerkeleyDB 2)
- elif test $ol_link_ldbm = berkeley ; then
- ol_link_bdb2=$ol_link_ldbm
- fi
-fi
-
dnl ----------------------------------------------------------------
if test $ol_enable_dynamic = yes -a $enable_shared = yes ; then
LINK_BINS_DYNAMIC="yes"
SLAPD_MODULES_LDFLAGS="-dlopen self"
fi
-if test "$ol_link_bdb2" != no ; then
- AC_DEFINE(SLAPD_BDB2,1,[define to support BDB2 backend])
- BUILD_SLAPD=yes
- BUILD_BDB2=yes
- if test "$ol_with_bdb2_module" != static ; then
- AC_DEFINE(SLAPD_BDB2_DYNAMIC,1,
- [define to support dynamic BDB2 backend])
- BUILD_BDB2=mod
- BUILD_BDB2_DYNAMIC=shared
- SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-bdb2/back_bdb2.la"
- fi
-fi
-
-if test "$ol_enable_dnssrv" != no ; then
+if test "$ol_link_dnssrv" != no ; then
AC_DEFINE(SLAPD_DNSSRV,1,[define to support DNS SRV backend])
BUILD_SLAPD=yes
BUILD_DNSSRV=yes
AC_SUBST(DYN_EXT)
AC_SUBST(BUILD_SLAPD)
- AC_SUBST(BUILD_BDB2)
AC_SUBST(BUILD_DNSSRV)
AC_SUBST(BUILD_LDAP)
AC_SUBST(BUILD_LDBM)
AC_SUBST(BUILD_SHELL)
AC_SUBST(BUILD_SQL)
AC_SUBST(BUILD_TCL)
- AC_SUBST(BUILD_BDB2_DYNAMIC)
AC_SUBST(BUILD_DNSSRV_DYNAMIC)
AC_SUBST(BUILD_LDAP_DYNAMIC)
AC_SUBST(BUILD_LDBM_DYNAMIC)
libraries/liblutil/Makefile:build/top.mk:libraries/liblutil/Makefile.in:build/lib.mk:build/lib-static.mk \
servers/Makefile:build/top.mk:servers/Makefile.in:build/dir.mk \
servers/slapd/Makefile:build/top.mk:servers/slapd/Makefile.in:build/srv.mk \
-servers/slapd/back-bdb2/Makefile:build/top.mk:servers/slapd/back-bdb2/Makefile.in:build/mod.mk \
servers/slapd/back-dnssrv/Makefile:build/top.mk:servers/slapd/back-dnssrv/Makefile.in:build/mod.mk \
servers/slapd/back-ldap/Makefile:build/top.mk:servers/slapd/back-ldap/Makefile.in:build/mod.mk \
servers/slapd/back-ldbm/Makefile:build/top.mk:servers/slapd/back-ldbm/Makefile.in:build/mod.mk \