LU-1199 build: Remove unused LB_LDISKFS_RELEASE macros

The products of the LB_LDISKFS_RELEASE macros are unused.  They
also make some bad assumtions that complicate building against
a future lustre-devel package.  So we remove them.

If Lustre needs to know ldiskfs's version in the future, we
should add explicit version defines to the new ldiskfs_config.h.in
header that is in the works (or possibly landed by now).

Change-Id: I40b96dc72f5076ba9a9dda3f41b31088fdfd4341
Signed-off-by: Christopher J. Morrone <morrone2@llnl.gov>
Reviewed-on: http://review.whamcloud.com/5881
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Tested-by: Hudson
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: James Simmons <uja.ornl@gmail.com>

diff --git a/config/lustre-build-ldiskfs.m4 b/config/lustre-build-ldiskfs.m4
index cdcd10b..d619d7c 100644 (file)
--- a/config/lustre-build-ldiskfs.m4
+++ b/config/lustre-build-ldiskfs.m4
@@ -102,7 +102,6 @@ if test x$with_ldiskfs = xyes; then
        AC_SUBST(LDISKFS_OBJ)
 
        LB_LDISKFS_SYMVERS
        AC_SUBST(LDISKFS_OBJ)
 
        LB_LDISKFS_SYMVERS

-       LB_LDISKFS_RELEASE

        LB_LDISKFS_EXT_DIR
        LB_LDISKFS_BUILD
        AC_DEFINE(HAVE_LDISKFS_OSD, 1, Enable ldiskfs osd)
        LB_LDISKFS_EXT_DIR
        LB_LDISKFS_BUILD
        AC_DEFINE(HAVE_LDISKFS_OSD, 1, Enable ldiskfs osd)


@@ -264,55 +263,6 @@ AC_MSG_RESULT([$LDISKFS_SYMBOLS])
 AC_SUBST(LDISKFS_SYMBOLS)
 ])
 
 AC_SUBST(LDISKFS_SYMBOLS)
 ])
 

-AC_DEFUN([LB_LDISKFS_RELEASE],
-[
-AC_MSG_CHECKING([ldiskfs source release])
-if test -r $LDISKFS_OBJ/config.h; then
-       tmp_flags="$EXTRA_KCFLAGS"
-       EXTRA_KCFLAGS="-I$LDISKFS_DIR $EXTRA_KCFLAGS"
-       LB_LINUX_TRY_MAKE([
-               #undef PACKAGE_NAME
-               #undef PACKAGE_TARNAME
-               #undef PACKAGE_VERSION
-               #undef PACKAGE_STRING
-               #undef PACKAGE_BUGREPORT
-               #undef PACKAGE
-               #undef VERSION
-               #undef STDC_HEADERS
-
-               #include <$LDISKFS_OBJ/config.h>
-       ],[
-               char *LDISKFS_RELEASE;
-               LDISKFS_RELEASE=VERSION;
-       ],[
-               $makerule LUSTRE_KERNEL_TEST=conftest.i
-       ],[
-               test -s build/conftest.i
-       ],[
-               eval $(grep "LDISKFS_RELEASE=" build/conftest.i)
-       ],[
-               AC_MSG_RESULT([unknown])
-               AC_MSG_ERROR([Could not preprocess test program.])
-       ])
-       EXTRA_KCFLAGS="$tmp_flags"
-       rm build/conftest.i
-elif test -r $LDISKFS_DIR/configure.ac; then
-       LDISKFS_RELEASE=$(awk '/AC\_INIT/ { print [$]3 }' \
-                $LDISKFS_DIR/configure.ac | tr ',' '\n')
-else
-       AC_MSG_RESULT([unknown])
-       AC_MSG_ERROR([Could not locate config.h, META, or configure.ac to check release.])
-fi
-
-if test x$LDISKFS_RELEASE = x; then
-       AC_MSG_RESULT([unknown])
-       AC_MSG_ERROR([Could not determine ldiskfs release.])
-fi
-
-AC_MSG_RESULT([$LDISKFS_RELEASE])
-AC_SUBST(LDISKFS_RELEASE)
-])
-

 #
 # LB_DEFINE_E2FSPROGS_NAMES
 #
 #
 # LB_DEFINE_E2FSPROGS_NAMES
 #

diff --git a/ldiskfs/config/ldiskfs-build.m4 b/ldiskfs/config/ldiskfs-build.m4
index 2feec80..be144de 100644 (file)
--- a/ldiskfs/config/ldiskfs-build.m4
+++ b/ldiskfs/config/ldiskfs-build.m4
@@ -627,56 +627,8 @@ AC_MSG_RESULT([$LDISKFS_SYMBOLS])
 AC_SUBST(LDISKFS_SYMBOLS)
 ])
 
 AC_SUBST(LDISKFS_SYMBOLS)
 ])
 

-AC_DEFUN([LB_LDISKFS_RELEASE],
+AC_DEFUN([LB_LDISKFS_SERIES],

 [
 [

-AC_MSG_CHECKING([ldiskfs source release])
-if test -r $LDISKFS_OBJ/config.h; then
-       tmp_flags="$EXTRA_KCFLAGS"
-       EXTRA_KCFLAGS="-I$LDISKFS_DIR $EXTRA_KCFLAGS"
-       LB_LINUX_TRY_MAKE([
-               #undef PACKAGE_NAME
-               #undef PACKAGE_TARNAME
-               #undef PACKAGE_VERSION
-               #undef PACKAGE_STRING
-               #undef PACKAGE_BUGREPORT
-               #undef PACKAGE
-               #undef VERSION
-               #undef STDC_HEADERS
-
-               #include <$LDISKFS_OBJ/config.h>
-       ],[
-               char *LDISKFS_RELEASE;
-               LDISKFS_RELEASE=VERSION;
-       ],[
-               $makerule LUSTRE_KERNEL_TEST=conftest.i
-       ],[
-               test -s build/conftest.i
-       ],[
-               eval $(grep "LDISKFS_RELEASE=" build/conftest.i)
-       ],[
-               AC_MSG_RESULT([unknown])
-               AC_MSG_ERROR([Could not preprocess test program.])
-       ])
-       EXTRA_KCFLAGS="$tmp_flags"
-       rm build/conftest.i
-elif test -r $LDISKFS_DIR/configure.ac; then
-       LDISKFS_RELEASE=$(awk '/AC\_INIT/ { print [$]3 }' \
-                $LDISKFS_DIR/configure.ac | tr ',' '\n')
-else
-       AC_MSG_RESULT([unknown])
-       AC_MSG_ERROR([Could not locate config.h, META, or configure.ac to check release.])
-fi
-
-if test x$LDISKFS_RELEASE = x; then
-       AC_MSG_RESULT([unknown])
-       AC_MSG_ERROR([Could not determine ldiskfs release.])
-fi
-
-AC_MSG_RESULT([$LDISKFS_RELEASE])
-AC_SUBST(LDISKFS_RELEASE)
-])
-
-AC_DEFUN([LB_LDISKFS_SERIES], [

 LDISKFS_SERIES=
 AS_IF([$1], [
        AC_MSG_CHECKING([which ldiskfs series to use])
 LDISKFS_SERIES=
 AS_IF([$1], [
        AC_MSG_CHECKING([which ldiskfs series to use])