move AC_SUBST into lustre-build.m4 (b=7126)

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

diff --git a/build/autoconf/lustre-build.m4 b/build/autoconf/lustre-build.m4
index e4e86bb..a21f108 100644 (file)
--- a/build/autoconf/lustre-build.m4
+++ b/build/autoconf/lustre-build.m4
@@ -191,6 +191,17 @@ fi
 ])
 
 #
+# 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)
+])
+
+#
 # LB_CONFIG_MODULES
 #
 # Build kernel modules?
@@ -236,9 +247,6 @@ AC_ARG_ENABLE([utils],
        AC_HELP_STRING([--disable-utils],
                        [disable building of Lustre utility programs]),
        [],[enable_utils='yes'])
-if test x$cray_portals = xyes ; then
-       enable_utils='no'
-fi
 AC_MSG_RESULT([$enable_utils])
 if test x$enable_utils = xyes ; then 
        LB_CONFIG_INIT_SCRIPTS
@@ -465,10 +473,12 @@ 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
 
 LB_CONFIG_MODULES
 
@@ -476,6 +486,9 @@ LC_CONFIG_LIBLUSTRE
 
 LP_CONFIGURE
 LC_CONFIGURE
+if test "$SNMP_DIST_SUBDIR" ; then
+       LS_CONFIGURE
+fi
 
 LB_CONDITIONALS
 LB_CONFIG_HEADERS
@@ -491,6 +504,14 @@ build/lustre.spec
 
 LP_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