b=22480 Remove duplicated LB_DEFINE_E2FSPROGS_NAMES definition

Revert "Add configure option to allow repackaging of e2fsprogs as ldiskfsprogs. (by Jim Garlick)"

This reverts commit 749b473d6e38b94e9b4d88214ce8684f3c570f4e.

diff --git a/build/autoconf/lustre-build.m4 b/build/autoconf/lustre-build.m4
index dc50970..cf0e840 100644 (file)
--- a/build/autoconf/lustre-build.m4
+++ b/build/autoconf/lustre-build.m4
@@ -362,46 +362,6 @@ fi
 ])
 
 #
-# 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_CONFIG_CRAY_XT3
 #
 # Enable Cray XT3 features
@@ -885,8 +845,6 @@ LB_PATH_LUSTREIOKIT
 
 LB_DEFINE_E2FSPROGS_NAMES
 
-LB_DEFINE_E2FSPROGS_NAMES
-
 LC_CONFIG_LIBLUSTRE
 LIBCFS_CONFIGURE
 LN_CONFIGURE