X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=configure.in;h=ce738450016b9ab8247ec51ece24297681cae730;hb=65977a0f83168d2ad1105e0ac664b97bfcd3265e;hp=64b6f291d8b1178dc15a3fa4c66357eb3d7f7996;hpb=0552b1c53fa44790811f44cac5e14fc52fbd2ace;p=openldap

diff --git a/configure.in b/configure.in
index 64b6f291d8..ce73845001 100644
--- a/configure.in
+++ b/configure.in
@@ -513,6 +513,9 @@ SLAPD_MODULES_LDFLAGS=
 SLAPD_MODULES_CPPFLAGS=
 SLAPD_MODULES_LIST=
 
+SLAPD_STATIC_BACKENDS=
+SLAPD_DYNAMIC_BACKENDS=
+
 SLAPD_PERL_LDFLAGS=
 MOD_PERL_LDFLAGS=
 PERL_CPPFLAGS=
@@ -705,8 +708,8 @@ if test $ol_enable_modules != no ; then
 	fi
 
 	AC_CHECK_LIB(ltdl, lt_dlinit, [
-	    MODULES_LIBS=-lltdl
-	    AC_DEFINE(HAVE_LIBLTDL,1,[define if you have libtool -ltdl])
+		MODULES_LIBS=-lltdl
+		AC_DEFINE(HAVE_LIBLTDL,1,[define if you have libtool -ltdl])
 	])
 
 	if test "$ac_cv_lib_ltdl_lt_dlinit" = no ; then
@@ -812,14 +815,14 @@ for curlib in ws2_32 wsock32; do
 			char select@20();
 			char closesocket@4();
 			char gethostname@8();
-		    ],
-		    [
+			],
+			[
 			socket@12();
 			select@20();
 			closesocket@4();
 			gethostname@8();
-		    ],
-		    have_winsock=yes, have_winsock=no)
+			],
+			have_winsock=yes, have_winsock=no)
 
 	if test $have_winsock = yes; then
 		AC_DEFINE(HAVE_WINSOCK, 1, [define if you have winsock])
@@ -857,10 +860,10 @@ dnl require select
 AC_CHECK_FUNC(select, :, AC_MSG_ERROR([select() required.]))
 
 if test "${ac_cv_header_winsock_h}" != yes; then
-    dnl Select arg types
-    dnl (if this detection becomes permenent, it and the select() detection
-    dnl should be done before the yielding select test) 
-    AC_FUNC_SELECT_ARGTYPES
+	dnl Select arg types
+	dnl (if this detection becomes permenent, it and the select() detection
+	dnl should be done before the yielding select test) 
+	AC_FUNC_SELECT_ARGTYPES
 fi
 
 dnl check to see if system call automatically restart
@@ -873,13 +876,33 @@ if test "$ac_cv_header_regex_h" != yes ; then
 	AC_MSG_ERROR([POSIX regex.h required.])
 fi
 AC_SEARCH_LIBS(regfree, [regex gnuregex],
-	       :, AC_MSG_ERROR([POSIX regex required.]))
+	:, AC_MSG_ERROR([POSIX regex required.]))
 
 OL_POSIX_REGEX
 if test "$ol_cv_c_posix_regex" = no ; then
 	AC_MSG_ERROR([broken POSIX regex!])
 fi
 
+dnl ----------------------------------------------------------------
+dnl For windows, check for the need of RPCRT for UUID function support
+AC_MSG_CHECKING(to see if -lrpcrt4 is needed for win32 UUID support)
+save_LIBS="$LIBS"
+LIBS="$LIBS -lrpcrt4"
+AC_TRY_LINK([
+		char UuidCreate@4();
+		char UuidToStringA@8();
+		],
+		[
+		UuidCreate@4();
+		UuidToStringA@8();
+		],
+		need_rpcrt=yes, need_rpcrt=no)
+if test $need_rpcrt = yes; then
+	SLAPD_LIBS="$SLAPD_LIBS -lrpcrt4"
+fi
+LIBS="$save_LIBS"
+AC_MSG_RESULT($need_rpcrt)
+
 dnl ----------------------------------------------------------------
 dnl Check for resolver routines
 dnl	  need to check for both res_query and __res_query
@@ -1255,9 +1278,9 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \
 	OL_NT_THREADS
 
 	if test "$ol_cv_nt_threads" = yes ; then
-    	ol_link_threads=nt
-    	ol_with_threads=found
-    	ol_with_yielding_select=yes
+		ol_link_threads=nt
+		ol_with_threads=found
+		ol_with_yielding_select=yes
 
 		AC_DEFINE(HAVE_NT_SERVICE_MANAGER,1,[if you have NT Service Manager])
 		AC_DEFINE(HAVE_NT_EVENT_LOG,1,[if you have NT Event Log])
@@ -1601,7 +1624,7 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \
 			fi
 		fi
 
-    elif test $ac_cv_header_cthreads_h = yes ; then
+	elif test $ac_cv_header_cthreads_h = yes ; then
 		dnl Hurd variant of Mach Cthreads
 		dnl uses <cthreads.h> and -lthreads
 
@@ -1787,7 +1810,7 @@ dnl
 dnl	dnl check for reentrant/threadsafe functions
 dnl	dnl
 dnl	dnl note: these should only be used when linking
-dnl	dnl       with $LTHREAD_LIBS
+dnl	dnl		with $LTHREAD_LIBS
 dnl	dnl
 dnl	save_CPPFLAGS="$CPPFLAGS"
 dnl	save_LIBS="$LIBS"
@@ -2007,9 +2030,9 @@ if test $ol_enable_tcl != no ; then
 			AC_CHECK_LIB($lib,main,
 			  [have_tcl=yes
 			   if test x"$ol_with_tcl_module" = "xstatic" ; then
-			       SLAPD_LIBS="$SLAPD_LIBS -l${lib}"
+					SLAPD_LIBS="$SLAPD_LIBS -l${lib}"
 			   else
-			       MOD_TCL_LIB="-l${lib}"
+					MOD_TCL_LIB="-l${lib}"
 			   fi;break],[have_tcl=no])
 		done
 	fi
@@ -2314,6 +2337,8 @@ AC_CHECK_FUNCS(		\
 	lockf			\
 	memcpy			\
 	memmove			\
+	mkstemp			\
+	mktemp			\
 	pipe			\
 	read			\
 	recv			\
@@ -2349,7 +2374,7 @@ dnl We actually may need to replace more than this.
 AC_REPLACE_FUNCS(getopt)
 
 if test "$ac_cv_func_getopt" != yes; then
-    LIBSRCS="$LIBSRCS getopt.c"
+	LIBSRCS="$LIBSRCS getopt.c"
 fi
 
 dnl ----------------------------------------------------------------
@@ -2428,6 +2453,9 @@ if test "$ol_enable_bdb" != no ; then
 		BUILD_BDB=mod
 		BUILD_BDB_DYNAMIC=shared
 		SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-bdb/back_bdb.la"
+		SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-bdb"
+	else
+		SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-bdb"
 	fi
 fi
 
@@ -2441,6 +2469,9 @@ if test "$ol_link_dnssrv" != no ; then
 		BUILD_DNSSRV=mod
 		BUILD_DNSSRV_DYNAMIC=shared
 		SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-dnssrv/back_dnssrv.la"
+		SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-dnssrv"
+	else
+		SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-dnssrv"
 	fi
 fi
 
@@ -2454,6 +2485,9 @@ if test "$ol_enable_ldap" != no ; then
 		BUILD_LDAP=mod
 		BUILD_LDAP_DYNAMIC=shared
 		SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-ldap/back_ldap.la"
+		SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-ldap"
+	else
+		SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-ldap"
 	fi
 fi
 
@@ -2468,6 +2502,9 @@ if test "$ol_link_ldbm" != no -a $ol_enable_ldbm != no; then
 		BUILD_LDBM=mod
 		BUILD_LDBM_DYNAMIC=shared
 		SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-ldbm/back_ldbm.la"
+		SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-ldbm"
+	else
+		SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-ldbm"
 	fi
 fi
 
@@ -2487,6 +2524,9 @@ if test "$ol_enable_meta" != no ; then
 		BUILD_META=mod
 		BUILD_META_DYNAMIC=shared
 		SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-meta/back_meta.la"
+		SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-meta"
+	else
+		SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-meta"
 	fi
 fi
 
@@ -2500,6 +2540,9 @@ if test "$ol_enable_monitor" != no ; then
 		BUILD_MONITOR=mod
 		BUILD_MONITOR_DYNAMIC=shared
 		SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-monitor/back_monitor.la"
+		SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-monitor"
+	else
+		SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-monitor"
 	fi
 fi
 
@@ -2513,6 +2556,9 @@ if test "$ol_enable_passwd" != no ; then
 		BUILD_PASSWD=mod
 		BUILD_PASSWD_DYNAMIC=shared
 		SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-passwd/back_passwd.la"
+		SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-passwd"
+	else
+		SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-passwd"
 	fi
 fi
 
@@ -2526,6 +2572,9 @@ if test "$ol_link_perl" != no ; then
 		BUILD_PERL=mod
 		BUILD_PERL_DYNAMIC=shared
 		SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-perl/back_perl.la"
+		SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-perl"
+	else
+		SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-perl"
 	fi
 fi
 
@@ -2539,6 +2588,9 @@ if test "$ol_enable_shell" != no ; then
 		BUILD_SHELL=mod
 		BUILD_SHELL_DYNAMIC=shared
 		SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-shell/back_shell.la"
+		SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-shell"
+	else
+		SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-shell"
 	fi
 fi
 
@@ -2552,6 +2604,9 @@ if test "$ol_enable_tcl" != no ; then
 		BUILD_TCL=mod
 		BUILD_TCL_DYNAMIC=shared
 		SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-tcl/back_tcl.la"
+		SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-tcl"
+	else
+		SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-tcl"
 	fi
 fi
 
@@ -2565,6 +2620,9 @@ if test "$ol_link_sql" != no ; then
 		BUILD_SQL=mod
 		BUILD_SQL_DYNAMIC=shared
 		SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-sql/back_sql.la"
+		SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-sql"
+	else
+		SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-sql"
 	fi
 fi
 
@@ -2587,11 +2645,11 @@ dnl They hurt more than they help.
 dnl
 
 if test "$ac_cv_mingw32" = yes ; then
-    PLAT=NT
-    SLAPD_MODULES_LDFLAGS=
-    SLAPD_MODULES_LIST=
+	PLAT=NT
+	SLAPD_MODULES_LDFLAGS=
+	SLAPD_MODULES_LIST=
 else
-    PLAT=UNIX
+	PLAT=UNIX
 fi
 
 AC_SUBST(LIBSRCS)
@@ -2639,6 +2697,9 @@ AC_SUBST(SLAPD_MODULES_CPPFLAGS)
 AC_SUBST(SLAPD_MODULES_LDFLAGS)
 AC_SUBST(SLAPD_MODULES_LIST)
 
+AC_SUBST(SLAPD_STATIC_BACKENDS)
+AC_SUBST(SLAPD_DYNAMIC_BACKENDS)
+
 AC_SUBST(PERL_CPPFLAGS)
 AC_SUBST(SLAPD_PERL_LDFLAGS)
 AC_SUBST(MOD_PERL_LDFLAGS)
@@ -2686,7 +2747,7 @@ libraries/libldbm/Makefile:build/top.mk:libraries/libldbm/Makefile.in:build/lib.
 libraries/libldif/Makefile:build/top.mk:libraries/libldif/Makefile.in:build/lib.mk:build/lib-static.mk	\
 libraries/liblunicode/Makefile:build/top.mk:libraries/liblunicode/Makefile.in:build/lib.mk:build/lib-static.mk	\
 libraries/liblutil/Makefile:build/top.mk:libraries/liblutil/Makefile.in:build/lib.mk:build/lib-static.mk	\
-libraries/librewrite/Makefile:build/top.mk:libraries/librewrite/Makefile.in:build/lib.mk:build/lib-static.mk    \
+libraries/librewrite/Makefile:build/top.mk:libraries/librewrite/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-bdb/Makefile:build/top.mk:servers/slapd/back-bdb/Makefile.in:build/mod.mk \