Branch b1_8

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

diff --git a/build/autoconf/lustre-build.m4 b/build/autoconf/lustre-build.m4
index 2d7e6c5..6005f11 100644 (file)
--- a/build/autoconf/lustre-build.m4
+++ b/build/autoconf/lustre-build.m4
@@ -45,19 +45,6 @@ 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_ARG_LIBS_INCLUDES
@@ -240,6 +227,10 @@ AC_SUBST(LDISKFS_DIR)
 AC_SUBST(LDISKFS_SUBDIR)
 AM_CONDITIONAL(LDISKFS_ENABLED, test x$with_ldiskfs != xno)
 
+if test x$enable_ext4 = xyes ; then
+       AC_DEFINE(HAVE_EXT4_LDISKFS, 1, [build ext4 based ldiskfs])
+fi
+
 # We have to configure even if we don't build here for make dist to work
 AC_CONFIG_SUBDIRS(ldiskfs)
 ])
@@ -273,6 +264,89 @@ AC_DEFUN([LB_DEFINE_LDISKFS_OPTIONS],
        AC_DEFINE(CONFIG_LDISKFS_FS_XATTR, 1, [enable extended attributes for ldiskfs])
        AC_DEFINE(CONFIG_LDISKFS_FS_POSIX_ACL, 1, [enable posix acls for ldiskfs])
        AC_DEFINE(CONFIG_LDISKFS_FS_SECURITY, 1, [enable fs security for ldiskfs])
+       AC_DEFINE(CONFIG_LDISKFSDEV_FS_POSIX_ACL, 1, [enable posix acls for ldiskfs])
+       AC_DEFINE(CONFIG_LDISKFSDEV_FS_XATTR, 1, [enable extented attributes for ldiskfs])
+       AC_DEFINE(CONFIG_LDISKFSDEV_FS_SECURITY, 1, [enable fs security for ldiskfs])
+])
+
+#
+# LB_DEFINE_E2FSPROGS_NAMES
+#
+# Enable the use of alternate naming of ldiskfs-enabled e2fsprogs package.
+#
+AC_DEFUN([LB_DEFINE_E2FSPROGS_NAMES],
+[AC_ARG_WITH([ldiskfsprogs],
+        AC_HELP_STRING([--with-ldiskfsprogs],
+                       [use alternate names for ldiskfs-enabled e2fsprogs]),
+       [],[withval='no'])
+
+if test x$withval = xyes ; then
+       AC_DEFINE(HAVE_LDISKFSPROGS, 1, [enable use of ldiskfsprogs package])
+       E2FSPROGS="ldiskfsprogs"
+       MKE2FS="mkfs.ldiskfs"
+       DEBUGFS="debug.ldiskfs"
+       TUNE2FS="tune.ldiskfs"
+       E2LABEL="label.ldiskfs"
+       DUMPE2FS="dump.ldiskfs"
+       E2FSCK="fsck.ldiskfs"
+       AC_MSG_RESULT([enabled])
+else
+       E2FSPROGS="e2fsprogs"
+       MKE2FS="mke2fs"
+       DEBUGFS="debugfs"
+       TUNE2FS="tune2fs"
+       E2LABEL="e2label"
+       DUMPE2FS="dumpe2fs"
+       E2FSCK="e2fsck"
+       AC_MSG_RESULT([disabled])
+fi
+       AC_DEFINE_UNQUOTED(E2FSPROGS, "$E2FSPROGS", [name of ldiskfs e2fsprogs package])
+       AC_DEFINE_UNQUOTED(MKE2FS, "$MKE2FS", [name of ldiskfs mkfs program])
+       AC_DEFINE_UNQUOTED(DEBUGFS, "$DEBUGFS", [name of ldiskfs debug program])
+       AC_DEFINE_UNQUOTED(TUNE2FS, "$TUNE2FS", [name of ldiskfs tune program])
+       AC_DEFINE_UNQUOTED(E2LABEL, "$E2LABEL", [name of ldiskfs label program])
+       AC_DEFINE_UNQUOTED(DUMPE2FS,"$DUMPE2FS", [name of ldiskfs dump program])
+       AC_DEFINE_UNQUOTED(E2FSCK, "$E2FSCK", [name of ldiskfs fsck program])
+])
+
+#
+# LB_DEFINE_E2FSPROGS_NAMES
+#
+# Enable the use of alternate naming of ldiskfs-enabled e2fsprogs package.
+#
+AC_DEFUN([LB_DEFINE_E2FSPROGS_NAMES],
+[AC_ARG_WITH([ldiskfsprogs],
+        AC_HELP_STRING([--with-ldiskfsprogs],
+                       [use alternate names for ldiskfs-enabled e2fsprogs]),
+       [],[withval='no'])
+
+if test x$withval = xyes ; then
+       AC_DEFINE(HAVE_LDISKFSPROGS, 1, [enable use of ldiskfsprogs package])
+       E2FSPROGS="ldiskfsprogs"
+       MKE2FS="mkfs.ldiskfs"
+       DEBUGFS="debug.ldiskfs"
+       TUNE2FS="tune.ldiskfs"
+       E2LABEL="label.ldiskfs"
+       DUMPE2FS="dump.ldiskfs"
+       E2FSCK="fsck.ldiskfs"
+       AC_MSG_RESULT([enabled])
+else
+       E2FSPROGS="e2fsprogs"
+       MKE2FS="mke2fs"
+       DEBUGFS="debugfs"
+       TUNE2FS="tune2fs"
+       E2LABEL="e2label"
+       DUMPE2FS="dumpe2fs"
+       E2FSCK="e2fsck"
+       AC_MSG_RESULT([disabled])
+fi
+       AC_DEFINE_UNQUOTED(E2FSPROGS, "$E2FSPROGS", [name of ldiskfs e2fsprogs package])
+       AC_DEFINE_UNQUOTED(MKE2FS, "$MKE2FS", [name of ldiskfs mkfs program])
+       AC_DEFINE_UNQUOTED(DEBUGFS, "$DEBUGFS", [name of ldiskfs debug program])
+       AC_DEFINE_UNQUOTED(TUNE2FS, "$TUNE2FS", [name of ldiskfs tune program])
+       AC_DEFINE_UNQUOTED(E2LABEL, "$E2LABEL", [name of ldiskfs label program])
+       AC_DEFINE_UNQUOTED(DUMPE2FS,"$DUMPE2FS", [name of ldiskfs dump program])
+       AC_DEFINE_UNQUOTED(E2FSCK, "$E2FSCK", [name of ldiskfs fsck program])
 ])
 
 #
@@ -441,18 +515,17 @@ if test x$dmu_osd = xyes; then
                AC_CONFIG_SUBDIRS(lustre/zfs-lustre)
        else
                # Kernel DMU
-               SPL_DIR="$PWD/spl"
-               ZFS_DIR="$PWD/zfs"
-               AC_SUBST(SPL_DIR)
-               AC_SUBST(ZFS_DIR)
+               SPL_SUBDIR="spl"
+               ZFS_SUBDIR="zfs"
 
-               AC_SUBST(spl_src)
+               SPL_DIR="$PWD/$SPL_SUBDIR"
+               ZFS_DIR="$PWD/$ZFS_SUBDIR"
 
-               LB_CHECK_FILE([$SPL_DIR/modules/spl/spl-generic.c],[],[
+               LB_CHECK_FILE([$SPL_DIR/module/spl/spl-generic.c],[],[
                        AC_MSG_ERROR([A complete SPL tree was not found in $SPL_DIR.])
                ])
 
-               LB_CHECK_FILE([$ZFS_DIR/zfs/lib/libzpool/dmu.c],[],[
+               LB_CHECK_FILE([$ZFS_DIR/module/zfs/dmu.c],[],[
                        AC_MSG_ERROR([A complete kernel DMU tree was not found in $ZFS_DIR.])
                ])
 
@@ -461,6 +534,10 @@ if test x$dmu_osd = xyes; then
                AC_CONFIG_SUBDIRS(zfs)
        fi
 fi
+AC_SUBST(SPL_SUBDIR)
+AC_SUBST(ZFS_SUBDIR)
+AC_SUBST(SPL_DIR)
+AC_SUBST(ZFS_DIR)
 AM_CONDITIONAL(DMU_OSD_ENABLED, test x$dmu_osd = xyes)
 AM_CONDITIONAL(KDMU, test x$dmu_osd$enable_uoss = xyesno)
 ])
@@ -786,6 +863,8 @@ LC_QUOTA
 
 LB_CONFIG_MODULES
 
+LN_CONFIG_USERSPACE
+
 LB_PATH_DMU
 LB_PATH_LIBSYSIO
 LB_PATH_SNMP
@@ -794,6 +873,10 @@ LB_PATH_LUSTREIOKIT
 
 LB_DEFINE_E2FSPROGS_NAMES
 
+LB_DEFINE_E2FSPROGS_NAMES
+
+LB_DEFINE_E2FSPROGS_NAMES
+
 LC_CONFIG_LIBLUSTRE
 LIBCFS_CONFIGURE
 LN_CONFIGURE