X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=acinclude.m4;h=49bb3b8ed4e7e480ccc647e002e6eecf2e4768e3;hb=16d77d1696dbf27abc0409c77115f84f42bf3b53;hp=b830dd8dc9f4d46523588b1828187f633e0f76b8;hpb=facb4a1ad3c9e8b2cdf55824680eed2afb91aebe;p=pspp

diff --git a/acinclude.m4 b/acinclude.m4
index b830dd8dc9..49bb3b8ed4 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -16,11 +16,11 @@ AC_DEFUN([PSPP_OPTIONAL_PREREQ], [pspp_optional_prereqs="$pspp_optional_prereqs
 AC_DEFUN([PSPP_CHECK_PREREQS],
 [
   if test "$pspp_optional_prereqs" != ""; then
-    AC_MSG_WARN([The following optional prerequisites are not installed.
+    AC_MSG_WARN([The following optional packages are not installed.
 You may wish to install them to obtain additional functionality:$pspp_optional_prereqs])
 fi
   if test "$pspp_required_prereqs" != ""; then
-    AC_MSG_ERROR([The following required prerequisites are not installed.
+    AC_MSG_ERROR([The following required packages are not installed.
 You must install them before PSPP can be built:$pspp_required_prereqs])
 fi
 ])
@@ -169,8 +169,7 @@ else
      rm -f conftest*
      test x"${pspp_cv_build_exeext}" = x && pspp_cv_build_exeext=no])
   EXEEXT_FOR_BUILD=""
-  test x"${pspp_cv_build_exeext}" != xno && EXEEXT_FOR_BUILD=${pspp_cv_build_exeex
-t}
+  test x"${pspp_cv_build_exeext}" != xno && EXEEXT_FOR_BUILD=${pspp_cv_build_exeext}
 fi
 AC_SUBST(EXEEXT_FOR_BUILD)])
 
@@ -321,6 +320,8 @@ AC_DEFUN([PSPP_ENABLE_WERROR],
    AC_CONFIG_COMMANDS_PRE(
      [if test "X$enable_Werror" = Xyes; then
         CFLAGS="$CFLAGS -Werror -Wno-error=deprecated-declarations"
+	# gnulib needs this, for now:
+	CFLAGS="$CFLAGS -Wno-error=attributes"
       fi])])
 
 # The following comes from Open vSwitch: