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-7356 build: handle library configure options for SNMP/LNet
[fs/lustre-release.git]
/
config
/
lustre-build.m4
diff --git
a/config/lustre-build.m4
b/config/lustre-build.m4
index
c3bf669
..
21976fc
100644
(file)
--- a/
config/lustre-build.m4
+++ b/
config/lustre-build.m4
@@
-336,8
+336,8
@@
fi
#
AC_DEFUN([LB_CONFIG_HEADERS], [
AC_CONFIG_HEADERS([config.h])
#
AC_DEFUN([LB_CONFIG_HEADERS], [
AC_CONFIG_HEADERS([config.h])
-CPPFLAGS="-include $PWD/config.h $CPPFLAGS"
-EXTRA_KCFLAGS="-include $PWD/config.h $EXTRA_KCFLAGS"
+CPPFLAGS="-include $PWD/
undef.h -include $PWD/
config.h $CPPFLAGS"
+EXTRA_KCFLAGS="-include $PWD/
undef.h -include $PWD/
config.h $EXTRA_KCFLAGS"
AC_SUBST(EXTRA_KCFLAGS)
]) # LB_CONFIG_HEADERS
AC_SUBST(EXTRA_KCFLAGS)
]) # LB_CONFIG_HEADERS
@@
-434,7
+434,7
@@
AS_IF([test x$target_cpu = "xx86_64" -a x$target_vendor != "xk1om"],
LIBCFS_CONDITIONALS
LN_CONDITIONALS
LC_CONDITIONALS
LIBCFS_CONDITIONALS
LN_CONDITIONALS
LC_CONDITIONALS
-]) # LB_CON
T
ITIONALS
+]) # LB_CON
D
ITIONALS
#
# LB_CONFIG_FILES
#
# LB_CONFIG_FILES
@@
-449,6
+449,7
@@
AC_DEFUN([LB_CONFIG_FILES], [
[Rules:build/Rules.in]
AC_PACKAGE_TARNAME[.spec]
AC_PACKAGE_TARNAME[-dkms.spec]
[Rules:build/Rules.in]
AC_PACKAGE_TARNAME[.spec]
AC_PACKAGE_TARNAME[-dkms.spec]
+ lustre/scripts/dkms.mkconf
contrib/Makefile
contrib/lbuild/Makefile
contrib/scripts/Makefile
contrib/Makefile
contrib/lbuild/Makefile
contrib/scripts/Makefile
@@
-460,7
+461,8
@@
AC_DEFUN([LB_CONFIG_FILES], [
lustre-iokit/sgpdd-survey/Makefile
lustre-iokit/mds-survey/Makefile
lustre-iokit/ior-survey/Makefile
lustre-iokit/sgpdd-survey/Makefile
lustre-iokit/mds-survey/Makefile
lustre-iokit/ior-survey/Makefile
- lustre-iokit/stats-collect/Makefile
+ lustre-iokit/stats-collect/Makefile,
+ [chmod +x lustre/scripts/dkms.mkconf]
)
])
)
])
@@
-521,7
+523,6
@@
AS_IF([test x$enable_server = xyes],
#
AC_DEFUN([LB_CONFIG_RPMBUILD_OPTIONS], [
RPMBINARGS=
#
AC_DEFUN([LB_CONFIG_RPMBUILD_OPTIONS], [
RPMBINARGS=
-RPMSRCARGS=
CONFIGURE_ARGS=
eval set -- $ac_configure_args
for arg; do
CONFIGURE_ARGS=
eval set -- $ac_configure_args
for arg; do
@@
-533,6
+534,8
@@
for arg; do
--with-release=* ) ;;
--with-kmp-moddir=* ) ;;
--with-linux=* | --with-linux-obj=* ) ;;
--with-release=* ) ;;
--with-kmp-moddir=* ) ;;
--with-linux=* | --with-linux-obj=* ) ;;
+ --enable-shared | --disable-shared ) ;;
+ --enable-static | --disable-static ) ;;
--enable-ldiskfs | --disable-ldiskfs ) ;;
--enable-modules | --disable-modules ) ;;
--enable-server | --disable-server ) ;;
--enable-ldiskfs | --disable-ldiskfs ) ;;
--enable-modules | --disable-modules ) ;;
--enable-server | --disable-server ) ;;
@@
-604,12
+607,16
@@
fi
if test x$enable_manpages != xyes ; then
RPMBINARGS="$RPMBINARGS --without manpages"
fi
if test x$enable_manpages != xyes ; then
RPMBINARGS="$RPMBINARGS --without manpages"
fi
+if test x$enable_shared != xyes ; then
+ RPMBINARGS="$RPMBINARGS --without shared"
+fi
+if test x$enable_static != xyes ; then
+ RPMBINARGS="$RPMBINARGS --without static"
+fi
RPMBUILD_BINARY_ARGS=$RPMBINARGS
RPMBUILD_BINARY_ARGS=$RPMBINARGS
-RPMBUILD_SOURCE_ARGS=$RPMSRCARGS
AC_SUBST(RPMBUILD_BINARY_ARGS)
AC_SUBST(RPMBUILD_BINARY_ARGS)
-AC_SUBST(RPMBUILD_SOURCE_ARGS)
]) # LB_CONFIG_RPMBUILD_OPTIONS
#
]) # LB_CONFIG_RPMBUILD_OPTIONS
#
@@
-650,7
+657,7
@@
LB_CONFIG_SERVERS
AS_IF([test "x$enable_utils" = xno], [enable_tests="no"])
m4_ifdef([LC_NODEMAP_PROC_DEBUG], [LC_NODEMAP_PROC_DEBUG])
AS_IF([test "x$enable_utils" = xno], [enable_tests="no"])
m4_ifdef([LC_NODEMAP_PROC_DEBUG], [LC_NODEMAP_PROC_DEBUG])
-L
N
_CONFIG_CDEBUG
+L
IBCFS
_CONFIG_CDEBUG
LC_QUOTA
LB_PATH_SNMP
LC_QUOTA
LB_PATH_SNMP