[Date Prev][Date Next]
[Chronological]
[Thread]
[Top]
Enabling multi-master replication option in CVS
Hi,
I have been experimenting with multi-master replication with good results
in OpenLDAP CVS. I am wondering why the option is commented out in
configure.in. The following patch makes the option available again
(essentially removing the dnl lines in configure.in). autoconf needs to be
run again after applying the patch.
Ganesan
--
Ganesan R (rganesan@debian.org>) | http://www.debian.org/~rganesan/
1024D/5D8C12EA, fingerprint F361 84F1 8D82 32E7 1832 6798 15E0 02BA 5D8C 12EA
Index: configure.in
===================================================================
RCS file: /repo/OpenLDAP/pkg/ldap/configure.in,v
retrieving revision 1.375
diff -u -r1.375 configure.in
--- configure.in 2001/10/24 05:31:28 1.375
+++ configure.in 2001/11/19 06:45:08
@@ -157,7 +157,7 @@
OL_ARG_ENABLE(lmpasswd,[ --enable-lmpasswd enable LAN Manager passwords], 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
-dnl OL_ARG_ENABLE(multimaster,[ --enable-multimaster enable multimaster replication], no)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], no)dnl
OL_ARG_ENABLE(slp, [ --enable-slp enable SLPv2 support], no)dnl
@@ -255,9 +255,9 @@
if test $ol_enable_modules = yes ; then
AC_MSG_WARN([slapd disabled, ignoring --enable-modules 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_multimaster = yes ; then
+ AC_MSG_WARN([slapd disabled, ignoring --enable-multimaster argument])
+ fi
if test $ol_enable_wrappers = yes ; then
AC_MSG_WARN([slapd disabled, ignoring --enable-wrappers argument])
fi
@@ -330,7 +330,7 @@
ol_enable_sql=no
ol_enable_modules=no
-dnl ol_enable_multimaster=no
+ ol_enable_multimaster=no
ol_enable_phonetic=no
ol_enable_rlookups=no
ol_enable_aci=no
@@ -2357,9 +2357,9 @@
if test "$ol_link_spasswd" != no ; then
AC_DEFINE(SLAPD_SPASSWD,1,[define to support SASL passwords])
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_multimaster" != no ; then
+ AC_DEFINE(SLAPD_MULTIMASTER,1,[define to support multimaster replication])
+fi
if test "$ol_enable_phonetic" != no ; then
AC_DEFINE(SLAPD_PHONETIC,1,[define to support phonetic])
fi
Index: include/portable.h.in
===================================================================
RCS file: /repo/OpenLDAP/pkg/ldap/include/portable.h.in,v
retrieving revision 1.185
diff -u -r1.185 portable.h.in
--- include/portable.h.in 2001/10/24 14:58:07 1.185
+++ include/portable.h.in 2001/11/19 06:45:08
@@ -967,9 +967,11 @@
/* define to support dynamic SQL backend */
#undef SLAPD_SQL_DYNAMIC
+/* define to support multi-master */
+#undef SLAPD_MULTIMASTER
+
/* define to enable rewriting in back-ldap and back-meta */
#undef ENABLE_REWRITE