X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=build%2Fautoconf%2Flustre-build.m4;h=f6ff4c4ebe7c42039ae076c296570d083f25c705;hb=aeb813ea459afe88e85538dbfd658ab1df833f9b;hp=2e1cdd1c9fd5de5d78b59248c4dc6ab60106b70f;hpb=dae2f76bce8f616e45a3540536c1e5e433da286c;p=fs%2Flustre-release.git

diff --git a/build/autoconf/lustre-build.m4 b/build/autoconf/lustre-build.m4
index 2e1cdd1..f6ff4c4 100644
--- a/build/autoconf/lustre-build.m4
+++ b/build/autoconf/lustre-build.m4
@@ -22,11 +22,97 @@ AC_DEFUN([LB_CANONICAL_SYSTEM],
 	darwin*)
 		lb_target_os="darwin"
 		;;
-esac
+	solaris*)
+		lb_target_os="SunOS"
+		;;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
@@ -50,7 +136,7 @@ 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.])
 		])
 		LIBSYSIO_SUBDIR="libsysio"
@@ -61,7 +147,7 @@ case x$with_sysio in
 		;;
 	*)
 		AC_MSG_RESULT([$with_sysio])
-		AC_CHECK_FILE([$with_sysio/lib/libsysio.a],[],[
+		LB_CHECK_FILE([$with_sysio/lib/libsysio.a],[],[
 			AC_MSG_ERROR([A complete (built) external libsysio was not found.])
 		])
 		SYSIO=$with_sysio
@@ -69,76 +155,236 @@ case x$with_sysio in
 		;;
 esac
 
-# We have to configure even if we don't build here for make dist to
-# work
+# 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_PATH_LUSTREIOKIT
 #
-# Support for external Cray portals
+# Handle internal/external lustre-iokit
 #
-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_DEFUN([LB_PATH_LUSTREIOKIT],
+[AC_ARG_WITH([],
+	AC_HELP_STRING([--with-lustre-iokit=path],
+			[set path to lustre-iokit source (default is included lustre-iokit)]),
+	[],[
+			with_lustre_iokit='yes'
 	])
-AC_SUBST(CRAY_PORTALS_INCLUDES)
-AC_MSG_RESULT([$CRAY_PORTALS_INCLUDES])
+AC_MSG_CHECKING([location of lustre-iokit])
+enable_lustre_iokit="$with_lustre_iokit"
+case x$with_lustre_iokit in
+	xyes)
+		AC_MSG_RESULT([internal])
+		LB_CHECK_FILE([$srcdir/lustre-iokit/ior-survey/ior-survey],[],[
+			AC_MSG_ERROR([A complete internal lustre-iokit was not found.])
+		])
+		LUSTREIOKIT_SUBDIR="lustre-iokit"
+		LUSTREIOKIT="$PWD/lustre-iokit"
+		;;
+	xno)
+		AC_MSG_RESULT([disabled])
+		;;
+	*)
+		AC_MSG_RESULT([$with_lustre_iokit])
+		LB_CHECK_FILE([$with_lustre_iokit/ior-survey/ior_survey],[],[
+			AC_MSG_ERROR([A complete (built) external lustre-iokit was not found.])
+		])
+		LUSTREIOKIT="$with_lustre_iokit"
+		with_lustre_iokit="yes"
+		;;
+esac
+AC_SUBST(LUSTREIOKIT_SUBDIR)
+# We have to configure even if we don't build here for make dist to work
+AC_CONFIG_SUBDIRS(lustre-iokit)
+])
 
-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
+#
+# LB_PATH_LDISKFS
+#
+# Handle internal/external ldiskfs
+#
+AC_DEFUN([LB_PATH_LDISKFS],
+[AC_ARG_WITH([ldiskfs],
+	AC_HELP_STRING([--with-ldiskfs=path],
+			[set path to ldiskfs source (default is included ldiskfs)]),
+	[],[
+		if test x$linux25$enable_server = xyesyes ; then
+			with_ldiskfs=yes
+		else
+			with_ldiskfs=no
+		fi
 	])
-AC_SUBST(CRAY_PORTALS_LIBS)
-AC_MSG_RESULT([$CRAY_PORTALS_LIBS])
+AC_MSG_CHECKING([location of ldiskfs])
+case x$with_ldiskfs in
+	xyes)
+		AC_MSG_RESULT([internal])
+		LB_CHECK_FILE([$srcdir/ldiskfs/lustre-ldiskfs.spec.in],[],[
+			AC_MSG_ERROR([A complete internal ldiskfs was not found.])
+		])
+		LDISKFS_SUBDIR="ldiskfs"
+		LDISKFS_DIR="$PWD/ldiskfs"
+		;;
+	xno)
+		AC_MSG_RESULT([disabled])
+		;;
+	*)
+		AC_MSG_RESULT([$with_ldiskfs])
+		LB_CHECK_FILE([$with_ldiskfs/ldiskfs/linux/ldiskfs_fs.h],[],[
+			AC_MSG_ERROR([A complete (built) external ldiskfs was not found.])
+		])
+		LDISKFS_DIR=$with_ldiskfs
+		;;
+esac
+AC_SUBST(LDISKFS_DIR)
+AC_SUBST(LDISKFS_SUBDIR)
+AM_CONDITIONAL(LDISKFS_ENABLED, test x$with_ldiskfs != xno)
 
-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
+# We have to configure even if we don't build here for make dist to work
+AC_CONFIG_SUBDIRS(ldiskfs)
+])
+
+# Define no libcfs by default.
+AC_DEFUN([LB_LIBCFS_DIR],
+[
+case x$libcfs_is_module in
+	xyes)
+          LIBCFS_INCLUDE_DIR="libcfs/include"
+          LIBCFS_SUBDIR="libcfs"
+          ;;
+        x*)
+          LIBCFS_INCLUDE_DIR="lnet/include"
+          LIBCFS_SUBDIR=""
+          ;;
+esac
+AC_SUBST(LIBCFS_SUBDIR)
+AC_SUBST(LIBCFS_INCLUDE_DIR)
+])
+
+#
+# LB_DEFINE_LDISKFS_OPTIONS
+#
+# Enable config options related to ldiskfs.  These are used both by ldiskfs
+# and lvfs (which includes ldiskfs headers.)
+#
+AC_DEFUN([LB_DEFINE_LDISKFS_OPTIONS],
+[
+	AC_DEFINE(CONFIG_LDISKFS_FS_MODULE, 1, [build ldiskfs as a module])
+	AC_DEFINE(CONFIG_LDISKFS_FS_XATTR, 1, [enable extended attributes for ldiskfs])
+	AC_DEFINE(CONFIG_LDISKFS_FS_POSIX_ACL, 1, [enable posix acls for ldiskfs])
+	AC_DEFINE(CONFIG_LDISKFS_FS_SECURITY, 1, [enable fs security for ldiskfs])
+])
+
+#
+# LB_CONFIG_CRAY_XT3
+#
+# Enable Cray XT3 features
+#
+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
-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
+])
+
+#
+# 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(HAVE_BGL_SUPPORT, 1, Enable BGL Features)
+        enable_doc='no'
+        enable_tests='no'
+        enable_server='no'
+        enable_liblustre='no'
+        enable_libreadline='no'
 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"
+#
+# Support for --enable-uoss
+#
+AC_DEFUN([LB_UOSS],
+[AC_MSG_CHECKING([whether to enable uoss])
+AC_ARG_ENABLE([uoss],
+	AC_HELP_STRING([--enable-uoss],
+			[enable userspace OSS]),
+	[enable_uoss='yes'],[enable_uoss='no'])
+AC_MSG_RESULT([$enable_uoss])
+if test x$enable_uoss = xyes; then
+	AC_DEFINE(UOSS_SUPPORT, 1, Enable user-level OSS)
+	AC_DEFINE(LUSTRE_ULEVEL_MT, 1, Multi-threaded user-level lustre port)
+	enable_uoss='yes'
+	enable_ulevel_mt='yes'
+	enable_modules='no'
+	enable_client='no'
+	enable_tests='no'
+	enable_liblustre='no'
+	with_ldiskfs='no'
+fi
+AC_SUBST(enable_uoss)
+])
+
+#
+# Support for --enable-posix-osd
+#
+AC_DEFUN([LB_POSIX_OSD],
+[AC_MSG_CHECKING([whether to enable posix osd])
+AC_ARG_ENABLE([posix-osd],
+	AC_HELP_STRING([--enable-posix-osd],
+			[enable using of posix osd]),
+	[enable_posix_osd='yes'],[enable_posix_osd='no'])
+AC_MSG_RESULT([$enable_posix_osd])
+if test x$enable_uoss = xyes -a x$enable_posix_osd = xyes ; then
+	AC_DEFINE(POSIX_OSD, 1, Enable POSIX OSD)
+	posix_osd='yes'
+fi
+AM_CONDITIONAL(POSIX_OSD_ENABLED, test x$posix_osd = xyes)
+])
+
+#
+# LB_PATH_DMU
+#
+AC_DEFUN([LB_PATH_DMU],
+[AC_MSG_CHECKING([whether to enable DMU])
+if test x$enable_uoss = xyes -a x$enable_posix_osd != xyes; then
+	DMU_SRC="$PWD/lustre/zfs-lustre"
+	AC_DEFINE(DMU_OSD, 1, Enable DMU OSD)
+	AC_MSG_RESULT([yes])
+	LB_CHECK_FILE([$DMU_SRC/src/.patched],[],[
+		AC_MSG_ERROR([A complete (patched) DMU tree was not found.])
+	])
+	AC_CONFIG_SUBDIRS(lustre/zfs-lustre)
+	dmu_osd='yes'
 else
-	with_cray_portals=no
+	AC_MSG_RESULT([no])
 fi
-AC_MSG_RESULT([$with_cray_portals])
+AC_SUBST(DMU_SRC)
+AM_CONDITIONAL(DMU_OSD_ENABLED, test x$dmu_osd = xyes)
+])
+
+#
+# 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)
 ])
 
 #
@@ -164,9 +410,13 @@ if test x$enable_modules = xyes ; then
 	case $target_os in
 		linux*)
 			LB_PROG_LINUX
+			LIBCFS_PROG_LINUX
+			LN_PROG_LINUX
+			LC_PROG_LINUX
 			;;
 		darwin*)
 			LB_PROG_DARWIN
+			LIBCFS_PROG_DARWIN
 			;;
 		*)
 			# This is strange - Lustre supports a target we don't
@@ -187,9 +437,6 @@ AC_ARG_ENABLE([utils],
 	AC_HELP_STRING([--disable-utils],
 			[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
@@ -206,10 +453,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])
 ])
 
@@ -275,7 +522,7 @@ AC_SUBST(EXTRA_KCFLAGS)
 # defines for including the toplevel Rules
 #
 AC_DEFUN([LB_INCLUDE_RULES],
-[INCLUDE_RULES="include $PWD/build/Rules"
+[INCLUDE_RULES="include $PWD/Rules"
 AC_SUBST(INCLUDE_RULES)
 ])
 
@@ -295,8 +542,10 @@ AC_SUBST(sysconfdir)
 docdir='${datadir}/doc/$(PACKAGE)'
 AC_SUBST(docdir)
 
-LP_PATH_DEFAULTS
+LIBCFS_PATH_DEFAULTS
+LN_PATH_DEFAULTS
 LC_PATH_DEFAULTS
+
 ])
 
 #
@@ -344,27 +593,23 @@ 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
 
-AC_MSG_CHECKING([if $CC accepts -m64])
-CFLAGS_save="$CFLAGS"
-CFLAGS="-m64 $CFLAGS"
-AC_TRY_COMPILE([],[],[
-	AC_MSG_RESULT([yes])
-	EXTRA_KCFLAGS="-m64 $EXTRA_KCFLAGS"
-],[
-	AC_MSG_RESULT([no])
-	CFLAGS="$CFLAGS_save"
-])
+if test $target_cpu == "powerpc64"; then
+	AC_MSG_WARN([set compiler with -m64])
+	CFLAGS="$CFLAGS -m64"
+	CC="$CC -m64"
+fi
 
-CPPFLAGS="-I\$(top_builddir)/portals/include -I\$(top_srcdir)/portals/include -I\$(top_builddir)/lustre/include -I\$(top_srcdir)/lustre/include $CPPFLAGS"
+CPPFLAGS="-I\$(top_builddir)/$LIBCFS_INCLUDE_DIR -I\$(top_srcdir)/$LIBCFS_INCLUDE_DIR-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)
 
-LLCFLAGS="-g -Wall -fPIC"
+# Add _GNU_SOURCE for strnlen on linux
+LLCFLAGS="-g -Wall -fPIC -D_GNU_SOURCE"
 AC_SUBST(LLCFLAGS)
 
-# everyone builds against portals and lustre
-EXTRA_KCFLAGS="$EXTRA_KCFLAGS -g -I$PWD/portals/include -I$PWD/lustre/include"
+# everyone builds against lnet and lustre
+EXTRA_KCFLAGS="$EXTRA_KCFLAGS -g -I$PWD/$LIBCFS_INCLUDE_DIR -I$PWD/lnet/include -I$PWD/lustre/include"
 AC_SUBST(EXTRA_KCFLAGS)
 ])
 
@@ -378,10 +623,11 @@ 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")
+AM_CONDITIONAL(CRAY_XT3, test x$enable_cray_xt3 = "xyes")
+AM_CONDITIONAL(SUNOS, test x$lb_target_os = "xSunOS")
 
 # this lets lustre cancel libsysio, per-branch or if liblustre is
 # disabled
@@ -397,11 +643,28 @@ AC_SUBST(SYSIO)
 LB_LINUX_CONDITIONALS
 LB_DARWIN_CONDITIONALS
 
-LP_CONDITIONALS
+LIBCFS_CONDITIONALS
+LN_CONDITIONALS
 LC_CONDITIONALS
 ])
 
 #
+# LB_CONFIG_FILES
+#
+# build-specific config files
+#
+AC_DEFUN([LB_CONFIG_FILES],
+[
+AC_CONFIG_FILES(
+[Makefile
+autoMakefile
+]
+[Rules:build/Rules.in]
+AC_PACKAGE_TARNAME[.spec]
+)
+])
+
+#
 # LB_CONFIGURE
 #
 # main configure steps
@@ -409,50 +672,75 @@ LC_CONDITIONALS
 AC_DEFUN([LB_CONFIGURE],
 [LB_CANONICAL_SYSTEM
 
+LB_LIBCFS_DIR
+
 LB_INCLUDE_RULES
 
+LB_CONFIG_CRAY_XT3
+LB_CONFIG_BGL
 LB_PATH_DEFAULTS
 
 LB_PROG_CC
 
-LB_PATH_LIBSYSIO
-LB_PATH_CRAY_PORTALS
+LB_UOSS
+LB_POSIX_OSD
+LB_PATH_DMU
 
 LB_CONFIG_DOCS
 LB_CONFIG_UTILS
 LB_CONFIG_TESTS
+LC_CONFIG_CLIENT_SERVER
+
+# two macros for cmd3 
+LC_CONFIG_SPLIT
+LN_CONFIG_CDEBUG
+LC_QUOTA
 
 LB_CONFIG_MODULES
 
+LB_PATH_LIBSYSIO
+LB_PATH_SNMP
+LB_PATH_LDISKFS
+LB_PATH_LUSTREIOKIT
+
 LC_CONFIG_LIBLUSTRE
+LIBCFS_CONFIGURE
+LN_CONFIGURE
 
-LP_CONFIGURE
 LC_CONFIGURE
 
+if test "$SNMP_DIST_SUBDIR" ; then
+	LS_CONFIGURE
+fi
+
+
 LB_CONDITIONALS
 LB_CONFIG_HEADERS
 
-AC_CONFIG_FILES(
-[Makefile:build/Makefile.in.toplevel]
-[autoMakefile
-build/autoMakefile
-build/autoconf/Makefile
-build/Rules
-build/lustre.spec
-])
-
-LP_CONFIG_FILES
+LIBCFS_CONFIG_FILES
+LB_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.* Modules.symvers Module.symvers'
+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