mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-12-20 22:59:34 -05:00
Regenerate without multimaster switch
This commit is contained in:
Howard Chu
parent
23d327a3f4
commit
9d026c6445
2 changed files with 10 additions and 26 deletions
33
configure
vendored
33
configure
vendored
|
|
@ -1,5 +1,5 @@
|
|||
#! /bin/sh
|
||||
# From configure.in OpenLDAP: pkg/ldap/configure.in,v 1.624 2006/01/16 17:54:36 kurt Exp .
|
||||
# From configure.in OpenLDAP: pkg/ldap/configure.in,v 1.625 2006/02/06 03:51:55 hyc Exp .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.59.
|
||||
#
|
||||
|
|
@ -2643,7 +2643,6 @@ else
|
|||
ol_enable_modules=no
|
||||
fi;
|
||||
# end --enable-modules
|
||||
ol_enable_multimaster=${ol_enable_multimaster-no}
|
||||
# OpenLDAP --enable-rewrite
|
||||
|
||||
# Check whether --enable-rewrite or --disable-rewrite was given.
|
||||
|
|
@ -3676,10 +3675,6 @@ echo "$as_me: WARNING: slapd disabled, ignoring --enable-$i argument" >&2;}
|
|||
if test $ol_enable_modules = yes ; then
|
||||
{ echo "$as_me:$LINENO: WARNING: slapd disabled, ignoring --enable-modules argument" >&5
|
||||
echo "$as_me: WARNING: slapd disabled, ignoring --enable-modules argument" >&2;}
|
||||
fi
|
||||
if test $ol_enable_multimaster = yes ; then
|
||||
{ echo "$as_me:$LINENO: WARNING: slapd disabled, ignoring --enable-multimaster argument" >&5
|
||||
echo "$as_me: WARNING: slapd disabled, ignoring --enable-multimaster argument" >&2;}
|
||||
fi
|
||||
if test $ol_enable_wrappers = yes ; then
|
||||
{ echo "$as_me:$LINENO: WARNING: slapd disabled, ignoring --enable-wrappers argument" >&5
|
||||
|
|
@ -3733,7 +3728,6 @@ echo "$as_me: WARNING: slapd disabled, ignoring --enable-$i argument" >&2;}
|
|||
ol_enable_backends=
|
||||
ol_enable_overlays=
|
||||
ol_enable_modules=no
|
||||
ol_enable_multimaster=no
|
||||
ol_enable_rlookups=no
|
||||
ol_enable_dynacl=no
|
||||
ol_enable_aci=no
|
||||
|
|
@ -5745,7 +5739,7 @@ ia64-*-hpux*)
|
|||
;;
|
||||
*-*-irix6*)
|
||||
# Find out which ABI we are using.
|
||||
echo '#line 5748 "configure"' > conftest.$ac_ext
|
||||
echo '#line 5742 "configure"' > conftest.$ac_ext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -7725,11 +7719,11 @@ else
|
|||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:7728: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:7722: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:7732: \$? = $ac_status" >&5
|
||||
echo "$as_me:7726: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
|
|
@ -7987,11 +7981,11 @@ else
|
|||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:7990: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:7984: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:7994: \$? = $ac_status" >&5
|
||||
echo "$as_me:7988: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
|
|
@ -8049,11 +8043,11 @@ else
|
|||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:8052: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:8046: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:8056: \$? = $ac_status" >&5
|
||||
echo "$as_me:8050: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
|
|
@ -10297,7 +10291,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10300 "configure"
|
||||
#line 10294 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
@ -10395,7 +10389,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10398 "configure"
|
||||
#line 10392 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
@ -44226,13 +44220,6 @@ cat >>confdefs.h <<\_ACEOF
|
|||
#define SLAPD_SPASSWD 1
|
||||
_ACEOF
|
||||
|
||||
fi
|
||||
if test "$ol_enable_multimaster" != no ; then
|
||||
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define SLAPD_MULTIMASTER 1
|
||||
_ACEOF
|
||||
|
||||
fi
|
||||
if test "$ol_enable_rlookups" != no ; then
|
||||
|
||||
|
|
|
|||
|
|
@ -981,9 +981,6 @@
|
|||
/* define to support cn=Monitor backend */
|
||||
#undef SLAPD_MONITOR
|
||||
|
||||
/* define to support multimaster replication */
|
||||
#undef SLAPD_MULTIMASTER
|
||||
|
||||
/* define to support NULL backend */
|
||||
#undef SLAPD_NULL
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue