X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=config%2Flustre-build-ldiskfs.m4;h=f29fd39bc25beef17e0482063c4b3993d167b417;hp=cdcd10b9f81cd2f0dff811cda1984adcde609f2c;hb=16f4a61f1bc068a0f78bf9ee3f1313b1528285f1;hpb=1ec95b2b5410286c46b95c624e1d382b1e86535a

diff --git a/config/lustre-build-ldiskfs.m4 b/config/lustre-build-ldiskfs.m4
index cdcd10b..f29fd39 100644
--- 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
-	LB_LDISKFS_RELEASE
 	LB_LDISKFS_EXT_DIR
 	LB_LDISKFS_BUILD
 	AC_DEFINE(HAVE_LDISKFS_OSD, 1, Enable ldiskfs osd)
@@ -190,7 +189,6 @@ else
 fi
 
 if test x$enable_ldiskfs_build = xno; then
-	enable_server='no'
 	enable_ldiskfs_build='no'
 	with_ldiskfs='no'
 	LDISKFS_SUBDIR=
@@ -264,55 +262,6 @@ AC_MSG_RESULT([$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
 #