X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=ldiskfs%2Fconfig%2Fldiskfs-build.m4;h=be144deb877cc3054fc29bce5f670293e2a39660;hp=2feec80f10adf6771e9096676e393a21b2812e0b;hb=f60b861e3e526d33aa504f90385727ff74f290ba;hpb=cf79d2fa5de4ccb43b9d7513c8a3b2bffdd4c714 diff --git a/ldiskfs/config/ldiskfs-build.m4 b/ldiskfs/config/ldiskfs-build.m4 index 2feec80..be144de 100644 --- 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_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])