X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=build%2Fautoconf%2Flustre-build.m4;h=dcdddcae4cf612538a3c78978bc3f9292954b850;hp=7994f25ec4f82935f8de837a489d25cf68403a35;hb=50d4551080dc6fa601708c21140c8dccd53fe5c5;hpb=454cfb405a82d2f334b313d37c365bd43cfb444e

diff --git a/build/autoconf/lustre-build.m4 b/build/autoconf/lustre-build.m4
index 7994f25..dcdddca 100644
--- a/build/autoconf/lustre-build.m4
+++ b/build/autoconf/lustre-build.m4
@@ -10,6 +10,107 @@ fi
 ])
 
 #
+# LB_CANONICAL_SYSTEM
+#
+# fixup $target_os for use in other places
+#
+AC_DEFUN([LB_CANONICAL_SYSTEM],
+[case $target_os in
+	linux*)
+		lb_target_os="linux"
+		;;
+	darwin*)
+		lb_target_os="darwin"
+		;;
+esac
+AC_SUBST(lb_target_os)
+])
+
+#
+# LB_CHECK_FILE
+#
+# Check for file existance even when cross compiling
+#
+AC_DEFUN([LB_CHECK_FILE],
+[AS_VAR_PUSHDEF([lb_File], [lb_cv_file_$1])dnl
+AC_CACHE_CHECK([for $1], lb_File,
+[if test -r "$1"; then
+  AS_VAR_SET(lb_File, yes)
+else
+  AS_VAR_SET(lb_File, no)
+fi])
+AS_IF([test AS_VAR_GET(lb_File) = yes], [$2], [$3])[]dnl
+AS_VAR_POPDEF([lb_File])dnl
+])# LB_CHECK_FILE
+
+#
+# LB_CHECK_FILES
+#
+# LB_CHECK_FILE over multiple files
+#
+AC_DEFUN([LB_CHECK_FILES],
+[AC_FOREACH([AC_FILE_NAME], [$1],
+  [LB_CHECK_FILE(AC_FILE_NAME,
+                 [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_[]AC_FILE_NAME), 1,
+                                    [Define to 1 if you have the
+                                     file `]AC_File['.])
+$2],
+                 [$3])])])
+
+#
+# LB_ARG_LIBS_INCLUDES
+#
+# support for --with-foo, --with-foo-includes, and --with-foo-libs in
+# a single magical macro
+#
+AC_DEFUN([LB_ARG_LIBS_INCLUDES],
+[lb_pathvar="m4_bpatsubst([$2], -, _)"
+AC_MSG_CHECKING([for $1])
+AC_ARG_WITH([$2],
+	AC_HELP_STRING([--with-$2=path],
+		[path to $1]),
+	[],[withval=$4])
+
+if test x$withval = xyes ; then
+	eval "$lb_pathvar='$3'"
+else
+	eval "$lb_pathvar='$withval'"
+fi
+AC_MSG_RESULT([${!lb_pathvar:-no}])
+
+if test x${!lb_pathvar} != x -a x${!lb_pathvar} != xno ; then
+	AC_MSG_CHECKING([for $1 includes])
+	AC_ARG_WITH([$2-includes],
+		AC_HELP_STRING([--with-$2-includes=path],
+			[path to $1 includes]),
+		[],[withval='yes'])
+
+	lb_includevar="${lb_pathvar}_includes"
+	if test x$withval = xyes ; then
+		eval "${lb_includevar}='${!lb_pathvar}/include'"
+	else
+		eval "${lb_includevar}='$withval'"
+	fi
+	AC_MSG_RESULT([${!lb_includevar}])
+
+	AC_MSG_CHECKING([for $1 libs])
+	AC_ARG_WITH([$2-libs],
+		AC_HELP_STRING([--with-$2-libs=path],
+			[path to $1 libs]),
+		[],[withval='yes'])
+
+	lb_libvar="${lb_pathvar}_libs"
+	if test x$withval = xyes ; then
+		eval "${lb_libvar}='${!lb_pathvar}/lib'"
+	else
+		eval "${lb_libvar}='$withval'"
+	fi
+	AC_MSG_RESULT([${!lb_libvar}])
+fi
+])
+])
+
+#
 # LB_PATH_LIBSYSIO
 #
 # Handle internal/external libsysio
@@ -18,100 +119,93 @@ AC_DEFUN([LB_PATH_LIBSYSIO],
 [AC_ARG_WITH([sysio],
 	AC_HELP_STRING([--with-sysio=path],
 			[set path to libsysio source (default is included libsysio)]),
-	[],[with_sysio='yes'])
+	[],[
+		case $lb_target_os in
+			linux)
+				with_sysio='yes'
+				;;
+			*)
+				with_sysio='no'
+				;;
+		esac
+	])
 AC_MSG_CHECKING([location of libsysio])
 enable_sysio="$with_sysio"
 case x$with_sysio in
 	xyes)
 		AC_MSG_RESULT([internal])
-		AC_CHECK_FILE([$srcdir/libsysio/src/rmdir.c],[],[
+		LB_CHECK_FILE([$srcdir/libsysio/src/rmdir.c],[],[
 			AC_MSG_ERROR([A complete internal libsysio was not found.])
 		])
-		AC_CONFIG_SUBDIRS(libsysio)
 		LIBSYSIO_SUBDIR="libsysio"
-		SYSIO='$(top_srcdir)/libsysio'
+		SYSIO="$PWD/libsysio"
 		;;
 	xno)
 		AC_MSG_RESULT([disabled])
 		;;
 	*)
 		AC_MSG_RESULT([$with_sysio])
-		AC_CHECK_FILE([$with_sysio/src/libsysio.a],[],[
+		LB_CHECK_FILE([$with_sysio/lib/libsysio.a],[],[
 			AC_MSG_ERROR([A complete (built) external libsysio was not found.])
 		])
 		SYSIO=$with_sysio
-		enable_sysio="yes"
+		with_sysio="yes"
 		;;
 esac
-AC_SUBST(LIBSYSIO_SUBDIR)
-AC_SUBST(SYSIO)
+
+# We have to configure even if we don't build here for make dist to
+# work
+AC_CONFIG_SUBDIRS(libsysio)
 ])
 
 #
-# LB_PATH_CRAY_PORTALS
+# LB_CONFIG_CRAY_XT3
 #
-# Support for external Cray portals
+# Enable Cray XT3 features
 #
-AC_DEFUN([LB_PATH_CRAY_PORTALS],
-[AC_MSG_CHECKING([for Cray portals])
-AC_ARG_WITH([cray-portals],
-	AC_HELP_STRING([--with-cray-portals=path],
-		       [path to cray portals]),
-	[
-	        if test "$with_cray_portals" != no; then
-			CRAY_PORTALS_PATH=$with_cray_portals
-			CRAY_PORTALS_INCLUDES="$with_cray_portals/include"
-			CRAY_PORTALS_LIBS="$with_cray_portals"
-                fi
-	],[with_cray_portals=no])
-AC_SUBST(CRAY_PORTALS_PATH)
-AC_MSG_RESULT([$CRAY_PORTALS_PATH])
-
-AC_MSG_CHECKING([for Cray portals includes])
-AC_ARG_WITH([cray-portals-includes],
-	AC_HELP_STRING([--with-cray-portals-includes=path],
-		       [path to cray portals includes]),
-	[
-	        if test "$with_cray_portals_includes" != no; then
-			CRAY_PORTALS_INCLUDES="$with_cray_portals_includes"
-                fi
-	])
-AC_SUBST(CRAY_PORTALS_INCLUDES)
-AC_MSG_RESULT([$CRAY_PORTALS_INCLUDES])
-
-AC_MSG_CHECKING([for Cray portals libs])
-AC_ARG_WITH([cray-portals-libs],
-	AC_HELP_STRING([--with-cray-portals-libs=path],
-		       [path to cray portals libs]),
-	[
-	        if test "$with_cray_portals_libs" != no; then
-			CRAY_PORTALS_LIBS="$with_cray_portals_libs"
-                fi
-	])
-AC_SUBST(CRAY_PORTALS_LIBS)
-AC_MSG_RESULT([$CRAY_PORTALS_LIBS])
-
-if test x$CRAY_PORTALS_INCLUDES != x ; then
-	if test ! -r $CRAY_PORTALS_INCLUDES/portals/api.h ; then
-		AC_MSG_ERROR([Cray portals headers were not found in $CRAY_PORTALS_INCLUDES.  Please check the paths passed to --with-cray-portals or --with-cray-portals-includes.])
-	fi
-fi
-if test x$CRAY_PORTALS_LIBS != x ; then
-	if test ! -r $CRAY_PORTALS_LIBS/libportals.a ; then
-		AC_MSG_ERROR([Cray portals libraries were not found in $CRAY_PORTALS_LIBS.  Please check the paths passed to --with-cray-portals or --with-cray-portals-libs.])
-	fi
+AC_DEFUN([LB_CONFIG_CRAY_XT3],
+[AC_MSG_CHECKING([whether to build Cray XT3 features])
+AC_ARG_ENABLE([cray_xt3],
+	AC_HELP_STRING([--enable-cray-xt3],
+			[enable building of Cray XT3 features]),
+	[enable_cray_xt3='yes'],[enable_cray_xt3='no'])
+AC_MSG_RESULT([$enable_cray_xt3])
+if test x$enable_cray_xt3 != xno; then
+        AC_DEFINE(CRAY_XT3, 1, Enable Cray XT3 Features)
 fi
+])
 
-AC_MSG_CHECKING([whether to use Cray portals])
-if test x$CRAY_PORTALS_INCLUDES != x -a x$CRAY_PORTALS_LIBS != x ; then
-	with_cray_portals=yes
-	AC_DEFINE(CRAY_PORTALS, 1, [Building with Cray Portals])
-	CPPFLAGS="-I$CRAY_PORTALS_INCLUDES $CPPFLAGS"
-	EXTRA_KCFLAGS="-I-I$CRAY_PORTALS_INCLUDES $EXTRA_KCFLAGS"
-else
-	with_cray_portals=no
+#
+# LB_CONFIG_BGL
+#
+# Enable BGL features
+#
+AC_DEFUN([LB_CONFIG_BGL],
+[AC_MSG_CHECKING([whether to build BGL features])
+AC_ARG_ENABLE([bgl],
+	AC_HELP_STRING([--enable-bgl],
+			[enable building of BGL features]),
+	[enable_bgl='yes'],[enable_bgl='no'])
+AC_MSG_RESULT([$enable_bgl])
+if test x$enable_bgl != xno; then
+        AC_DEFINE(BGL_SUPPORT, 1, Enable BGL Features)
+        enable_doc='no'
+        enable_tests='no'
+        enable_server='no'
+        enable_liblustre='no'
+        enable_libreadline='no'
 fi
-AC_MSG_RESULT([$with_cray_portals])
+])
+
+#
+# LB_PATH_SNMP
+#
+# check for in-tree snmp support
+#
+AC_DEFUN([LB_PATH_SNMP],
+[LB_CHECK_FILE([$srcdir/snmp/lustre-snmp.c],[SNMP_DIST_SUBDIR="snmp"])
+AC_SUBST(SNMP_DIST_SUBDIR)
+AC_SUBST(SNMP_SUBDIR)
 ])
 
 #
@@ -125,28 +219,24 @@ AC_ARG_ENABLE([modules],
 	AC_HELP_STRING([--disable-modules],
 			[disable building of Lustre kernel modules]),
 	[],[
-		case $target_os in
-			linux* | darwin*)
-				enable_modules='yes'
-				;;
-			*)
-				enable_modules='no'
-				;;
-		esac
+		LC_TARGET_SUPPORTED([
+			enable_modules='yes'
+		],[
+			enable_modules='no'
+		])
 	])
 AC_MSG_RESULT([$enable_modules ($target_os)])
 
 if test x$enable_modules = xyes ; then
 	case $target_os in
 		linux*)
-			LC_LINUX_SUPPORTED([LB_PROG_LINUX],
-				[AC_MSG_ERROR([Modules are not supported on $target_os])])
+			LB_PROG_LINUX
 			;;
 		darwin*)
-			LC_DARWIN_SUPPORTED([LB_PROG_DARWIN],
-				[AC_MSG_ERROR([Modules are not supported on $target_os])])
+			LB_PROG_DARWIN
 			;;
 		*)
+			# This is strange - Lustre supports a target we don't
 			AC_MSG_ERROR([Modules are not supported on $target_os])
 			;;
 	esac
@@ -162,12 +252,12 @@ AC_DEFUN([LB_CONFIG_UTILS],
 [AC_MSG_CHECKING([whether to build utilities])
 AC_ARG_ENABLE([utils],
 	AC_HELP_STRING([--disable-utils],
-			[disable building of Lustre utility programs])
+			[disable building of Lustre utility programs]),
 	[],[enable_utils='yes'])
-if test x$with_cray_portals = xyes ; then
-	enable_utils='no'
-fi
 AC_MSG_RESULT([$enable_utils])
+if test x$enable_utils = xyes ; then 
+	LB_CONFIG_INIT_SCRIPTS
+fi
 ])
 
 #
@@ -180,10 +270,10 @@ AC_DEFUN([LB_CONFIG_TESTS],
 AC_ARG_ENABLE([tests],
 	AC_HELP_STRING([--disable-tests],
 			[disable building of Lustre tests]),
-	[],[enable_tests='yes'])
-if test x$with_cray_portals = xyes ; then
-	enable_tests='no'
-fi
+	[],
+	[
+		enable_tests='yes'
+	])
 AC_MSG_RESULT([$enable_tests])
 ])
 
@@ -269,8 +359,9 @@ AC_SUBST(sysconfdir)
 docdir='${datadir}/doc/$(PACKAGE)'
 AC_SUBST(docdir)
 
-LP_PATH_DEFAULTS
+LN_PATH_DEFAULTS
 LC_PATH_DEFAULTS
+
 ])
 
 #
@@ -318,7 +409,24 @@ if test $ac_cv_sizeof_unsigned_long_long != 8 ; then
         AC_MSG_ERROR([** we assume that sizeof(long long) == 8.  Tell phil@clusterfs.com])
 fi
 
-CPPFLAGS="-I\$(top_srcdir)/lustre/include -I\$(top_srcdir)/portals/include $CPPFLAGS"
+# FIXME
+AC_CHECK_DECL([__i386__], [], [
+
+if test x$enable_bgl != xyes; then
+AC_MSG_CHECKING([if $CC accepts -m64])
+CC_save="$CC"
+CC="$CC -m64"
+AC_TRY_COMPILE([],[],[
+	AC_MSG_RESULT([yes])
+],[
+	AC_MSG_RESULT([no])
+	CC="$CC_save"
+])
+fi
+
+])
+
+CPPFLAGS="-I\$(top_builddir)/lnet/include -I\$(top_srcdir)/lnet/include -I\$(top_builddir)/lustre/include -I\$(top_srcdir)/lustre/include $CPPFLAGS"
 
 LLCPPFLAGS="-D__arch_lib__ -D_LARGEFILE64_SOURCE=1"
 AC_SUBST(LLCPPFLAGS)
@@ -326,8 +434,8 @@ AC_SUBST(LLCPPFLAGS)
 LLCFLAGS="-g -Wall -fPIC"
 AC_SUBST(LLCFLAGS)
 
-# everyone builds against portals and lustre
-EXTRA_KCFLAGS="-g -I$PWD/portals/include -I$PWD/lustre/include"
+# everyone builds against lnet and lustre
+EXTRA_KCFLAGS="$EXTRA_KCFLAGS -g -I$PWD/lnet/include -I$PWD/lustre/include"
 AC_SUBST(EXTRA_KCFLAGS)
 ])
 
@@ -341,13 +449,25 @@ AC_DEFUN([LB_CONDITIONALS],
 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(CRAY_PORTALS, test x$with_cray_portals != xno)
 AM_CONDITIONAL(INIT_SCRIPTS, test x$ENABLE_INIT_SCRIPTS = "x1")
+AM_CONDITIONAL(LINUX, test x$lb_target_os = "xlinux")
+AM_CONDITIONAL(DARWIN, test x$lb_target_os = "xdarwin")
+
+# this lets lustre cancel libsysio, per-branch or if liblustre is
+# disabled
+if test "x$LIBSYSIO_SUBDIR" = xlibsysio ; then
+	if test "x$with_sysio" != xyes ; then
+		SYSIO=""
+		LIBSYSIO_SUBDIR=""
+	fi
+fi
+AC_SUBST(LIBSYSIO_SUBDIR)
+AC_SUBST(SYSIO)
 
 LB_LINUX_CONDITIONALS
 LB_DARWIN_CONDITIONALS
 
-LP_CONDITIONALS
+LN_CONDITIONALS
 LC_CONDITIONALS
 ])
 
@@ -357,26 +477,37 @@ LC_CONDITIONALS
 # main configure steps
 #
 AC_DEFUN([LB_CONFIGURE],
-[LB_INCLUDE_RULES
+[LB_CANONICAL_SYSTEM
+
+LB_INCLUDE_RULES
 
+LB_CONFIG_CRAY_XT3
+LB_CONFIG_BGL
 LB_PATH_DEFAULTS
 
 LB_PROG_CC
 
 LB_PATH_LIBSYSIO
-LB_PATH_CRAY_PORTALS
+LB_PATH_SNMP
 
 LB_CONFIG_DOCS
 LB_CONFIG_UTILS
 LB_CONFIG_TESTS
+LC_CONFIG_CLIENT_SERVER
+LC_CONFIG_SPLIT
 
 LB_CONFIG_MODULES
+LC_CONFIG_GSS
 
 LC_CONFIG_LIBLUSTRE
+LN_CONFIGURE
 
-LP_CONFIGURE
 LC_CONFIGURE
 
+if test "$SNMP_DIST_SUBDIR" ; then
+	LS_CONFIGURE
+fi
+
 LB_CONDITIONALS
 LB_CONFIG_HEADERS
 
@@ -389,18 +520,28 @@ build/Rules
 build/lustre.spec
 ])
 
-LP_CONFIG_FILES
+LN_CONFIG_FILES
 LC_CONFIG_FILES
+if test "$SNMP_DIST_SUBDIR" ; then
+	LS_CONFIG_FILES
+fi
+
+AC_SUBST(ac_configure_args)
+
+MOSTLYCLEANFILES='.*.cmd .*.flags *.o *.ko *.mod.c .depend .*.1.*'
+AC_SUBST(MOSTLYCLEANFILES)
 
 AC_OUTPUT
 
 cat <<_ACEOF
 
-CPPFLAGS: $CPPFLAGS
-LLCPPFLAGS: $LLCPPFLAGS
-CFLAGS: $CFLAGS
+CC:            $CC
+LD:            $LD
+CPPFLAGS:      $CPPFLAGS
+LLCPPFLAGS:    $LLCPPFLAGS
+CFLAGS:        $CFLAGS
 EXTRA_KCFLAGS: $EXTRA_KCFLAGS
-LLCFLAGS: $LLCFLAGS
+LLCFLAGS:      $LLCFLAGS
 
 Type 'make' to build Lustre.
 _ACEOF