X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.ac;h=d68d1bf5f8922e101aab62edd1a5b046448f5c8e;hb=f42ff4eab4c37423a9b780e91416f51297b01e31;hp=4b72f7f7714d4c1d0c3972bf38896f143d4b6430;hpb=300d3db698d3ac82a0a302a91ee62bcaad6337b6;p=pspp

diff --git a/configure.ac b/configure.ac
index 4b72f7f771..d68d1bf5f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,6 +28,12 @@ dnl Checks for programs.
 AC_GNU_SOURCE
 AC_PROG_CC
 gl_EARLY
+if test x"$cross_compiling" = x"yes"; then
+   if test x"$srcdir" = x"."; then
+      AC_ERROR([Cross compiling must be done out of source.])
+   fi
+fi
+
 AM_PROG_CC_C_O
 AC_LIBTOOL_WIN32_DLL
 AC_LIBTOOL_DLOPEN
@@ -48,6 +54,8 @@ PSPP_PERL
 PSPP_PYTHON
 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:
@@ -140,10 +148,6 @@ if test "$with_cairo" != no && test "$with_gui" != "no"; then
     [PSPP_REQUIRED_PREREQ([spread-sheet-widget 0.7 (or use --without-gui)])])
   PKG_CHECK_VAR([SPREAD_SHEET_WIDGET_LIBDIR], [spread-sheet-widget], [libdir])
 
-  PKG_CHECK_MODULES([LIBRSVG], [librsvg-2.0 >= 2.44],
-    [AC_DEFINE([HAVE_RSVG], 1, [Define to 1 if librsvg is available])],
-    [PSPP_OPTIONAL_PREREQ([librsvg >= 2.44 required for high dpi Copy and Paste])])
-
   AC_ARG_VAR([GLIB_GENMARSHAL])
   AC_CHECK_PROGS([GLIB_GENMARSHAL], [glib-genmarshal])
   if test "x$GLIB_GENMARSHAL" = x; then
@@ -323,10 +327,14 @@ RELOCATABLE_STRIP=:
 
 PSPP_CHECK_PREREQS
 
+dnl The makefile needs to know if we're cross compiling, so that
+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])
 
-AC_CONFIG_COMMANDS([doc/examples/dummy], [:])
+AC_CONFIG_COMMANDS([doc/pspp-figures/dummy], [:])
 
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])