doc: Make figure references relative to doc/, not to doc/pspp-figures.

[pspp] / acinclude.m4

diff --git a/acinclude.m4 b/acinclude.m4
index d744317e9d93caae740b10c208a71e9124b5130b..49bb3b8ed4e7e480ccc647e002e6eecf2e4768e3 100644 (file)
--- 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
 ])
@@ -320,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: