Whamcloud - gitweb
LU-709 build: remove old userspace-OSS configure
[fs/lustre-release.git] / build / autoconf / lustre-build.m4
index 1f355f3..754099e 100644 (file)
@@ -120,9 +120,9 @@ AC_DEFUN([LB_CHECK_FILE],
 [AS_VAR_PUSHDEF([lb_File], [lb_cv_file_$1])dnl
 AC_CACHE_CHECK([for $1], lb_File,
 [if test -r "$1"; then
-  AS_VAR_SET(lb_File, yes)
+       AS_VAR_SET(lb_File, yes)
 else
-  AS_VAR_SET(lb_File, no)
+       AS_VAR_SET(lb_File, no)
 fi])
 AS_IF([test AS_VAR_GET(lb_File) = yes], [$2], [$3])[]dnl
 AS_VAR_POPDEF([lb_File])dnl
@@ -286,23 +286,6 @@ AC_SUBST(LIBCFS_INCLUDE_DIR)
 ])
 
 #
-# 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
-])
-
-#
 # LB_CONFIG_BGL
 #
 # Enable BGL features
@@ -325,120 +308,6 @@ 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)
-])
-
-#
-# LB_PATH_DMU
-#
-AC_DEFUN([LB_PATH_DMU],
-[AC_ARG_ENABLE([dmu],
-       AC_HELP_STRING([--enable-dmu],
-                      [enable the DMU backend]),
-       [],[with_dmu='default'])
-AC_MSG_CHECKING([whether to enable DMU])
-case x$with_dmu in
-       xyes)
-               dmu_osd='yes'
-               ;;
-       xno)
-               dmu_osd='no'
-               ;;
-       xdefault)
-               if test x$enable_uoss = xyes -a x$posix_osd != xyes; then
-                       # Enable the DMU if we're configuring a userspace server
-                       dmu_osd='yes'
-               else
-                       # Enable the DMU by default on the b_hd_kdmu branch
-                       if test -d $PWD/zfs -a x$linux25$enable_server = xyesyes; then
-                               dmu_osd='yes'
-                       else
-                               dmu_osd='no'
-                       fi
-               fi
-               ;;
-       *)
-               dmu_osd='yes'
-               ;;
-esac
-AC_MSG_RESULT([$dmu_osd])
-if test x$dmu_osd = xyes; then
-       AC_DEFINE(DMU_OSD, 1, Enable DMU OSD)
-       if test x$enable_uoss = xyes; then
-               # Userspace DMU
-               DMU_SRC="$PWD/lustre/zfs-lustre"
-               AC_SUBST(DMU_SRC)
-               LB_CHECK_FILE([$DMU_SRC/src/.patched],[],[
-                       AC_MSG_ERROR([A complete (patched) DMU tree was not found.])
-               ])
-               AC_CONFIG_SUBDIRS(lustre/zfs-lustre)
-       else
-               # Kernel DMU
-               SPL_SUBDIR="spl"
-               ZFS_SUBDIR="zfs"
-
-               SPL_DIR="$PWD/$SPL_SUBDIR"
-               ZFS_DIR="$PWD/$ZFS_SUBDIR"
-
-               LB_CHECK_FILE([$SPL_DIR/module/spl/spl-generic.c],[],[
-                       AC_MSG_ERROR([A complete SPL tree was not found in $SPL_DIR.])
-               ])
-
-               LB_CHECK_FILE([$ZFS_DIR/module/zfs/dmu.c],[],[
-                       AC_MSG_ERROR([A complete kernel DMU tree was not found in $ZFS_DIR.])
-               ])
-
-               AC_CONFIG_SUBDIRS(spl)
-               ac_configure_args="$ac_configure_args --with-spl=$SPL_DIR"
-               AC_CONFIG_SUBDIRS(zfs)
-       fi
-fi
-AC_SUBST(SPL_SUBDIR)
-AC_SUBST(ZFS_SUBDIR)
-AC_SUBST(SPL_DIR)
-AC_SUBST(ZFS_DIR)
-AM_CONDITIONAL(DMU_OSD_ENABLED, test x$dmu_osd = xyes)
-AM_CONDITIONAL(KDMU, test x$dmu_osd$enable_uoss = xyesno)
-])
-
-#
 # LB_PATH_SNMP
 #
 # check for in-tree snmp support
@@ -595,11 +464,11 @@ AC_SUBST(ENABLE_INIT_SCRIPTS)
 #
 # add -include 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"
-AC_SUBST(EXTRA_KCFLAGS)
+AC_DEFUN([LB_CONFIG_HEADERS],[
+       AC_CONFIG_HEADERS([config.h])
+       CPPFLAGS="-include $PWD/config.h $CPPFLAGS"
+       EXTRA_KCFLAGS="-include $PWD/config.h $EXTRA_KCFLAGS"
+       AC_SUBST(EXTRA_KCFLAGS)
 ])
 
 #
@@ -607,9 +476,9 @@ AC_SUBST(EXTRA_KCFLAGS)
 #
 # defines for including the toplevel Rules
 #
-AC_DEFUN([LB_INCLUDE_RULES],
-[INCLUDE_RULES="include $PWD/Rules"
-AC_SUBST(INCLUDE_RULES)
+AC_DEFUN([LB_INCLUDE_RULES],[
+       INCLUDE_RULES="include $PWD/Rules"
+       AC_SUBST(INCLUDE_RULES)
 ])
 
 #
@@ -641,42 +510,13 @@ LC_PATH_DEFAULTS
 #
 AC_DEFUN([LB_PROG_CC],
 [AC_PROG_RANLIB
-AC_MSG_CHECKING([for buggy compiler])
-CC_VERSION=`$CC -v 2>&1 | grep "^gcc version"`
-bad_cc() {
-       AC_MSG_RESULT([buggy compiler found!])
-       echo
-       echo "   '$CC_VERSION'"
-       echo "  has been known to generate bad code, "
-       echo "  please get an updated compiler."
-       AC_MSG_ERROR([sorry])
-}
-case "$CC_VERSION" in
-       "gcc version 2.95"*)
-               bad_cc
-               ;;
-       # ost_pack_niobuf putting 64bit NTOH temporaries on the stack
-       # without "sub    $0xc,%esp" to protect the stack from being
-       # stomped on by interrupts (bug 606)
-       "gcc version 2.96 20000731 (Red Hat Linux 7.1 2.96-98)")
-               bad_cc
-               ;;
-       # mandrake's similar sub 0xc compiler bug
-       # http://marc.theaimsgroup.com/?l=linux-kernel&m=104748366226348&w=2
-       "gcc version 2.96 20000731 (Mandrake Linux 8.1 2.96-0.62mdk)")
-               bad_cc
-               ;;
-       *)
-               AC_MSG_RESULT([no known problems])
-               ;;
-esac
 
 # ---------  unsigned long long sane? -------
 AC_CHECK_SIZEOF(unsigned long long, 0)
 echo "---> size SIZEOF $SIZEOF_unsigned_long_long"
 echo "---> size SIZEOF $ac_cv_sizeof_unsigned_long_long"
 if test $ac_cv_sizeof_unsigned_long_long != 8 ; then
-        AC_MSG_ERROR([** we assume that sizeof(long long) == 8.  Tell phil@clusterfs.com])
+       AC_MSG_ERROR([** we assume that sizeof(long long) == 8.])
 fi
 
 if test $target_cpu == "powerpc64"; then
@@ -694,6 +534,9 @@ AC_SUBST(LLCPPFLAGS)
 LLCFLAGS="-g -Wall -fPIC -D_GNU_SOURCE"
 AC_SUBST(LLCFLAGS)
 
+CCASFLAGS="-Wall -fPIC -D_GNU_SOURCE"
+AC_SUBST(CCASFLAGS)
+
 # 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)
@@ -712,9 +555,9 @@ AM_CONDITIONAL(DOC, test x$ENABLE_DOC = x1)
 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")
 AM_CONDITIONAL(USES_DPKG, test x$uses_dpkg = "xyes")
+AM_CONDITIONAL(ARCH_x86, test x$target_cpu = "xx86_64" -o x$target_cpu = "xi686")
 
 # this lets lustre cancel libsysio, per-branch or if liblustre is
 # disabled
@@ -727,7 +570,6 @@ fi
 AC_SUBST(LIBSYSIO_SUBDIR)
 AC_SUBST(SYSIO)
 
-LB_LINUX_CONDITIONALS
 LB_DARWIN_CONDITIONALS
 
 LIBCFS_CONDITIONALS
@@ -742,13 +584,12 @@ LC_CONDITIONALS
 #
 AC_DEFUN([LB_CONFIG_FILES],
 [
-AC_CONFIG_FILES(
-[Makefile
-autoMakefile
-]
-[Rules:build/Rules.in]
-AC_PACKAGE_TARNAME[.spec]
-)
+       AC_CONFIG_FILES([
+               Makefile
+               autoMakefile]
+               [Rules:build/Rules.in]
+               AC_PACKAGE_TARNAME[.spec]
+       )
 ])
 
 #
@@ -769,14 +610,12 @@ LB_LIBCFS_DIR
 
 LB_INCLUDE_RULES
 
-LB_CONFIG_CRAY_XT3
 LB_CONFIG_BGL
 LB_PATH_DEFAULTS
 
 LB_PROG_CC
 
-LB_UOSS
-LB_POSIX_OSD
+LC_OSD_ADDON
 
 LB_CONFIG_DOCS
 LB_CONFIG_UTILS
@@ -791,7 +630,6 @@ LC_QUOTA
 LB_CONFIG_MODULES
 LN_CONFIG_USERSPACE
 
-LB_PATH_DMU
 LB_PATH_LIBSYSIO
 LB_PATH_SNMP
 LB_PATH_LDISKFS