X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=build%2Fautoconf%2Flustre-build.m4;h=51780bc2f2b21bdb4622506e3a44afe0e7e39e25;hp=94d0404ba9932f6c12923d99ce402c7a5a66c61a;hb=b67a8ce988d626f2aa3de5690e266503285c4cfc;hpb=595dd75f99a0e6e42d3f16f8d112655f5feb95bb diff --git a/build/autoconf/lustre-build.m4 b/build/autoconf/lustre-build.m4 index 94d0404..51780bc 100644 --- a/build/autoconf/lustre-build.m4 +++ b/build/autoconf/lustre-build.m4 @@ -22,7 +22,9 @@ AC_DEFUN([LB_CANONICAL_SYSTEM], darwin*) lb_target_os="darwin" ;; -esac + solaris*) + lb_target_os="SunOS" + ;;esac AC_SUBST(lb_target_os) ]) @@ -153,41 +155,225 @@ case x$with_sysio in ;; esac -# We have to configure even if we don't build here for make dist to -# work +# We have to configure even if we don't build here for make dist to work AC_CONFIG_SUBDIRS(libsysio) ]) # -# LB_PATH_CRAY_PORTALS +# LB_PATH_LUSTREIOKIT # -# Support for external Cray portals +# Handle internal/external lustre-iokit # -AC_DEFUN([LB_PATH_CRAY_PORTALS], -[LB_ARG_LIBS_INCLUDES([Cray Portals],[cray-portals]) +AC_DEFUN([LB_PATH_LUSTREIOKIT], +[AC_ARG_WITH([], + AC_HELP_STRING([--with-lustre-iokit=path], + [set path to lustre-iokit source (default is included lustre-iokit)]), + [],[ + with_lustre_iokit='yes' + ]) +AC_MSG_CHECKING([location of lustre-iokit]) +enable_lustre_iokit="$with_lustre_iokit" +case x$with_lustre_iokit in + xyes) + AC_MSG_RESULT([internal]) + LB_CHECK_FILE([$srcdir/lustre-iokit/ior-survey/ior-survey],[],[ + AC_MSG_ERROR([A complete internal lustre-iokit was not found.]) + ]) + LUSTREIOKIT_SUBDIR="lustre-iokit" + LUSTREIOKIT="$PWD/lustre-iokit" + ;; + xno) + AC_MSG_RESULT([disabled]) + ;; + *) + AC_MSG_RESULT([$with_lustre_iokit]) + LB_CHECK_FILE([$with_lustre_iokit/ior-survey/ior_survey],[],[ + AC_MSG_ERROR([A complete (built) external lustre-iokit was not found.]) + ]) + LUSTREIOKIT="$with_lustre_iokit" + with_lustre_iokit="yes" + ;; +esac +AC_SUBST(LUSTREIOKIT_SUBDIR) +# We have to configure even if we don't build here for make dist to work +AC_CONFIG_SUBDIRS(lustre-iokit) +]) -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 +# +# LB_PATH_LDISKFS +# +# Handle internal/external ldiskfs +# +AC_DEFUN([LB_PATH_LDISKFS], +[AC_ARG_WITH([ldiskfs], + AC_HELP_STRING([--with-ldiskfs=path], + [set path to ldiskfs source (default is included ldiskfs)]), + [],[ + if test x$linux25$enable_server = xyesyes ; then + with_ldiskfs=yes + else + with_ldiskfs=no + fi + ]) +AC_MSG_CHECKING([location of ldiskfs]) +case x$with_ldiskfs in + xyes) + AC_MSG_RESULT([internal]) + LB_CHECK_FILE([$srcdir/ldiskfs/lustre-ldiskfs.spec.in],[],[ + AC_MSG_ERROR([A complete internal ldiskfs was not found.]) + ]) + LDISKFS_SUBDIR="ldiskfs" + LDISKFS_DIR="$PWD/ldiskfs" + ;; + xno) + AC_MSG_RESULT([disabled]) + ;; + *) + AC_MSG_RESULT([$with_ldiskfs]) + LB_CHECK_FILE([$with_ldiskfs/ldiskfs/linux/ldiskfs_fs.h],[],[ + AC_MSG_ERROR([A complete (built) external ldiskfs was not found.]) + ]) + LDISKFS_DIR=$with_ldiskfs + ;; +esac +AC_SUBST(LDISKFS_DIR) +AC_SUBST(LDISKFS_SUBDIR) +AM_CONDITIONAL(LDISKFS_ENABLED, test x$with_ldiskfs != xno) + +# We have to configure even if we don't build here for make dist to work +AC_CONFIG_SUBDIRS(ldiskfs) +]) + +# Define no libcfs by default. +AC_DEFUN([LB_LIBCFS_DIR], +[ +case x$libcfs_is_module in + xyes) + LIBCFS_INCLUDE_DIR="libcfs/include" + LIBCFS_SUBDIR="libcfs" + ;; + x*) + LIBCFS_INCLUDE_DIR="lnet/include" + LIBCFS_SUBDIR="" + ;; +esac +AC_SUBST(LIBCFS_SUBDIR) +AC_SUBST(LIBCFS_INCLUDE_DIR) +]) + +# +# LB_DEFINE_LDISKFS_OPTIONS +# +# Enable config options related to ldiskfs. These are used both by ldiskfs +# and lvfs (which includes ldiskfs headers.) +# +AC_DEFUN([LB_DEFINE_LDISKFS_OPTIONS], +[ + AC_DEFINE(CONFIG_LDISKFS_FS_MODULE, 1, [build ldiskfs as a module]) + AC_DEFINE(CONFIG_LDISKFS_FS_XATTR, 1, [enable extended attributes for ldiskfs]) + AC_DEFINE(CONFIG_LDISKFS_FS_POSIX_ACL, 1, [enable posix acls for ldiskfs]) + AC_DEFINE(CONFIG_LDISKFS_FS_SECURITY, 1, [enable fs security for ldiskfs]) +]) + +# +# 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_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_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 +]) + +# +# Support for --enable-uoss +# +AC_DEFUN([LB_UOSS], +[AC_MSG_CHECKING([whether to enable uoss]) +AC_ARG_ENABLE([uoss], + AC_HELP_STRING([--enable-uoss], + [enable userspace OSS]), + [enable_uoss='yes'],[enable_uoss='no']) +AC_MSG_RESULT([$enable_uoss]) +if test x$enable_uoss = xyes; then + AC_DEFINE(UOSS_SUPPORT, 1, Enable user-level OSS) + AC_DEFINE(LUSTRE_ULEVEL_MT, 1, Multi-threaded user-level lustre port) + enable_uoss='yes' + enable_ulevel_mt='yes' + enable_modules='no' + enable_client='no' + enable_tests='no' + enable_liblustre='no' + with_ldiskfs='no' +fi +AC_SUBST(enable_uoss) +]) + +# +# Support for --enable-posix-osd +# +AC_DEFUN([LB_POSIX_OSD], +[AC_MSG_CHECKING([whether to enable posix osd]) +AC_ARG_ENABLE([posix-osd], + AC_HELP_STRING([--enable-posix-osd], + [enable using of posix osd]), + [enable_posix_osd='yes'],[enable_posix_osd='no']) +AC_MSG_RESULT([$enable_posix_osd]) +if test x$enable_uoss = xyes -a x$enable_posix_osd = xyes ; then + AC_DEFINE(POSIX_OSD, 1, Enable POSIX OSD) + posix_osd='yes' fi +AM_CONDITIONAL(POSIX_OSD_ENABLED, test x$posix_osd = xyes) +]) -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) +# +# LB_PATH_DMU +# +AC_DEFUN([LB_PATH_DMU], +[AC_MSG_CHECKING([whether to enable DMU]) +if test x$enable_uoss = xyes -a x$enable_posix_osd != xyes; then + DMU_SRC="$PWD/lustre/zfs-lustre" + AC_DEFINE(DMU_OSD, 1, Enable DMU OSD) + AC_MSG_RESULT([yes]) + LB_CHECK_FILE([$DMU_SRC/src/.patched],[],[ + AC_MSG_ERROR([A complete (patched) DMU tree was not found.]) + ]) + AC_CONFIG_SUBDIRS(lustre/zfs-lustre) + dmu_osd='yes' else - cray_portals=no + AC_MSG_RESULT([no]) fi +AC_SUBST(DMU_SRC) +AM_CONDITIONAL(DMU_OSD_ENABLED, test x$dmu_osd = xyes) ]) # @@ -224,9 +410,13 @@ if test x$enable_modules = xyes ; then case $target_os in linux*) LB_PROG_LINUX + LIBCFS_PROG_LINUX + LN_PROG_LINUX + LC_PROG_LINUX ;; darwin*) LB_PROG_DARWIN + LIBCFS_PROG_DARWIN ;; *) # This is strange - Lustre supports a target we don't @@ -265,11 +455,7 @@ AC_ARG_ENABLE([tests], [disable building of Lustre tests]), [], [ - if test x$cray_portals = xyes ; then - enable_tests='no' - else - enable_tests='yes' - fi + enable_tests='yes' ]) AC_MSG_RESULT([$enable_tests]) ]) @@ -336,7 +522,7 @@ AC_SUBST(EXTRA_KCFLAGS) # defines for including the toplevel Rules # AC_DEFUN([LB_INCLUDE_RULES], -[INCLUDE_RULES="include $PWD/build/Rules" +[INCLUDE_RULES="include $PWD/Rules" AC_SUBST(INCLUDE_RULES) ]) @@ -356,8 +542,10 @@ AC_SUBST(sysconfdir) docdir='${datadir}/doc/$(PACKAGE)' AC_SUBST(docdir) -LP_PATH_DEFAULTS +LIBCFS_PATH_DEFAULTS +LN_PATH_DEFAULTS LC_PATH_DEFAULTS + ]) # @@ -405,26 +593,23 @@ 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 -AC_MSG_CHECKING([if $CC accepts -m64]) -CC_save="$CC" -CC="$CC -m64" -AC_TRY_COMPILE([],[],[ - AC_MSG_RESULT([yes]) -],[ - AC_MSG_RESULT([no]) - CC="$CC_save" -]) +if test $target_cpu == "powerpc64"; then + AC_MSG_WARN([set compiler with -m64]) + CFLAGS="$CFLAGS -m64" + CC="$CC -m64" +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)/$LIBCFS_INCLUDE_DIR -I\$(top_srcdir)/$LIBCFS_INCLUDE_DIR-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) -LLCFLAGS="-g -Wall -fPIC" +# Add _GNU_SOURCE for strnlen on linux +LLCFLAGS="-g -Wall -fPIC -D_GNU_SOURCE" 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/$LIBCFS_INCLUDE_DIR -I$PWD/lnet/include -I$PWD/lustre/include" AC_SUBST(EXTRA_KCFLAGS) ]) @@ -438,10 +623,11 @@ 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") +AM_CONDITIONAL(CRAY_XT3, test x$enable_cray_xt3 = "xyes") +AM_CONDITIONAL(SUNOS, test x$lb_target_os = "xSunOS") # this lets lustre cancel libsysio, per-branch or if liblustre is # disabled @@ -457,11 +643,28 @@ AC_SUBST(SYSIO) LB_LINUX_CONDITIONALS LB_DARWIN_CONDITIONALS -LP_CONDITIONALS +LIBCFS_CONDITIONALS +LN_CONDITIONALS LC_CONDITIONALS ]) # +# LB_CONFIG_FILES +# +# build-specific config files +# +AC_DEFUN([LB_CONFIG_FILES], +[ +AC_CONFIG_FILES( +[Makefile +autoMakefile +] +[Rules:build/Rules.in] +AC_PACKAGE_TARNAME[.spec] +) +]) + +# # LB_CONFIGURE # # main configure steps @@ -469,47 +672,54 @@ LC_CONDITIONALS AC_DEFUN([LB_CONFIGURE], [LB_CANONICAL_SYSTEM +LB_LIBCFS_DIR + 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_UOSS +LB_POSIX_OSD +LB_PATH_DMU LB_CONFIG_DOCS LB_CONFIG_UTILS LB_CONFIG_TESTS LC_CONFIG_CLIENT_SERVER +# three macros for cmd3 +LC_CONFIG_SPLIT +LC_CONFIG_LDISKFS +LN_CONFIG_CDEBUG + LB_CONFIG_MODULES -LC_CONFIG_LIBLUSTRE +LB_PATH_LIBSYSIO +LB_PATH_SNMP +LB_PATH_LDISKFS +LB_PATH_LUSTREIOKIT -# Commented out to avoid a configure error. -gord -#LC#_CONFIG_QUOTA +LC_CONFIG_LIBLUSTRE +LIBCFS_CONFIGURE +LN_CONFIGURE -LP_CONFIGURE LC_CONFIGURE + if test "$SNMP_DIST_SUBDIR" ; then LS_CONFIGURE fi + LB_CONDITIONALS LB_CONFIG_HEADERS -AC_CONFIG_FILES( -[Makefile:build/Makefile.in.toplevel] -[autoMakefile -build/autoMakefile -build/autoconf/Makefile -build/Rules -build/lustre.spec -]) - -LP_CONFIG_FILES +LIBCFS_CONFIG_FILES +LB_CONFIG_FILES +LN_CONFIG_FILES LC_CONFIG_FILES if test "$SNMP_DIST_SUBDIR" ; then LS_CONFIG_FILES @@ -517,7 +727,7 @@ fi AC_SUBST(ac_configure_args) -MOSTLYCLEANFILES='.*.cmd .*.flags *.o *.ko *.mod.c .depend .*.1.*' +MOSTLYCLEANFILES='.*.cmd .*.flags *.o *.ko *.mod.c .depend .*.1.* Modules.symvers Module.symvers' AC_SUBST(MOSTLYCLEANFILES) AC_OUTPUT