X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=configure.in;h=a7e3fed0e4a6b2e57e1fa56bb58e791257ad68b9;hb=ece9bdb0ebee4682ac52b147de9b3f36bb38fa46;hp=1156691d295ce8e6b254a7f6f1dd407a619cd590;hpb=3ca26377c028bada56966c88ae95414d35303f1a;p=openldap

diff --git a/configure.in b/configure.in
index 1156691d29..a7e3fed0e4 100644
--- a/configure.in
+++ b/configure.in
@@ -2,10 +2,11 @@ dnl $OpenLDAP$
 dnl
 dnl Copyright 1998-2001 The OpenLDAP Foundation.  All Rights Reserved.
 dnl 
-dnl Redistribution and use in source and binary forms are permitted only
-dnl as authorized by the OpenLDAP Public License.  A copy of this
-dnl license is available at http://www.OpenLDAP.org/license.html or
-dnl in file LICENSE in the top-level directory of the distribution.
+dnl Redistribution and use in source and binary forms, with or without
+dnl modification, are permitted only as authorized by the OpenLDAP
+dnl Public License.  A copy of this license is available at
+dnl http://www.OpenLDAP.org/license.html or in file LICENSE in the
+dnl top-level directory of the distribution.
 dnl
 dnl ----------------------------------------------------------------
 dnl Redefine AC_INIT_BINSH to provide RCS IDs and copyright notice
@@ -17,10 +18,11 @@ define([AC_INIT_BINSH],
 
 # Copyright 1998-2001 The OpenLDAP Foundation.  All Rights Reserved.
 # 
-# Redistribution and use in source and binary forms are permitted only
-# as authorized by the OpenLDAP Public License.  A copy of this
-# license is available at http://www.OpenLDAP.org/license.html or
-# in file LICENSE in the top-level directory of the distribution.
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted only as authorized by the OpenLDAP
+# Public License.  A copy of this license is available at
+# http://www.OpenLDAP.org/license.html or in file LICENSE in the
+# top-level directory of the distribution.
 
 echo "Copyright 1998-2001 The OpenLDAP Foundation,  All Rights Reserved."
 echo "Restrictions apply, see COPYRIGHT and LICENSE files."
@@ -116,7 +118,7 @@ OL_ARG_ENABLE(referrals,[  --enable-referrals	  enable V2 Referrals (experimenta
 OL_ARG_ENABLE(kbind,[  --enable-kbind	  enable V2 Kerberos IV bind (deprecated)], 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(rewrite,[    --enable-rewrite	  enable rewrite], no)dnl
+OL_ARG_ENABLE(rewrite,[  --enable-rewrite	  enable rewrite], no)dnl
 OL_ARG_ENABLE(x_compile,[  --enable-x-compile	  enable cross compiling],
 	no, [yes no])dnl
 
@@ -181,6 +183,9 @@ OL_ARG_WITH(ldbm_type,[    --with-ldbm-type	  use LDBM type], auto,
 OL_ARG_ENABLE(meta,[    --enable-meta	  enable metadirectory backend], no)dnl
 OL_ARG_WITH(meta_module,[    --with-meta-module	  module type], static,
 	[static dynamic])
+OL_ARG_ENABLE(monitor,[    --enable-monitor	  enable monitor backend], no)dnl
+OL_ARG_WITH(monitor_module,[    --with-monitor-module	  module type], static,
+	[static dynamic])
 OL_ARG_ENABLE(passwd,[    --enable-passwd	  enable passwd backend], no)dnl
 OL_ARG_WITH(passwd_module,[    --with-passwd-module  module type], static,
 	[static dynamic])
@@ -229,6 +234,9 @@ if test $ol_enable_slapd = no ; then
 	if test $ol_enable_meta = yes ; then
 		AC_MSG_WARN([slapd disabled, ignoring --enable-meta argument])
 	fi
+	if test $ol_enable_module = yes ; then
+		AC_MSG_WARN([slapd disabled, ignoring --enable-monitor argument])
+	fi
 	if test $ol_enable_passwd = yes ; then
 		AC_MSG_WARN([slapd disabled, ignoring --enable-passwd argument])
 	fi
@@ -283,6 +291,9 @@ dnl	fi
 	if test $ol_with_meta_module != static ; then
 		AC_MSG_WARN([slapd disabled, ignoring --with-meta-module argument])
 	fi
+	if test $ol_with_monitor_module != static ; then
+		AC_MSG_WARN([slapd disabled, ignoring --with-monitor-module argument])
+	fi
 	if test $ol_with_passwd_module != static ; then
 		AC_MSG_WARN([slapd disabled, ignoring --with-passwd-module argument])
 	fi
@@ -311,6 +322,7 @@ dnl	fi
 	ol_enable_ldap=no
 	ol_enable_ldbm=no
 	ol_enable_meta=no
+	ol_enable_monitor=no
 	ol_enable_passwd=no
 	ol_enable_perl=no
 	ol_enable_shell=no
@@ -333,6 +345,7 @@ dnl	ol_enable_multimaster=no
 	ol_with_ldap_module=static
 	ol_with_ldbm_module=static
 	ol_with_meta_module=static
+	ol_with_monitor_module=static
 	ol_with_passwd_module=static
 	ol_with_perl_module=static
 	ol_with_shell_module=static
@@ -363,6 +376,7 @@ elif test $ol_enable_ldbm = no ; then
 		$ol_enable_dnssrv = no -a \
 		$ol_enable_ldap = no -a \
 		$ol_enable_meta = no -a \
+		$ol_enable_monitor = no -a \
 		$ol_enable_passwd = no -a \
 		$ol_enable_perl = no -a \
 		$ol_enable_shell = no -a \
@@ -446,6 +460,7 @@ BUILD_DNSSRV=no
 BUILD_LDAP=no
 BUILD_LDBM=no
 BUILD_META=no
+BUILD_MONITOR=no
 BUILD_PASSWD=no
 BUILD_PERL=no
 BUILD_SHELL=no
@@ -457,6 +472,7 @@ BUILD_DNSSRV_DYNAMIC=static
 BUILD_LDAP_DYNAMIC=static
 BUILD_LDBM_DYNAMIC=static
 BUILD_META_DYNAMIC=static
+BUILD_MONITOR_DYNAMIC=static
 BUILD_PASSWD_DYNAMIC=static
 BUILD_PERL_DYNAMIC=static
 BUILD_SHELL_DYNAMIC=static
@@ -671,6 +687,7 @@ else
 	ol_with_ldap_module=static
 	ol_with_ldbm_module=static
 	ol_with_meta_module=static
+	ol_with_monitor_module=static
 	ol_with_passwd_module=static
 	ol_with_perl_module=static
 	ol_with_shell_module=static
@@ -2202,7 +2219,6 @@ AC_CHECK_FUNCS(		\
 	lockf			\
 	memcpy			\
 	memmove			\
-	mkstemp			\
 	pipe			\
 	read			\
 	recv			\
@@ -2216,7 +2232,6 @@ AC_CHECK_FUNCS(		\
 	sigaction		\
 	signal			\
 	sigset			\
-	snprintf		\
 	strdup			\
 	strerror		\
 	strpbrk			\
@@ -2235,16 +2250,12 @@ AC_CHECK_FUNCS(		\
 )
 
 dnl We actually may need to replace more than this.
-AC_REPLACE_FUNCS(getopt tempnam)
+AC_REPLACE_FUNCS(getopt)
 
 if test "$ac_cv_func_getopt" != yes; then
     LIBSRCS="$LIBSRCS getopt.c"
 fi
 
-if test "$ac_cv_func_tempnam" != yes; then
-    LIBSRCS="$LIBSRCS tempnam.c"
-fi
-
 dnl ----------------------------------------------------------------
 # Check Configuration
 OL_SYS_ERRLIST
@@ -2382,6 +2393,19 @@ if test "$ol_enable_meta" != no ; then
 	fi
 fi
 
+if test "$ol_enable_monitor" != no ; then
+	AC_DEFINE(SLAPD_MONITOR,1,[define to support cn=Monitor backend])
+	BUILD_SLAPD=yes
+	BUILD_MONITOR=yes
+	if test "$ol_with_monitor_module" != static ; then
+		AC_DEFINE(SLAPD_MONITOR_DYNAMIC,1,
+			[define to support dynamic cn=Monitor backend])
+		BUILD_MONITOR=mod
+		BUILD_MONITOR_DYNAMIC=shared
+		SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-monitor/back_monitor.la"
+	fi
+fi
+
 if test "$ol_enable_passwd" != no ; then
 	AC_DEFINE(SLAPD_PASSWD,1,[define to support PASSWD backend])
 	BUILD_SLAPD=yes
@@ -2489,6 +2513,7 @@ AC_SUBST(BUILD_SLAPD)
   AC_SUBST(BUILD_LDAP)
   AC_SUBST(BUILD_LDBM)
   AC_SUBST(BUILD_META)
+  AC_SUBST(BUILD_MONITOR)
   AC_SUBST(BUILD_PASSWD)
   AC_SUBST(BUILD_PERL)
   AC_SUBST(BUILD_SHELL)
@@ -2499,6 +2524,7 @@ AC_SUBST(BUILD_SLAPD)
   AC_SUBST(BUILD_LDAP_DYNAMIC)
   AC_SUBST(BUILD_LDBM_DYNAMIC)
   AC_SUBST(BUILD_META_DYNAMIC)
+  AC_SUBST(BUILD_MONITOR_DYNAMIC)
   AC_SUBST(BUILD_PASSWD_DYNAMIC)
   AC_SUBST(BUILD_PERL_DYNAMIC)
   AC_SUBST(BUILD_SHELL_DYNAMIC)
@@ -2554,10 +2580,7 @@ doc/man/man5/Makefile:build/top.mk:doc/man/man5/Makefile.in:build/man.mk \
 doc/man/man8/Makefile:build/top.mk:doc/man/man8/Makefile.in:build/man.mk \
 clients/Makefile:build/top.mk:clients/Makefile.in:build/dir.mk \
 clients/finger/Makefile:build/top.mk:clients/finger/Makefile.in:build/rules.mk \
-clients/fax500/Makefile:build/top.mk:clients/fax500/Makefile.in:build/rules.mk \
-clients/gopher/Makefile:build/top.mk:clients/gopher/Makefile.in:build/rules.mk \
 clients/mail500/Makefile:build/top.mk:clients/mail500/Makefile.in:build/rules.mk \
-clients/rcpt500/Makefile:build/top.mk:clients/rcpt500/Makefile.in:build/rules.mk \
 clients/ud/Makefile:build/top.mk:clients/ud/Makefile.in:build/rules.mk \
 clients/maildap/Makefile:build/top.mk:clients/maildap/Makefile.in:build/rules.mk \
 clients/tools/Makefile:build/top.mk:clients/tools/Makefile.in:build/rules.mk \
@@ -2579,6 +2602,7 @@ servers/slapd/back-dnssrv/Makefile:build/top.mk:servers/slapd/back-dnssrv/Makefi
 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-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-passwd/Makefile:build/top.mk:servers/slapd/back-passwd/Makefile.in:build/mod.mk \
 servers/slapd/back-perl/Makefile:build/top.mk:servers/slapd/back-perl/Makefile.in:build/mod.mk \
 servers/slapd/back-shell/Makefile:build/top.mk:servers/slapd/back-shell/Makefile.in:build/mod.mk \
@@ -2591,7 +2615,6 @@ tests/Makefile:build/top.mk:tests/Makefile.in:build/dir.mk \
 tests/progs/Makefile:build/top.mk:tests/progs/Makefile.in:build/rules.mk \
 contrib/Makefile:build/top.mk:contrib/Makefile.in:build/dir.mk \
 contrib/saucer/Makefile:build/top.mk:contrib/saucer/Makefile.in:build/rules.mk \
-contrib/web_ldap/Makefile:build/top.mk:contrib/web_ldap/Makefile.in:build/rules.mk \
 ,[
 date > stamp-h
 echo Please \"make depend\" to build dependencies