]> git.ipfire.org Git - thirdparty/openldap.git/commitdiff
ITS#9351 - Regenerate configure
authorQuanah Gibson-Mount <quanah@openldap.org>
Mon, 21 Sep 2020 20:55:18 +0000 (20:55 +0000)
committerQuanah Gibson-Mount <quanah@openldap.org>
Mon, 21 Sep 2020 20:55:18 +0000 (20:55 +0000)
configure

index 302d3f00cac7ea73ae91fd492073d4c21865acb8..e293c1ce3bc82facd87fcdee81e53e9cc9844285 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Id: d933f50e2851e805117785cbbb948028b5e50264 .
+# From configure.in Id: 43923a51f8a8e37b897c4c7fa207edfbf55040ef .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.69.
 #
@@ -702,7 +702,6 @@ BUILD_RELAY
 BUILD_PASSWD
 BUILD_NULL
 BUILD_NDB
-BUILD_MONITOR
 BUILD_ASYNCMETA
 BUILD_META
 BUILD_MDB
@@ -854,7 +853,6 @@ enable_ldap
 enable_mdb
 enable_meta
 enable_asyncmeta
-enable_monitor
 enable_ndb
 enable_null
 enable_passwd
@@ -1557,7 +1555,6 @@ SLAPD Backend Options:
   --enable-mdb            enable mdb database backend no|yes|mod [yes]
   --enable-meta           enable metadirectory backend no|yes|mod [no]
   --enable-asyncmeta      enable asynchronous metadirectory backend no|yes|mod [no]
-  --enable-monitor        enable monitor backend no|yes|mod [yes]
   --enable-ndb            enable MySQL NDB Cluster backend no|yes|mod [no]
   --enable-null           enable null backend no|yes|mod [no]
   --enable-passwd         enable passwd backend no|yes|mod [no]
@@ -3469,7 +3466,6 @@ Backends="dnssrv \
        mdb \
        meta \
        asyncmeta \
-       monitor \
        ndb \
        null \
        passwd \
@@ -3610,27 +3606,6 @@ else
 fi
 
 # end --enable-asyncmeta
-# OpenLDAP --enable-monitor
-
-       # Check whether --enable-monitor was given.
-if test "${enable_monitor+set}" = set; then :
-  enableval=$enable_monitor;
-       ol_arg=invalid
-       for ol_val in no yes mod ; do
-               if test "$enableval" = "$ol_val" ; then
-                       ol_arg="$ol_val"
-               fi
-       done
-       if test "$ol_arg" = "invalid" ; then
-               as_fn_error $? "bad value $enableval for --enable-monitor" "$LINENO" 5
-       fi
-       ol_enable_monitor="$ol_arg"
-
-else
-       ol_enable_monitor=${ol_enable_backends:-yes}
-fi
-
-# end --enable-monitor
 # OpenLDAP --enable-ndb
 
        # Check whether --enable-ndb was given.
@@ -4499,7 +4474,6 @@ BUILD_LDAP=no
 BUILD_MDB=no
 BUILD_META=no
 BUILD_ASYNCMETA=no
-BUILD_MONITOR=no
 BUILD_NDB=no
 BUILD_NULL=no
 BUILD_PASSWD=no
@@ -4539,7 +4513,7 @@ SLAPD_DYNAMIC_OVERLAYS=
 SLAPD_MODULES_LDFLAGS=
 SLAPD_MODULES_CPPFLAGS=
 
-SLAPD_STATIC_BACKENDS=back-ldif
+SLAPD_STATIC_BACKENDS="back-ldif back-monitor"
 SLAPD_DYNAMIC_BACKENDS=
 
 SLAPD_PERL_LDFLAGS=
@@ -24566,23 +24540,6 @@ $as_echo "#define SLAPD_MOD_STATIC 1" >>confdefs.h
 $as_echo "#define SLAPD_MOD_DYNAMIC 2" >>confdefs.h
 
 
-if test "$ol_enable_monitor" != no ; then
-       BUILD_SLAPD=yes
-       BUILD_MONITOR=$ol_enable_monitor
-       if test "$ol_enable_monitor" = mod ; then
-               SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-monitor"
-               MFLAG=SLAPD_MOD_DYNAMIC
-       else
-               SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-monitor"
-               MFLAG=SLAPD_MOD_STATIC
-       fi
-
-cat >>confdefs.h <<_ACEOF
-#define SLAPD_MONITOR $MFLAG
-_ACEOF
-
-fi
-
 if test "$ol_enable_dnssrv" != no ; then
        BUILD_SLAPD=yes
        BUILD_DNSSRV=$ol_enable_dnssrv
@@ -25273,7 +25230,6 @@ fi
 
 
 
-
 
 
 # Check whether --with-xxinstall was given.