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

diff --git a/acinclude.m4 b/acinclude.m4
index f070009962..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,
@@ -43,6 +43,40 @@ AC_DEFUN([PSPP_PERL],
   AC_SUBST([VERSION_FOR_PERL])
 ])
 
+dnl CHECK_PERL_MODULE([MODULE], [RUN-IF-AVAILABLE], [RUN-IF-NOT-AVAILABLE])
+AC_DEFUN([CHECK_PERL_MODULE],
+  [echo "configure:__oline__: running $PERL -M$1 -e '' >&AS_MESSAGE_LOG_FD" >&AS_MESSAGE_LOG_FD
+   $PERL -M$1 -e '' >&AS_MESSAGE_LOG_FD 2>&1
+   retval=$?
+   echo "configure:__oline__: \$? = $retval" >&AS_MESSAGE_LOG_FD
+   AS_IF([test $retval = 0], [$2], [$3])])
+
+AC_DEFUN([PSPP_PERL_MODULE],
+  [AC_ARG_WITH(
+     [perl-module],
+     [AS_HELP_STRING([--without-perl-module], [do not build the Perl module])],
+     [AS_CASE([$with_perl_module],
+	[yes|no], [],
+	[AC_MSG_FAILURE([--with-perl-module argument must be 'yes' or 'no'])])
+      WITH_PERL_MODULE=$with_perl_module],
+     [if test "$PERL" != no && test x"$cross_compiling" != x"yes"; then
+	WITH_PERL_MODULE=yes
+      else
+	WITH_PERL_MODULE=no
+      fi])
+   AC_SUBST([WITH_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])])
+   fi])
+
 dnl Check that Python 3 is available.
 AC_DEFUN([PSPP_PYTHON3],
   [AC_ARG_VAR([PYTHON3], [Python 3 interpreter])
@@ -313,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