X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=acinclude.m4;h=8c1d2fd851c7e3c082956054ed931548700fbebf;hb=refs%2Fheads%2Fctables14;hp=3c451971bb25c957c90ae1093e41b0c87b0fc34a;hpb=a9f4087b58091cb01ea08e70564e0618c9182a11;p=pspp

diff --git a/acinclude.m4 b/acinclude.m4
index 3c451971bb..8c1d2fd851 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -32,7 +32,7 @@ AC_DEFUN([PSPP_PERL],
   AC_PATH_PROG([PERL], perl, no)
   AC_SUBST([PERL])dnl
   if test "$PERL" != no && $PERL -e 'require 5.005_03;'; then :; else
-    PSPP_REQUIRED_PREREQ([Perl 5.005_03 (or later)])
+    PSPP_OPTIONAL_PREREQ([Perl 5.005_03 (or later)])
   fi
 
   # The PSPP autobuilder appends a build number to the PSPP version number,
@@ -59,7 +59,7 @@ AC_DEFUN([PSPP_PERL_MODULE],
 	[yes|no], [],
 	[AC_MSG_FAILURE([--with-perl-module argument must be 'yes' or 'no'])])
       WITH_PERL_MODULE=$with_perl_module],
-     [if test x"$cross_compiling" != x"yes"; then
+     [if test "$PERL" != no && test x"$cross_compiling" != x"yes"; then
 	WITH_PERL_MODULE=yes
       else
 	WITH_PERL_MODULE=no
@@ -68,12 +68,13 @@ AC_DEFUN([PSPP_PERL_MODULE],
    AM_CONDITIONAL(WITH_PERL_MODULE, test $WITH_PERL_MODULE = yes)
 
    if test $WITH_PERL_MODULE = yes; then
+     if test "$PERL" = no; then
+       PSPP_REQUIRED_PREREQ([Perl 5.005_03 or later (or use --without-perl-module)])
+     fi
      CHECK_PERL_MODULE([Config::Perl::V], [],
        [PSPP_REQUIRED_PREREQ([Config::Perl::V Perl module (or use --without-perl-module)])])
      CHECK_PERL_MODULE([Text::Diff], [],
        [PSPP_OPTIONAL_PREREQ([Text::Diff Perl module for running Perl tests])])
-     CHECK_PERL_MODULE([Memory::Usage], [],
-       [PSPP_OPTIONAL_PREREQ([Memory::Usage Perl module for running Perl tests])])
    fi])
 
 dnl Check that Python 3 is available.
@@ -346,7 +347,7 @@ dnl PSPP_ENABLE_WERROR
 AC_DEFUN([PSPP_ENABLE_WERROR],
   [AC_ARG_ENABLE(
      [Werror],
-     [AC_HELP_STRING([--enable-Werror], [Add -Werror to CFLAGS])],
+     [AS_HELP_STRING([--enable-Werror], [Add -Werror to CFLAGS])],
      [], [enable_Werror=no])
    AC_CONFIG_COMMANDS_PRE(
      [if test "X$enable_Werror" = Xyes; then