LU-3462 ldiskfs: Subsume ldiskfs's build system into lustre

[fs/lustre-release.git] / lustre / autoconf / lustre-core.m4

diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4
index 359cee4..17e4d36 100644 (file)
--- a/lustre/autoconf/lustre-core.m4
+++ b/lustre/autoconf/lustre-core.m4
@@ -1475,15 +1475,14 @@ AC_DEFUN([LC_PROG_LINUX],
         LC_HAVE_IOP_ATOMIC_OPEN
 
         # 3.7
-        LC_HAVE_POSIXACL_USER_NS
+        LC_HAVE_POSIXACL_USER_NS
 
         # 3.9
         LC_HAVE_HLIST_FOR_EACH_3ARG
         LC_HAVE_F_PATH_MNT
 
         #
-        if test x$enable_server = xyes ; then
-               AC_DEFINE(HAVE_SERVER_SUPPORT, 1, [support server])
+        if test x$enable_server != xno ; then
                LC_FUNC_DEV_SET_RDONLY
                LC_STACK_SIZE
                LC_QUOTA64
@@ -1492,24 +1491,18 @@ AC_DEFUN([LC_PROG_LINUX],
 ])
 
 #
-# LC_CONFIG_CLIENT_SERVER
+# LC_CONFIG_CLIENT
 #
-# Build client/server sides of Lustre
+# Check whether to build the client side 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_DEFUN([LC_CONFIG_CLIENT],
+[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])])
+AC_MSG_RESULT([$enable_client])
+])
 
 #
 # LC_CONFIG_LIBLUSTRE
@@ -1828,7 +1821,6 @@ fi
 #
 AC_DEFUN([LC_CONDITIONALS],
 [AM_CONDITIONAL(LIBLUSTRE, test x$enable_liblustre = xyes)
-AM_CONDITIONAL(USE_QUILT, test x$QUILT != xno)
 AM_CONDITIONAL(LIBLUSTRE_TESTS, test x$enable_liblustre_tests = xyes)
 AM_CONDITIONAL(MPITESTS, test x$enable_mpitests = xyes, Build MPI Tests)
 AM_CONDITIONAL(CLIENT, test x$enable_client = xyes)