Branch b1_6

[fs/lustre-release.git] / build / autoconf / lustre-build.m4

diff --git a/build/autoconf/lustre-build.m4 b/build/autoconf/lustre-build.m4
index c48e0ec..f6ff4c4 100644 (file)
--- a/build/autoconf/lustre-build.m4
+++ b/build/autoconf/lustre-build.m4
@@ -305,7 +305,7 @@ AC_ARG_ENABLE([bgl],
        [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)
+        AC_DEFINE(HAVE_BGL_SUPPORT, 1, Enable BGL Features)
         enable_doc='no'
         enable_tests='no'
         enable_server='no'
@@ -599,11 +599,6 @@ if test $target_cpu == "powerpc64"; then
        CC="$CC -m64"
 fi
 
-/* Enable -Werror */
-if test $target_cpu == "i686" -o $target_cpu == "x86_64"; then
-       CFLAGS="$CFLAGS -Werror"
-fi
-
 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"
@@ -696,10 +691,10 @@ LB_CONFIG_UTILS
 LB_CONFIG_TESTS
 LC_CONFIG_CLIENT_SERVER
 
-# three macros for cmd3 
+# two macros for cmd3 
 LC_CONFIG_SPLIT
-LC_CONFIG_LDISKFS
 LN_CONFIG_CDEBUG
+LC_QUOTA
 
 LB_CONFIG_MODULES