#
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
# directories for binaries
AC_PREFIX_DEFAULT([/usr])
-sysconfdir='$(CROSS_PATH)/etc'
+sysconfdir='/etc'
AC_SUBST(sysconfdir)
# Directories for documentation and demos.
-docdir='$(datadir)/doc/$(PACKAGE)'
+docdir='${datadir}/doc/$(PACKAGE)'
AC_SUBST(docdir)
LIBCFS_PATH_DEFAULTS
LIBCFS_CONDITIONALS
LN_CONDITIONALS
LC_CONDITIONALS
-]) # LB_CONTITIONALS
+]) # LB_CONDITIONALS
#
# LB_CONFIG_FILES
lustre-iokit/ior-survey/Makefile
lustre-iokit/stats-collect/Makefile
)
+ AC_CONFIG_FILES([lustre/scripts/dkms.mkconf],
+ [chmod +x lustre/scripts/dkms.mkconf])
])
#
#
AC_DEFUN([LB_CONFIG_RPMBUILD_OPTIONS], [
RPMBINARGS=
-RPMSRCARGS=
CONFIGURE_ARGS=
eval set -- $ac_configure_args
for arg; do
--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 ) ;;
if test -n "$KMP_MODDIR" ; then
RPMBINARGS="$RPMBINARGS --define \"kmoddir $KMP_MODDIR\""
fi
-if test -n "$CROSS_PATH" ; then
- if test x$enable_server = xyes ; then
- echo -e "\n"
- "*** Don't support cross compilation for the Intel(R) Xeon Phi(TM) card.\n"
- exit 1
- fi
- CROSS_SUFFIX="-mic"
- RPMBINARGS="$RPMBINARGS --define \"post_script build/gen_filelist.sh\""
- RPMBINARGS="$RPMBINARGS --define \"cross_path $CROSS_PATH\""
- RPMBINARGS="$RPMBINARGS --define \"rootdir %{cross_path}\""
- RPMBINARGS="$RPMBINARGS --define \"_prefix %{cross_path}/usr\""
- RPMBINARGS="$RPMBINARGS --define \"_mandir %{_prefix}/share/man\""
- RPMBINARGS="$RPMBINARGS --define \"_sysconfdir %{cross_path}/etc\""
- RPMBINARGS="$RPMBINARGS --define \"make_args $CROSS_VARS\""
- if test x$CC_TARGET_ARCH = x"x86_64-k1om-linux" ; then
- RPMBINARGS="$RPMBINARGS --define \"cross_requires intel-mic-gpl\""
- fi
-fi
if test x$enable_modules != xyes ; then
RPMBINARGS="$RPMBINARGS --without lustre_modules"
fi
fi
if test x$enable_server != xyes ; then
RPMBINARGS="$RPMBINARGS --without servers"
- if test -n "$CROSS_SUFFIX" ; then
- RPMBINARGS="$RPMBINARGS --define \"lustre_name lustre-client$CROSS_SUFFIX\""
- fi
fi
if test x$enable_ldiskfs != xyes ; then
RPMBINARGS="$RPMBINARGS --without ldiskfs"
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_SOURCE_ARGS=$RPMSRCARGS
AC_SUBST(RPMBUILD_BINARY_ARGS)
-AC_SUBST(RPMBUILD_SOURCE_ARGS)
]) # LB_CONFIG_RPMBUILD_OPTIONS
#
AS_IF([test "x$enable_utils" = xno], [enable_tests="no"])
m4_ifdef([LC_NODEMAP_PROC_DEBUG], [LC_NODEMAP_PROC_DEBUG])
-LN_CONFIG_CDEBUG
+LIBCFS_CONFIG_CDEBUG
LC_QUOTA
LB_PATH_SNMP