X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=config%2Flustre-build.m4;h=6f771e51d82dcad89d5ee7773c674e6a80507663;hb=refs%2Fchanges%2F50%2F13750%2F6;hp=d5bbbd59feab80654dd3c0b1d3fef8f411152fac;hpb=0f753ead66cb0bd924ccb656f1a742a0db46038d;p=fs%2Flustre-release.git

diff --git a/config/lustre-build.m4 b/config/lustre-build.m4
index d5bbbd5..6f771e5 100644
--- a/config/lustre-build.m4
+++ b/config/lustre-build.m4
@@ -252,7 +252,6 @@ AC_ARG_ENABLE([utils],
 		[disable building of Lustre utility programs]),
 	[], [enable_utils="yes"])
 AC_MSG_RESULT([$enable_utils])
-AS_IF([test "x$enable_utils" = xyes], [LB_CONFIG_INIT_SCRIPTS])
 ]) # LB_CONFIG_UTILS
 
 #
@@ -310,26 +309,6 @@ AC_SUBST(ENABLE_DOC)
 ]) # LB_CONFIG_DOCS
 
 #
-# LB_CONFIG_INIT_SCRIPTS
-#
-# our init scripts only work on red hat linux
-#
-AC_DEFUN([LB_CONFIG_INIT_SCRIPTS], [
-ENABLE_INIT_SCRIPTS=0
-AS_IF([test x$enable_utils = xyes], [
-	AC_CACHE_CHECK([whether to install init scripts], [lb_cv_enable_init_scripts], [
-	# our scripts only work on red hat systems
-	AS_IF([test -f /etc/init.d/functions -a -f /etc/sysconfig/network],
-		[lb_cv_enable_init_scripts="yes"],
-		[lb_cv_enable_init_scripts="no"])
-	])
-	AS_IF([test "x$lb_cv_enable_init_scripts" = xyes],
-		[ENABLE_INIT_SCRIPTS=1])
-])
-AC_SUBST(ENABLE_INIT_SCRIPTS)
-])
-
-#
 # LB_CONFIG_HEADERS
 #
 # add -include config.h
@@ -396,7 +375,7 @@ AS_IF([test $target_cpu = powerpc64], [
 
 CPPFLAGS="-I$PWD/$LIBCFS_INCLUDE_DIR -I$PWD/lnet/include -I$PWD/lustre/include $CPPFLAGS"
 
-LLCPPFLAGS="-D__arch_lib__ -D_LARGEFILE64_SOURCE=1"
+LLCPPFLAGS="-D_LARGEFILE64_SOURCE=1"
 AC_SUBST(LLCPPFLAGS)
 
 # Add _GNU_SOURCE for strnlen on linux
@@ -422,10 +401,11 @@ AM_CONDITIONAL([MODULES], [test x$enable_modules = xyes])
 AM_CONDITIONAL([UTILS], [test x$enable_utils = xyes])
 AM_CONDITIONAL([TESTS], [test x$enable_tests = xyes])
 AM_CONDITIONAL([DOC], [test x$ENABLE_DOC = x1])
-AM_CONDITIONAL([INIT_SCRIPTS], [test x$ENABLE_INIT_SCRIPTS = x1])
 AM_CONDITIONAL([LINUX], [test x$lb_target_os = xlinux])
 AM_CONDITIONAL([USES_DPKG], [test x$uses_dpkg = xyes])
 AM_CONDITIONAL([USE_QUILT], [test x$use_quilt = xyes])
+AM_CONDITIONAL([RHEL], [test x$RHEL_KERNEL = xyes])
+AM_CONDITIONAL([SUSE], [test x$SUSE_KERNEL = xyes])
 
 # Sanity check for PCLMULQDQ instruction availability
 # PCLMULQDQ instruction is a new instruction available beginning with
@@ -647,14 +627,10 @@ LB_CONFIG_SERVERS
 # Tests depends from utils (multiop from liblustreapi)
 AS_IF([test "x$enable_utils" = xno], [enable_tests="no"])
 
-# two macros for cmd3
-m4_ifdef([LC_CONFIG_SPLIT], [LC_CONFIG_SPLIT])
 m4_ifdef([LC_NODEMAP_PROC_DEBUG], [LC_NODEMAP_PROC_DEBUG])
 LN_CONFIG_CDEBUG
 LC_QUOTA
 
-LN_CONFIG_USERSPACE
-
 LB_PATH_SNMP
 LB_PATH_LUSTREIOKIT