[sheepdog] [PATCH 2/6] configure: remove farm option

[MORITA Kazutaka]

farm is the only storage driver now, so we cannot disable it.

Signed-off-by: MORITA Kazutaka <morita.kazutaka at lab.ntt.co.jp>
---
 configure.ac      |   10 ----------
 sheep/Makefile.am |    2 --
 2 files changed, 0 insertions(+), 12 deletions(-)

diff --git a/configure.ac b/configure.ac
index cef63ea..6cc6e18 100644
--- a/configure.ac
+++ b/configure.ac
@@ -202,11 +202,6 @@ AC_ARG_WITH([initddir],
 	[ INITDDIR="$withval" ],
 	[ INITDDIR="$sysconfdir/init.d" ])
 
-AC_ARG_ENABLE([farm],
-	[  --enable-farm           : build farm store driver ],,
-	[ enable_farm="yes" ],)
-AM_CONDITIONAL(BUILD_FARM, test x$enable_farm = xyes)
-
 AC_ARG_ENABLE([trace],
 	[  --enable-trace           : enable trace],,
 	[ enable_trace="no" ],)
@@ -279,11 +274,6 @@ if test "x${enable_accord}" = xyes; then
 	PACKAGE_FEATURES="$PACKAGE_FEATURES accord"
 fi
 
-if test "x${enable_farm}" = xyes; then
-	AC_DEFINE_UNQUOTED([HAVE_FARM], 1, [have farm])
-	PACKAGE_FEATURES="$PACKAGE_FEATURES farm"
-fi
-
 if test "x${enable_trace}" = xyes; then
 	AC_CHECK_LIB([rt], [clock_gettime],,
 		AC_MSG_ERROR(librt not found))
diff --git a/sheep/Makefile.am b/sheep/Makefile.am
index 0a874c6..f8017b4 100644
--- a/sheep/Makefile.am
+++ b/sheep/Makefile.am
@@ -38,9 +38,7 @@ if BUILD_ACCORD
 sheep_SOURCES		+= cluster/accord.c
 endif
 
-if BUILD_FARM
 sheep_SOURCES		+= farm/sha1_file.c farm/trunk.c farm/snap.c farm/farm.c
-endif
 
 if BUILD_TRACE
 sheep_SOURCES		+= trace/trace.c trace/mcount.S trace/stabs.c trace/graph.c
-- 
1.7.2.5