Move these macros to lustre-portals.m4 and lustre-core.m4 where they really belong

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

diff --git a/build/autoconf/lustre-build.m4 b/build/autoconf/lustre-build.m4
index fefa9d8..c20ed73 100644 (file)
--- a/build/autoconf/lustre-build.m4
+++ b/build/autoconf/lustre-build.m4
@@ -20,6 +20,7 @@ AC_DEFUN([LB_PATH_LIBSYSIO],
                        [set path to libsysio source (default is included libsysio)]),
        [],[with_sysio='yes'])
 AC_MSG_CHECKING([location of libsysio])
+enable_sysio="$with_sysio"
 case x$with_sysio in
        xyes)
                AC_MSG_RESULT([internal])
@@ -39,6 +40,7 @@ case x$with_sysio in
                        AC_MSG_ERROR([A complete (built) external libsysio was not found.])
                ])
                SYSIO=$with_sysio
+               enable_sysio="yes"
                ;;
 esac
 AC_SUBST(LIBSYSIO_SUBDIR)
@@ -123,14 +125,11 @@ 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)])
 
@@ -139,10 +138,11 @@ if test x$enable_modules = xyes ; then
                linux*)
                        LB_PROG_LINUX
                        ;;
-               darwin)
+               darwin*)
                        LB_PROG_DARWIN
                        ;;
                *)
+                       # This is strange - Lustre supports a target we don't
                        AC_MSG_ERROR([Modules are not supported on $target_os])
                        ;;
        esac
@@ -158,12 +158,15 @@ 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
 ])
 
 #
@@ -264,6 +267,9 @@ AC_SUBST(sysconfdir)
 # Directories for documentation and demos.
 docdir='${datadir}/doc/$(PACKAGE)'
 AC_SUBST(docdir)
+
+LP_PATH_DEFAULTS
+LC_PATH_DEFAULTS
 ])
 
 #
@@ -273,7 +279,6 @@ AC_SUBST(docdir)
 #
 AC_DEFUN([LB_PROG_CC],
 [AC_PROG_RANLIB
-AC_PROG_CC
 AC_MSG_CHECKING([for buggy compiler])
 CC_VERSION=`$CC -v 2>&1 | grep "^gcc version"`
 bad_cc() {
@@ -366,7 +371,10 @@ LB_CONFIG_TESTS
 
 LB_CONFIG_MODULES
 
-LB_CONFIG_LIBLUSTRE
+LC_CONFIG_LIBLUSTRE
+
+LP_CONFIGURE
+LC_CONFIGURE
 
 LB_CONDITIONALS
 LB_CONFIG_HEADERS
@@ -375,6 +383,7 @@ AC_CONFIG_FILES(
 [Makefile:build/Makefile.in.toplevel]
 [autoMakefile
 build/autoMakefile
+build/autoconf/Makefile
 build/Rules
 build/lustre.spec
 ])