X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=libcfs%2Fautoconf%2Flustre-libcfs.m4;h=840bff7c14328de5ccef93c9b3848a5948742d13;hp=09a9bddcf2f708df79ae164f6b89fd8352c97d60;hb=84bcd1360516a4684a686d8e5f0b59b3ab231c6e;hpb=2420f7ef2b7efbc715735019fa632146b23f2546

diff --git a/libcfs/autoconf/lustre-libcfs.m4 b/libcfs/autoconf/lustre-libcfs.m4
index 09a9bdd..840bff7 100644
--- a/libcfs/autoconf/lustre-libcfs.m4
+++ b/libcfs/autoconf/lustre-libcfs.m4
@@ -82,24 +82,6 @@ LB_LINUX_TRY_COMPILE([
 EXTRA_KCFLAGS="$tmp_flags"
 ])
 
-# 2.6.24 request not use real numbers for ctl_name
-AC_DEFUN([LIBCFS_SYSCTL_UNNUMBERED],
-[AC_MSG_CHECKING([for CTL_UNNUMBERED])
-LB_LINUX_TRY_COMPILE([
-        #include <linux/sysctl.h>
-],[
-	#ifndef CTL_UNNUMBERED
-	#error CTL_UNNUMBERED not exist in kernel
-	#endif
-],[
-        AC_MSG_RESULT(yes)
-        AC_DEFINE(HAVE_SYSCTL_UNNUMBERED, 1,
-                  [sysctl has CTL_UNNUMBERED])
-],[
-        AC_MSG_RESULT(NO)
-])
-])
-
 #
 # LIBCFS_STACKTRACE_OPS_HAVE_WALK_STACK
 #
@@ -261,18 +243,15 @@ LB_LINUX_TRY_COMPILE([
 # upstream commit 56b31d1c9f1e6a3ad92e7bfe252721e05d92b285
 #
 AC_DEFUN([LIBCFS_SOCK_ALLOC_FILE],
-[AC_MSG_CHECKING([sock_alloc_file is exported])
-LB_CHECK_SYMBOL_EXPORT([sock_alloc_file], [net/socket.c],[
+[LB_CHECK_SYMBOL_EXPORT([sock_alloc_file], [net/socket.c],[
 	LB_LINUX_TRY_COMPILE([
 		#include <linux/net.h>
 	],[
 		sock_alloc_file(NULL, 0, NULL);
 	],[
-		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_SOCK_ALLOC_FILE_3ARGS, 1,
 			[sock_alloc_file takes 3 arguments])
 	],[
-		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_SOCK_ALLOC_FILE, 1,
 			[sock_alloc_file is exported])
 	])
@@ -293,8 +272,10 @@ AC_DEFUN([LIBCFS_ENABLE_CRC32_ACCEL],
 	[enable_crc32_crypto=false],[enable_crc32_crypto=true])
 if test x$have_crc32 = xtrue -a x$enable_crc32_crypto = xtrue; then
 	AC_DEFINE(NEED_CRC32_ACCEL, 1, [need pclmulqdq based crc32])
-	AC_MSG_WARN([No crc32 pclmulqdq crypto api found,
-		    enable internal pclmulqdq based crc32])
+	AC_MSG_WARN([
+
+No crc32 pclmulqdq crypto api found, enable internal pclmulqdq based crc32
+])
 fi
 ])
 
@@ -303,8 +284,10 @@ AC_DEFUN([LIBCFS_ENABLE_CRC32C_ACCEL],
 	[enable_crc32c_crypto=false],[enable_crc32c_crypto=true])
 if test x$enable_crc32c_crypto = xtrue; then
 	AC_DEFINE(NEED_CRC32C_ACCEL, 1, [need pclmulqdq based crc32c])
-	AC_MSG_WARN([No crc32c pclmulqdq crypto api found,
-		    enable internal pclmulqdq based crc32c])
+	AC_MSG_WARN([
+
+No crc32c pclmulqdq crypto api found, enable internal pclmulqdq based crc32c
+])
 fi
 ])
 
@@ -318,8 +301,6 @@ AC_DEFUN([LIBCFS_PROG_LINUX],
 LIBCFS_CONFIG_PANIC_DUMPLOG
 
 LIBCFS_U64_LONG_LONG_LINUX
-# 2.6.24
-LIBCFS_SYSCTL_UNNUMBERED
 # 2.6.32
 LIBCFS_STACKTRACE_OPS_HAVE_WALK_STACK
 LC_SHRINKER_WANT_SHRINK_PTR
@@ -477,7 +458,6 @@ AC_SUBST(LIBEFENCE)
 
 
 # -------- check for -lpthread support ----
-AC_MSG_CHECKING([whether to use libpthread for libcfs library])
 AC_ARG_ENABLE([libpthread],
        	AC_HELP_STRING([--disable-libpthread],
                	[disable libpthread]),
@@ -486,22 +466,20 @@ if test "$enable_libpthread" = "yes" ; then
 	AC_CHECK_LIB([pthread], [pthread_create],
 		[ENABLE_LIBPTHREAD="yes"],
 		[ENABLE_LIBPTHREAD="no"])
+	AC_MSG_CHECKING([whether to use libpthread for libcfs library])
+	AC_MSG_RESULT([$ENABLE_LIBPTHREAD])
 	if test "$ENABLE_LIBPTHREAD" = "yes" ; then
-		AC_MSG_RESULT([$ENABLE_LIBPTHREAD])
 		PTHREAD_LIBS="-lpthread"
 		AC_DEFINE([HAVE_LIBPTHREAD], 1, [use libpthread])
 	else
 		PTHREAD_LIBS=""
-		AC_MSG_RESULT([no libpthread is found])
 	fi
 	AC_SUBST(PTHREAD_LIBS)
 else
-	AC_MSG_RESULT([no (disabled explicitly)])
+	AC_MSG_WARN([Using libpthread for libcfs library is disabled explicitly])
 	ENABLE_LIBPTHREAD="no"
 fi
 AC_SUBST(ENABLE_LIBPTHREAD)
-
-
 ])
 
 #