b=5576

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

diff --git a/build/autoconf/lustre-build.m4 b/build/autoconf/lustre-build.m4
index 1851e95..5d1e4c1 100644 (file)
--- a/build/autoconf/lustre-build.m4
+++ b/build/autoconf/lustre-build.m4
@@ -10,6 +10,54 @@ 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_PATH_LIBSYSIO
 #
 # Handle internal/external libsysio
@@ -18,13 +66,22 @@ 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.])
                ])
                LIBSYSIO_SUBDIR="libsysio"
@@ -35,7 +92,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
@@ -108,7 +165,7 @@ 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"
+       EXTRA_KCFLAGS="-I$CRAY_PORTALS_INCLUDES $EXTRA_KCFLAGS"
 else
        with_cray_portals=no
 fi
@@ -319,17 +376,16 @@ if test $ac_cv_sizeof_unsigned_long_long != 8 ; then
 fi
 
 AC_MSG_CHECKING([if $CC accepts -m64])
-CFLAGS_save="$CFLAGS"
-CFLAGS="-m64 $CFLAGS"
+CC_save="$CC"
+CC="$CC -m64"
 AC_TRY_COMPILE([],[],[
        AC_MSG_RESULT([yes])
-       EXTRA_KCFLAGS="-m64 $EXTRA_KCFLAGS"
 ],[
        AC_MSG_RESULT([no])
-       CFLAGS="$CFLAGS_save"
+       CC="$CC_save"
 ])
 
-CPPFLAGS="-I\$(top_srcdir)/lustre/include -I\$(top_srcdir)/portals/include $CPPFLAGS"
+CPPFLAGS="-I\$(top_builddir)/portals/include -I\$(top_srcdir)/portals/include -I\$(top_builddir)/lustre/include -I\$(top_srcdir)/lustre/include $CPPFLAGS"
 
 LLCPPFLAGS="-D__arch_lib__ -D_LARGEFILE64_SOURCE=1"
 AC_SUBST(LLCPPFLAGS)
@@ -354,6 +410,8 @@ 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
@@ -379,7 +437,9 @@ LC_CONDITIONALS
 # main configure steps
 #
 AC_DEFUN([LB_CONFIGURE],
-[LB_INCLUDE_RULES
+[LB_CANONICAL_SYSTEM
+
+LB_INCLUDE_RULES
 
 LB_PATH_DEFAULTS
 
@@ -418,11 +478,13 @@ 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