b=5576

add LB_CHECK_FILE(S), which work while cross-compiling.

diff --git a/build/autoconf/lustre-build-linux.m4 b/build/autoconf/lustre-build-linux.m4
index f668e19..0a73ea5 100644 (file)
--- a/build/autoconf/lustre-build-linux.m4
+++ b/build/autoconf/lustre-build-linux.m4
@@ -4,7 +4,7 @@
 # Set things accordingly for a 2.5 kernel
 #
 AC_DEFUN([LB_LINUX_VERSION],
 # Set things accordingly for a 2.5 kernel
 #
 AC_DEFUN([LB_LINUX_VERSION],

-[AC_CHECK_FILE([$LINUX/include/linux/namei.h],
+[LB_CHECK_FILE([$LINUX/include/linux/namei.h],

        [
                linux25="yes"
                KMODEXT=".ko"
        [
                linux25="yes"
                KMODEXT=".ko"


@@ -122,9 +122,9 @@ AC_ARG_WITH([linux-config],
        [LINUX_CONFIG=$LINUX_OBJ/.config])
 AC_SUBST(LINUX_CONFIG)
 
        [LINUX_CONFIG=$LINUX_OBJ/.config])
 AC_SUBST(LINUX_CONFIG)
 

-AC_CHECK_FILE([/boot/kernel.h],
+LB_CHECK_FILE([/boot/kernel.h],

        [KERNEL_SOURCE_HEADER='/boot/kernel.h'],
        [KERNEL_SOURCE_HEADER='/boot/kernel.h'],

-       [AC_CHECK_FILE([/var/adm/running-kernel.h],
+       [LB_CHECK_FILE([/var/adm/running-kernel.h],

                [KERNEL_SOURCE_HEADER='/var/adm/running-kernel.h'])])
 
 AC_ARG_WITH([kernel-source-header],
                [KERNEL_SOURCE_HEADER='/var/adm/running-kernel.h'])])
 
 AC_ARG_WITH([kernel-source-header],


@@ -133,11 +133,11 @@ AC_ARG_WITH([kernel-source-header],
        [KERNEL_SOURCE_HEADER=$with_kernel_source_header])
 
 # ------------ .config exists ----------------
        [KERNEL_SOURCE_HEADER=$with_kernel_source_header])
 
 # ------------ .config exists ----------------

-AC_CHECK_FILE([$LINUX_CONFIG],[],
+LB_CHECK_FILE([$LINUX_CONFIG],[],

        [AC_MSG_ERROR([Kernel config could not be found.  If you are building from a kernel-source rpm consult build/README.kernel-source])])
 
 # ----------- make dep run? ------------------
        [AC_MSG_ERROR([Kernel config could not be found.  If you are building from a kernel-source rpm consult build/README.kernel-source])])
 
 # ----------- make dep run? ------------------

-AC_CHECK_FILES([$LINUX_OBJ/include/linux/autoconf.h
+LB_CHECK_FILES([$LINUX_OBJ/include/linux/autoconf.h

                $LINUX_OBJ/include/linux/version.h
                $LINUX/include/linux/config.h],[],
        [AC_MSG_ERROR([Run make config in $LINUX.])])
                $LINUX_OBJ/include/linux/version.h
                $LINUX/include/linux/config.h],[],
        [AC_MSG_ERROR([Run make config in $LINUX.])])


@@ -153,7 +153,7 @@ if grep rhconfig $LINUX_OBJ/include/linux/version.h >/dev/null ; then
        # This is a clean kernel-source tree, we need to
        # enable extensive workarounds to get this to build
        # modules
        # This is a clean kernel-source tree, we need to
        # enable extensive workarounds to get this to build
        # modules

-       AC_CHECK_FILE([$KERNEL_SOURCE_HEADER],
+       LB_CHECK_FILE([$KERNEL_SOURCE_HEADER],

                [if test $KERNEL_SOURCE_HEADER = '/boot/kernel.h' ; then
                        AC_MSG_WARN([Using /boot/kernel.h from RUNNING kernel.])
                        AC_MSG_WARN([If this is not what you want, use --with-kernel-source-header.])
                [if test $KERNEL_SOURCE_HEADER = '/boot/kernel.h' ; then
                        AC_MSG_WARN([Using /boot/kernel.h from RUNNING kernel.])
                        AC_MSG_WARN([If this is not what you want, use --with-kernel-source-header.])

diff --git a/build/autoconf/lustre-build.m4 b/build/autoconf/lustre-build.m4
index 47bb1a2..5d1e4c1 100644 (file)
--- a/build/autoconf/lustre-build.m4
+++ b/build/autoconf/lustre-build.m4
@@ -27,6 +27,37 @@ 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
 # LB_PATH_LIBSYSIO
 #
 # Handle internal/external libsysio


@@ -50,7 +81,7 @@ enable_sysio="$with_sysio"
 case x$with_sysio in
        xyes)
                AC_MSG_RESULT([internal])
 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"
                        AC_MSG_ERROR([A complete internal libsysio was not found.])
                ])
                LIBSYSIO_SUBDIR="libsysio"


@@ -61,7 +92,7 @@ case x$with_sysio in
                ;;
        *)
                AC_MSG_RESULT([$with_sysio])
                ;;
        *)
                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
                        AC_MSG_ERROR([A complete (built) external libsysio was not found.])
                ])
                SYSIO=$with_sysio