LU-278 build: Only warn for tag/version mismatch

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

diff --git a/build/autoconf/lustre-build.m4 b/build/autoconf/lustre-build.m4
index 0d9d029..20e3d0d 100644 (file)
--- a/build/autoconf/lustre-build.m4
+++ b/build/autoconf/lustre-build.m4
@@ -61,7 +61,7 @@ BUILDID=""
 if git branch >/dev/null 2>&1; then
        ffw=0
        hash=""
-       ver=$(git describe --match [[0-9v]]\* --tags)
+       ver=$(git describe --match v[[0-9]]_*_[[0-9]] --tags)
        if [[[ $ver = *-*-* ]]]; then
                hash=${ver##*-}
                ffw=${ver#*-}
@@ -84,11 +84,14 @@ if git branch >/dev/null 2>&1; then
        if [[[ $ver = v*_*_*_0 ]]]; then
                ver=${ver%_0}
        fi
-
+       if [[[ $ver = v*_*_* ]]]; then
+               ver=${ver#v}
+               ver=${ver//_/.}
+       fi
 
        # only do this test for lustre (not ldiskfs)
        if test "$PACKAGE" = "lustre" -a "$ver" != "$VERSION"; then
-               AC_MSG_ERROR([most recent tag found: $ver does not match current version $VERSION.])
+               AC_MSG_WARN([most recent tag found: $ver does not match current version $VERSION.])
        fi
 
        if test "$ffw" != "0"; then
@@ -258,7 +261,6 @@ case x$with_lustre_iokit in
                        AC_MSG_ERROR([A complete (built) external lustre-iokit was not found.])
                ])
                LUSTREIOKIT="$with_lustre_iokit"
-               with_lustre_iokit="yes"
                ;;
 esac
 AC_SUBST(LUSTREIOKIT_SUBDIR)
@@ -301,8 +303,8 @@ case x$with_ldiskfs in
                ;;
        xinkernel)
                AC_MSG_RESULT([inkernel])
-               LB_CHECK_FILE([$LINUX/fs/ldiskfs/inode.c],[],[
-                       AC_MSG_ERROR([ldiskfs was not found in $LINUX/fs/ldiskfs/inode.c])
+               LB_CHECK_FILE([$LINUX/include/linux/ldiskfs_fs.h],[],[
+                       AC_MSG_ERROR([ldiskfs was not found in $LINUX])
                ])
                ;;
        *)
@@ -870,6 +872,7 @@ AM_CONDITIONAL(LINUX, test x$lb_target_os = "xlinux")
 AM_CONDITIONAL(DARWIN, test x$lb_target_os = "xdarwin")
 AM_CONDITIONAL(CRAY_XT3, test x$enable_cray_xt3 = "xyes")
 AM_CONDITIONAL(SUNOS, test x$lb_target_os = "xSunOS")
+AM_CONDITIONAL(USES_DPKG, test x$uses_dpkg = "xyes")
 
 # this lets lustre cancel libsysio, per-branch or if liblustre is
 # disabled
@@ -917,6 +920,7 @@ AC_DEFUN([LB_CONFIGURE],
 LB_CONFIG_DIST
 
 LB_DOWNSTREAM_RELEASE
+LB_USES_DPKG
 LB_BUILDID
 
 LB_LIBCFS_DIR