Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-7528 test: Deregister changelog client on test fail.
[fs/lustre-release.git]
/
config
/
lustre-build.m4
diff --git
a/config/lustre-build.m4
b/config/lustre-build.m4
index
3709185
..
d2db823
100644
(file)
--- a/
config/lustre-build.m4
+++ b/
config/lustre-build.m4
@@
-124,15
+124,20
@@
AC_SUBST(LIBCFS_SUBDIR)
# We need it to manipulate utab file.
#
AC_DEFUN([LB_LIBMOUNT], [
# We need it to manipulate utab file.
#
AC_DEFUN([LB_LIBMOUNT], [
-AC_MSG_CHECKING([whether build with libmount])
AC_CHECK_HEADER([libmount/libmount.h], [
AC_CHECK_LIB([mount], [mnt_update_set_fs], [
LDLIBMOUNT="-lmount"
AC_SUBST(LDLIBMOUNT)
AC_DEFINE(HAVE_LIBMOUNT, 1, [build with libmount])
AC_CHECK_HEADER([libmount/libmount.h], [
AC_CHECK_LIB([mount], [mnt_update_set_fs], [
LDLIBMOUNT="-lmount"
AC_SUBST(LDLIBMOUNT)
AC_DEFINE(HAVE_LIBMOUNT, 1, [build with libmount])
- AC_MSG_RESULT(yes)
- ],[AC_MSG_RESULT(no)])
-], [AC_MSG_RESULT(no)])
+ with_libmount="yes"
+ ],[with_libmount="no"])
+], [with_libmount="no"])
+AC_MSG_CHECKING([whether to build with libmount])
+AS_IF([test "x$with_libmount" = xyes], [
+ AC_MSG_RESULT([yes])
+], [
+ AC_MSG_RESULT([no])
+])
]) # LB_LIBMOUNT
#
]) # LB_LIBMOUNT
#
@@
-458,7
+463,6
@@
for arg; do
-C | --cache-file=* ) ;;
--prefix=* | --*-prefix=* ) ;;
--enable-dist ) ;;
-C | --cache-file=* ) ;;
--prefix=* | --*-prefix=* ) ;;
--enable-dist ) ;;
- --with-release=* ) ;;
--with-kmp-moddir=* ) ;;
--with-linux=* | --with-linux-obj=* ) ;;
--enable-shared | --disable-shared ) ;;
--with-kmp-moddir=* ) ;;
--with-linux=* | --with-linux-obj=* ) ;;
--enable-shared | --disable-shared ) ;;
@@
-483,9
+487,6
@@
if test -n "$LINUX" ; then
RPMBINARGS="$RPMBINARGS --define \"kobjdir $LINUX_OBJ\""
fi
fi
RPMBINARGS="$RPMBINARGS --define \"kobjdir $LINUX_OBJ\""
fi
fi
-if test -n "$KMP_MODDIR" ; then
- RPMBINARGS="$RPMBINARGS --define \"kmoddir $KMP_MODDIR\""
-fi
if test x$enable_modules != xyes ; then
RPMBINARGS="$RPMBINARGS --without lustre_modules"
fi
if test x$enable_modules != xyes ; then
RPMBINARGS="$RPMBINARGS --without lustre_modules"
fi