X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=build%2Fautoconf%2Flustre-build.m4;h=a88f0f1432e1ef23904d1e09154f4b30bd1124f3;hp=90753fd30013c7fbd2b32b69d7b2f03240d0323e;hb=94c07aa7fbec47d5d07bdad49c330a33af0134b4;hpb=06caf13985b70e6ada7858e66aad31d267bb1072 diff --git a/build/autoconf/lustre-build.m4 b/build/autoconf/lustre-build.m4 index 90753fd..a88f0f1 100644 --- a/build/autoconf/lustre-build.m4 +++ b/build/autoconf/lustre-build.m4 @@ -159,38 +159,56 @@ AC_CONFIG_SUBDIRS(libsysio) ]) # -# LB_PATH_CRAY_PORTALS -# -# Support for external Cray portals -# -AC_DEFUN([LB_PATH_CRAY_PORTALS], -[LB_ARG_LIBS_INCLUDES([Cray Portals],[cray-portals]) - -if test x$cray_portals_includes != x ; then - if test ! -r $cray_portals_includes/portals/api.h ; then - AC_MSG_ERROR([Cray portals headers were not found in $cray_portals_includes. Please check the paths passed to --with-cray-portals or --with-cray-portals-includes.]) - fi -fi -if test x$cray_portals_libs != x ; then - if test ! -r $cray_portals_libs/libportals.a ; then - AC_MSG_ERROR([Cray portals libraries were not found in $cray_portals_libs. Please check the paths passed to --with-cray-portals or --with-cray-portals-libs.]) - fi +# LB_CONFIG_CRAY_XT3 +# +# Enable Cray XT3 features +# +AC_DEFUN([LB_CONFIG_CRAY_XT3], +[AC_MSG_CHECKING([whether to build Cray XT3 features]) +AC_ARG_ENABLE([cray_xt3], + AC_HELP_STRING([--enable-cray-xt3], + [enable building of Cray XT3 features]), + [enable_cray_xt3='yes'],[enable_cray_xt3='no']) +AC_MSG_RESULT([$enable_cray_xt3]) +if test x$enable_cray_xt3 != xno; then + AC_DEFINE(CRAY_XT3, 1, Enable Cray XT3 Features) fi +]) -if test x$cray_portals_includes != x -a x$cray_portals_libs != x ; then - cray_portals=yes - AC_DEFINE(CRAY_PORTALS, 1, [Building with Cray Portals]) - CPPFLAGS="-I$cray_portals_includes $CPPFLAGS" - EXTRA_KCFLAGS="-I$cray_portals_includes $EXTRA_KCFLAGS" - # for liblustre + b_cray - CRAY_PORTALS_LIBS="$cray_portals_libs" - AC_SUBST(CRAY_PORTALS_LIBS) -else - cray_portals=no +# +# LB_CONFIG_BGL +# +# Enable BGL features +# +AC_DEFUN([LB_CONFIG_BGL], +[AC_MSG_CHECKING([whether to build BGL features]) +AC_ARG_ENABLE([bgl], + AC_HELP_STRING([--enable-bgl], + [enable building of BGL features]), + [enable_bgl='yes'],[enable_bgl='no']) +AC_MSG_RESULT([$enable_bgl]) +if test x$enable_bgl != xno; then + AC_DEFINE(BGL_SUPPORT, 1, Enable BGL Features) + enable_doc='no' + enable_tests='no' + enable_server='no' + enable_liblustre='no' + enable_libreadline='no' fi ]) # +# LB_PATH_SNMP +# +# check for in-tree snmp support +# +AC_DEFUN([LB_PATH_SNMP], +[LB_CHECK_FILE([$srcdir/snmp/lustre-snmp.c],[SNMP_DIST_SUBDIR="snmp"]) +AC_SUBST(SNMP_DIST_SUBDIR) +AC_SUBST(SNMP_SUBDIR) +]) + +# # LB_CONFIG_MODULES # # Build kernel modules? @@ -252,10 +270,10 @@ AC_DEFUN([LB_CONFIG_TESTS], AC_ARG_ENABLE([tests], AC_HELP_STRING([--disable-tests], [disable building of Lustre tests]), - [],[enable_tests='yes']) -if test x$cray_portals = xyes ; then - enable_tests='no' -fi + [], + [ + enable_tests='yes' + ]) AC_MSG_RESULT([$enable_tests]) ]) @@ -341,8 +359,9 @@ AC_SUBST(sysconfdir) docdir='${datadir}/doc/$(PACKAGE)' AC_SUBST(docdir) -LP_PATH_DEFAULTS +LN_PATH_DEFAULTS LC_PATH_DEFAULTS + ]) # @@ -390,6 +409,10 @@ if test $ac_cv_sizeof_unsigned_long_long != 8 ; then AC_MSG_ERROR([** we assume that sizeof(long long) == 8. Tell phil@clusterfs.com]) fi +# FIXME +AC_CHECK_DECL([__i386__], [], [ + +if test x$enable_bgl != xyes; then AC_MSG_CHECKING([if $CC accepts -m64]) CC_save="$CC" CC="$CC -m64" @@ -399,8 +422,11 @@ AC_TRY_COMPILE([],[],[ AC_MSG_RESULT([no]) CC="$CC_save" ]) +fi -CPPFLAGS="-I\$(top_builddir)/portals/include -I\$(top_srcdir)/portals/include -I\$(top_builddir)/lustre/include -I\$(top_srcdir)/lustre/include $CPPFLAGS" +]) + +CPPFLAGS="-I\$(top_builddir)/lnet/include -I\$(top_srcdir)/lnet/include -I\$(top_builddir)/lustre/include -I\$(top_srcdir)/lustre/include $CPPFLAGS" LLCPPFLAGS="-D__arch_lib__ -D_LARGEFILE64_SOURCE=1" AC_SUBST(LLCPPFLAGS) @@ -408,8 +434,8 @@ AC_SUBST(LLCPPFLAGS) LLCFLAGS="-g -Wall -fPIC" AC_SUBST(LLCFLAGS) -# everyone builds against portals and lustre -EXTRA_KCFLAGS="$EXTRA_KCFLAGS -g -I$PWD/portals/include -I$PWD/lustre/include" +# everyone builds against lnet and lustre +EXTRA_KCFLAGS="$EXTRA_KCFLAGS -g -I$PWD/lnet/include -I$PWD/lustre/include" AC_SUBST(EXTRA_KCFLAGS) ]) @@ -423,7 +449,6 @@ AC_DEFUN([LB_CONDITIONALS], AM_CONDITIONAL(UTILS, test x$enable_utils = xyes) AM_CONDITIONAL(TESTS, test x$enable_tests = xyes) AM_CONDITIONAL(DOC, test x$ENABLE_DOC = x1) -AM_CONDITIONAL(CRAY_PORTALS, test x$cray_portals != xno) AM_CONDITIONAL(INIT_SCRIPTS, test x$ENABLE_INIT_SCRIPTS = "x1") AM_CONDITIONAL(LINUX, test x$lb_target_os = "xlinux") AM_CONDITIONAL(DARWIN, test x$lb_target_os = "xdarwin") @@ -442,7 +467,7 @@ AC_SUBST(SYSIO) LB_LINUX_CONDITIONALS LB_DARWIN_CONDITIONALS -LP_CONDITIONALS +LN_CONDITIONALS LC_CONDITIONALS ]) @@ -456,25 +481,33 @@ AC_DEFUN([LB_CONFIGURE], LB_INCLUDE_RULES +LB_CONFIG_CRAY_XT3 +LB_CONFIG_BGL LB_PATH_DEFAULTS LB_PROG_CC LB_PATH_LIBSYSIO -LB_PATH_CRAY_PORTALS +LB_PATH_SNMP LB_CONFIG_DOCS LB_CONFIG_UTILS LB_CONFIG_TESTS LC_CONFIG_CLIENT_SERVER +LC_CONFIG_GSS LB_CONFIG_MODULES LC_CONFIG_LIBLUSTRE -LP_CONFIGURE +LN_CONFIGURE + LC_CONFIGURE +if test "$SNMP_DIST_SUBDIR" ; then + LS_CONFIGURE +fi + LB_CONDITIONALS LB_CONFIG_HEADERS @@ -487,11 +520,17 @@ build/Rules build/lustre.spec ]) -LP_CONFIG_FILES +LN_CONFIG_FILES LC_CONFIG_FILES +if test "$SNMP_DIST_SUBDIR" ; then + LS_CONFIG_FILES +fi AC_SUBST(ac_configure_args) +MOSTLYCLEANFILES='.*.cmd .*.flags *.o *.ko *.mod.c .depend .*.1.*' +AC_SUBST(MOSTLYCLEANFILES) + AC_OUTPUT cat <<_ACEOF