Whamcloud - gitweb
add autoconf dirs to build
[fs/lustre-release.git] / build / autoconf / lustre-build.m4
index 6132eb6..3d9afdd 100644 (file)
@@ -264,6 +264,9 @@ AC_SUBST(sysconfdir)
 # Directories for documentation and demos.
 docdir='${datadir}/doc/$(PACKAGE)'
 AC_SUBST(docdir)
+
+LP_PATH_DEFAULTS
+LC_PATH_DEFAULTS
 ])
 
 #
@@ -335,27 +338,67 @@ 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(INKERNEL, test x$enable_inkernel = xyes)
-AM_CONDITIONAL(LINUX25, test x$linux25 = xyes)
 AM_CONDITIONAL(CRAY_PORTALS, test x$with_cray_portals != xno)
 AM_CONDITIONAL(INIT_SCRIPTS, test x$ENABLE_INIT_SCRIPTS = "x1")
 
+LB_LINUX_CONDITIONALS
+LB_DARWIN_CONDITIONALS
+
 LP_CONDITIONALS
 LC_CONDITIONALS
 ])
 
 #
-# LB_CONFIG_FILES
+# LB_CONFIGURE
 #
-# files that should be generated with AC_OUTPUT
+# main configure steps
 #
-AC_DEFUN([LB_CONFIG_FILES],
-[AC_CONFIG_FILES([
+AC_DEFUN([LB_CONFIGURE],
+[LB_INCLUDE_RULES
+
+LB_PATH_DEFAULTS
+
+LB_PROG_CC
+
+LB_PATH_LIBSYSIO
+LB_PATH_CRAY_PORTALS
+
+LB_CONFIG_DOCS
+LB_CONFIG_UTILS
+LB_CONFIG_TESTS
+
+LB_CONFIG_MODULES
+
+LC_CONFIG_LIBLUSTRE
+
+LP_CONFIGURE
+LC_CONFIGURE
+
+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
 LC_CONFIG_FILES
+
+AC_OUTPUT
+
+cat <<_ACEOF
+
+CPPFLAGS: $CPPFLAGS
+LLCPPFLAGS: $LLCPPFLAGS
+CFLAGS: $CFLAGS
+EXTRA_KCFLAGS: $EXTRA_KCFLAGS
+LLCFLAGS: $LLCFLAGS
+
+Type 'make' to build Lustre.
+_ACEOF
 ])