Commit 77c9fb66 authored by Kurt Zeilenga's avatar Kurt Zeilenga
Browse files

comment out --enable-multimaster

(I previously said I'd only do this in re20 but its easier to do
here... and no big deal for those wanting to work on it to
define the macro via the environment)
parent ff0f3902
......@@ -151,7 +151,7 @@ OL_ARG_ENABLE(crypt,[ --enable-crypt enable crypt(3) passwords], auto)dnl
OL_ARG_ENABLE(kpasswd,[ --enable-kpasswd enable Kerberos password verification], no)dnl
OL_ARG_ENABLE(spasswd,[ --enable-spasswd enable (Cyrus) SASL password verification], no)dnl
OL_ARG_ENABLE(modules,[ --enable-modules enable dynamic module support], no)dnl
OL_ARG_ENABLE(multimaster,[ --enable-multimaster enable multimaster replication], no)dnl
dnl OL_ARG_ENABLE(multimaster,[ --enable-multimaster enable multimaster replication], no)dnl
OL_ARG_ENABLE(phonetic,[ --enable-phonetic enable phonetic/soundex], no)dnl
OL_ARG_ENABLE(rlookups,[ --enable-rlookups enable reverse lookups], auto)dnl
OL_ARG_ENABLE(aci,[ --enable-aci enable per-object ACIs], no)dnl
......@@ -238,9 +238,9 @@ if test $ol_enable_slapd = no ; then
if test $ol_enable_modules = yes ; then
AC_MSG_WARN([slapd disabled, ignoring --enable-modules argument])
fi
if test $ol_enable_multimaster = yes ; then
AC_MSG_WARN([slapd disabled, ignoring --enable-multimaster argument])
fi
dnl if test $ol_enable_multimaster = yes ; then
dnl AC_MSG_WARN([slapd disabled, ignoring --enable-multimaster argument])
dnl fi
if test $ol_enable_wrappers = yes ; then
AC_MSG_WARN([slapd disabled, ignoring --enable-wrappers argument])
fi
......@@ -302,7 +302,7 @@ if test $ol_enable_slapd = no ; then
ol_enable_sql=no
ol_enable_modules=no
ol_enable_multimaster=no
dnl ol_enable_multimaster=no
ol_enable_phonetic=no
ol_enable_rlookups=no
ol_enable_aci=no
......@@ -2231,9 +2231,9 @@ fi
if test "$ol_link_spasswd" != no ; then
AC_DEFINE(SLAPD_SPASSWD,1,[define to support SASL passwords])
fi
if test "$ol_enable_multimaster" != no ; then
AC_DEFINE(SLAPD_MULTIMASTER,1,[define to support multimaster replication])
fi
dnl if test "$ol_enable_multimaster" != no ; then
dnl AC_DEFINE(SLAPD_MULTIMASTER,1,[define to support multimaster replication])
dnl fi
if test "$ol_enable_phonetic" != no ; then
AC_DEFINE(SLAPD_PHONETIC,1,[define to support phonetic])
fi
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment