X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.ac;h=d68d1bf5f8922e101aab62edd1a5b046448f5c8e;hb=a56c5aaddfb59d4f50fb0688e9b00b9fd8ba59eb;hp=27a4c87af388f9f0b71faa05c4d047e4b3d7a33d;hpb=092c2acd489e88dd99d1f27560d16fc1ba89c88c;p=pspp

diff --git a/configure.ac b/configure.ac
index 27a4c87af3..d68d1bf5f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,17 +17,23 @@ dnl
 dnl Process this file with autoconf to produce a configure script.
 
 dnl Initialize.
-AC_PREREQ(2.63)
-AC_INIT([GNU PSPP], [1.4.2], [bug-gnu-pspp@gnu.org], [pspp])
+AC_PREREQ(2.64)
+AC_INIT([GNU PSPP], [1.5.2], [bug-gnu-pspp@gnu.org], [pspp])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_TESTDIR([tests])
-AM_INIT_AUTOMAKE([tar-ustar])
+AM_INIT_AUTOMAKE([tar-ustar info-in-builddir])
 
 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
@@ -46,6 +52,10 @@ AM_CONDITIONAL(cc_is_gcc, test x"$GCC" = x"yes" )
 PSPP_CC_FOR_BUILD
 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:
@@ -119,7 +129,7 @@ AC_ARG_WITH([gui],
   [AS_HELP_STRING([--without-gui],
                   [Don't build the PSPPIRE GUI (using GTK+)])],
   [], [with_gui=yes])
-AM_CONDITIONAL([HAVE_GUI],
+AM_CONDITIONAL([building_gui],
                [test "$with_cairo" != no && test "$with_gui" != "no"])
 if test "$with_cairo" != no && test "$with_gui" != "no"; then
   PKG_CHECK_MODULES([GTHREAD], [gthread-2.0], [],
@@ -134,12 +144,9 @@ if test "$with_cairo" != no && test "$with_gui" != "no"; then
   PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.44], [],
     [PSPP_REQUIRED_PREREQ([glib 2.0 version 2.44 or later (or use --without-gui)])])
 
-  PKG_CHECK_MODULES([SPREAD_SHEET_WIDGET], [spread-sheet-widget >= 0.6], [],
-    [PSPP_REQUIRED_PREREQ([spread-sheet-widget 0.6 (or use --without-gui)])])
-
-  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])])
+  PKG_CHECK_MODULES([SPREAD_SHEET_WIDGET], [spread-sheet-widget >= 0.7], [],
+    [PSPP_REQUIRED_PREREQ([spread-sheet-widget 0.7 (or use --without-gui)])])
+  PKG_CHECK_VAR([SPREAD_SHEET_WIDGET_LIBDIR], [spread-sheet-widget], [libdir])
 
   AC_ARG_VAR([GLIB_GENMARSHAL])
   AC_CHECK_PROGS([GLIB_GENMARSHAL], [glib-genmarshal])
@@ -315,15 +322,19 @@ LIBS="$LIBICONV $LIBS"
 
 dnl Required by the gnulib 'relocatable-prog' module.
 dnl See doc/relocatable-maint.texi in the gnulib tree for details.
-RELOCATABLE_LIBRARY_PATH='$(pkglibdir)'
+RELOCATABLE_LIBRARY_PATH='$(pkglibdir):$(SPREAD_SHEET_WIDGET_LIBDIR)'
 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/dummy], [:])
+AC_CONFIG_COMMANDS([doc/pspp-figures/dummy], [:])
 
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])