From 1641d8bb4cbe64da024124d943c04da3bf379100 Mon Sep 17 00:00:00 2001 From: Vijay Bellur Date: Mon, 14 Mar 2011 07:00:09 +0000 Subject: Disable geo-replication build Signed-off-by: Vijay Bellur Signed-off-by: Vijay Bellur BUG: 1570 (geosync related changes) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1570 --- configure.ac | 8 ++------ xlators/features/Makefile.am | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index d2f686f1a66..fcf03782e9c 100644 --- a/configure.ac +++ b/configure.ac @@ -91,11 +91,6 @@ AC_CONFIG_FILES([Makefile xlators/features/trash/src/Makefile xlators/features/quota/Makefile xlators/features/quota/src/Makefile - xlators/features/marker/Makefile - xlators/features/marker/src/Makefile - xlators/features/marker/utils/Makefile - xlators/features/marker/utils/gsyncd - xlators/features/marker/utils/syncdaemon/Makefile xlators/features/read-only/Makefile xlators/features/read-only/src/Makefile xlators/features/mac-compat/Makefile @@ -289,7 +284,8 @@ AC_ARG_ENABLE([georeplication], BUILD_SYNCDAEMON=no case $host_os in linux*) -#do nothing +#disable geo replication for release-3.1 + enable_georeplication=no ;; *) #disabling geo replication for non-linux platforms diff --git a/xlators/features/Makefile.am b/xlators/features/Makefile.am index 96e503938a8..9b80c92832a 100644 --- a/xlators/features/Makefile.am +++ b/xlators/features/Makefile.am @@ -1,3 +1,3 @@ -SUBDIRS = locks trash quota read-only access-control mac-compat quiesce marker#path-converter # filter +SUBDIRS = locks trash quota read-only access-control mac-compat quiesce #marker#path-converter # filter CLEANFILES = -- cgit