X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=configure.in;h=183bcb724c787a493452a4a46c801ae5d640690f;hb=931d7f4a952d456b79717e317a83d27072d9f73d;hp=daf08796af44000f3522427323fe82819804bcc5;hpb=aad140151e2e1939b1a9f0c20b45c554efe10b9a;p=openldap

diff --git a/configure.in b/configure.in
index daf08796af..183bcb724c 100644
--- a/configure.in
+++ b/configure.in
@@ -214,7 +214,7 @@ OL_ARG_ENABLE(bdb,[    --enable-bdb	  enable Berkeley DB backend no|yes|mod],
 OL_ARG_ENABLE(dnssrv,[    --enable-dnssrv	  enable dnssrv backend no|yes|mod],
 	no, [no yes mod])dnl
 OL_ARG_ENABLE(hdb,[    --enable-hdb	  enable Hierarchical DB backend no|yes|mod],
-	no, [no yes mod])dnl
+	yes, [no yes mod])dnl
 OL_ARG_ENABLE(ldap,[    --enable-ldap	  enable ldap backend no|yes|mod],
 	no, [no yes mod])dnl
 OL_ARG_ENABLE(ldbm,[    --enable-ldbm	  enable ldbm backend no|yes|mod], no,
@@ -538,7 +538,7 @@ SLAPD_DYNAMIC_OVERLAYS=
 SLAPD_MODULES_LDFLAGS=
 SLAPD_MODULES_CPPFLAGS=
 
-SLAPD_STATIC_BACKENDS=
+SLAPD_STATIC_BACKENDS=back-ldif
 SLAPD_DYNAMIC_BACKENDS=
 
 SLAPD_PERL_LDFLAGS=
@@ -968,51 +968,26 @@ fi
 
 dnl ----------------------------------------------------------------
 dnl Check for resolver routines
-dnl	  need to check for both res_query and __res_query
-dnl   need to check -lc, -lbind, and -lresolv
-ol_link_dnssrv=no
-AC_CHECK_FUNC(res_query,:)
-if test $ac_cv_func_res_query = no ; then 
-	AC_CHECK_FUNC(__res_query,:)
-	ac_cv_func_res_query=$ac_cv_func___res_query
-fi
-
-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
+OL_RESOLVER_LINK
 
-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_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_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_query = no ; then 
-	AC_CHECK_LIB(resolv, _res_9_query)
-	ac_cv_func_res_query=$ac_cv_lib_resolv_res_9_query
-fi
-
-if test "$ac_cv_func_res_query" = yes ; then
+ol_link_dnssrv=no
+if test "$ol_cv_lib_resolver" != no ; then
 	AC_DEFINE(HAVE_RES_QUERY,1,
 		[define if you have res_query()])
 
-	if test $ol_enable_dnssrv != no ; then
-		ol_link_dnssrv=yes
+	if test "$ol_enable_dnssrv" != no ; then
+		ol_link_dnssrv=yes;
+	fi
+
+	if test "$ol_cv_lib_resolver" != yes ; then
+		LIBS="$ol_cv_lib_resolver $LIBS"
 	fi
 fi
 
-if test "$ol_enable_dnssrv" != no -a "$ol_link_dnssrv" = no ; then
+if test "$ol_enable_dnssrv" = yes -a "$ol_link_dnssrv" = no ; then
 	AC_MSG_ERROR([DNSSRV requires res_query()])
+else
+	ol_enable_dnssrv=no
 fi
 
 AC_CHECK_FUNCS( hstrerror )
@@ -2094,6 +2069,9 @@ if test $ol_enable_sql != no ; then
 		AC_MSG_ERROR([could not locate SQL headers])
 	])
 
+	sql_LIBS="$LIBS"
+	LIBS="$LTHREAD_LIBS"
+
 	AC_CHECK_LIB(iodbc,SQLDriverConnect,[have_iodbc=yes],[have_iodbc=no])
 	if test $have_iodbc = yes ; then
 		ol_link_sql="-liodbc"
@@ -2104,6 +2082,8 @@ if test $ol_enable_sql != no ; then
 		fi
 	fi
 
+	LIBS="$sql_LIBS"
+
 	if test $ol_link_sql != no ; then
 		SLAPD_SQL_LIBS="$ol_link_sql"
 
@@ -2519,6 +2499,9 @@ if test "$ac_cv_func_getopt" != yes; then
 fi
 if test "$ac_cv_func_getpeereid" != yes; then
 	OL_MSGHDR_MSG_ACCRIGHTS
+	if test "$ac_cv_func_getpeereid" != yes; then
+		OL_MSGHDR_MSG_CONTROL
+	fi
 	LIBSRCS="$LIBSRCS getpeereid.c"
 fi
 if test "$ac_cv_func_snprintf" != yes -o "$ac_cv_func_vsnprintf" != yes; then
@@ -3039,6 +3022,7 @@ servers/slapd/back-dnssrv/Makefile:build/top.mk:servers/slapd/back-dnssrv/Makefi
 servers/slapd/back-hdb/Makefile:build/top.mk:servers/slapd/back-hdb/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 \
+servers/slapd/back-ldif/Makefile:build/top.mk:servers/slapd/back-ldif/Makefile.in:build/mod.mk \
 servers/slapd/back-meta/Makefile:build/top.mk:servers/slapd/back-meta/Makefile.in:build/mod.mk \
 servers/slapd/back-monitor/Makefile:build/top.mk:servers/slapd/back-monitor/Makefile.in:build/mod.mk \
 servers/slapd/back-null/Makefile:build/top.mk:servers/slapd/back-null/Makefile.in:build/mod.mk \