From 9707593649db4bb3f67839cc161dc75e661d7c95 Mon Sep 17 00:00:00 2001
From: pjkirner <pjkirner>
Date: Wed, 20 Jul 2005 20:41:21 +0000
Subject: [PATCH] Fix merge breakage that was originally introduced on b_cray,
 and then merged over to b1_4.

---
 lustre/autoconf/lustre-core.m4 | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4
index a99bbf3..294c1cf 100644
--- a/lustre/autoconf/lustre-core.m4
+++ b/lustre/autoconf/lustre-core.m4
@@ -447,26 +447,6 @@ AC_ARG_ENABLE([client],
 AC_MSG_RESULT([$enable_client])])
 
 #
-# LC_CONFIG_CLIENT_SERVER
-#
-# Build client/server sides of Lustre
-#
-AC_DEFUN([LC_CONFIG_CLIENT_SERVER],
-[AC_MSG_CHECKING([whether to build Lustre server support])
-AC_ARG_ENABLE([server],
-	AC_HELP_STRING([--disable-server],
-			[disable Lustre server support]),
-	[],[enable_server='yes'])
-AC_MSG_RESULT([$enable_server])
-
-AC_MSG_CHECKING([whether to build Lustre client support])
-AC_ARG_ENABLE([client],
-	AC_HELP_STRING([--disable-client],
-			[disable Lustre client support]),
-	[],[enable_client='yes'])
-AC_MSG_RESULT([$enable_client])])
-
-#
 # LC_CONFIG_LIBLUSTRE
 #
 # whether to build liblustre
-- 
1.8.3.1