work on docs

[pspp] / configure.ac

diff --git a/configure.ac b/configure.ac
index dfc4baf60c72d3fb98202a19872795635f93b008..6d2aeda9745c5b4973b305617321b35c6b3e0969 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -59,17 +59,14 @@ PSPP_ENABLE_OPTION([-Wstrict-prototypes])
 PSPP_ENABLE_OPTION([-Wpointer-arith])
 PSPP_ENABLE_OPTION([-Wno-sign-compare])
 PSPP_ENABLE_OPTION([-Wmissing-prototypes])
-PSPP_ENABLE_OPTION([-Wc11-c2x-compat])
 
 AM_CONDITIONAL(cc_is_gcc, test x"$GCC" = x"yes" )
 AM_CONDITIONAL(host_is_w32, [case $host_os in mingw*) true;; *) false;; esac] )
 
 PSPP_PERL
-PSPP_PYTHON
+PSPP_PYTHON3
 AC_CHECK_PROGS([TEX], [tex], [no])
 AC_SUBST([TEX])
-AC_CHECK_PROGS([GWC], [gwc wc], [no])
-AC_SUBST([GWC])
 
 # This suppresses an error in gl/careadlinkat.c that otherwise can't be
 # avoided in GCC 10.x:
@@ -261,21 +258,7 @@ AC_DEFINE(
   [crc32], [gl_crc32],
   [Avoid making zlib call gnulib's crc32() instead of its own.])
 
-AC_ARG_WITH(
-  [perl-module],
-  [AS_HELP_STRING([--without-perl-module], [do not build the Perl module])],
-  [case $with_perl_module in # (
-     yes|no) ;; # (
-     *) AC_MSG_FAILURE([--with-perl-module argument must be 'yes' or 'no']) ;;
-   esac
-   WITH_PERL_MODULE=$with_perl_module],
-  [if 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)
+PSPP_PERL_MODULE
 
 AC_SEARCH_LIBS([cblas_dsdot], [gslcblas],,[PSPP_REQUIRED_PREREQ([libgslcblas])])
 PKG_CHECK_MODULES([GSL], [gsl >= 1.13], [],
@@ -329,7 +312,7 @@ dnl it can make arrangements to build the documentation examples.
 AM_CONDITIONAL(cross_compiling, test x"$cross_compiling" = x"yes" )
 
 AC_CONFIG_FILES(
-  [Makefile gl/Makefile po/Makefile tests/atlocal perl-module/lib/PSPP.pm])
+  [Makefile po/Makefile tests/atlocal perl-module/lib/PSPP.pm])
 
 AC_CONFIG_COMMANDS([doc/pspp-figures/dummy], [:])