doc: Make figure references relative to doc/, not to doc/pspp-figures.

[pspp] / configure.ac

diff --git a/configure.ac b/configure.ac
index ab68fe2e132be8548201391de87aa1d56fc58b93..2edf516a95f8e6681181949c67868c580cc60a9b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -17,12 +17,12 @@ dnl
 dnl Process this file with autoconf to produce a configure script.
 
 dnl Initialize.
-AC_PREREQ(2.63)
-AC_INIT([GNU PSPP], [1.5.0], [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
@@ -46,6 +46,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:
@@ -75,7 +79,7 @@ $as_echo '<name>Hallo</name>' >> test.metainfo.xml.in
 $as_echo '</component>' >> test.metainfo.xml.in
 xgettext -o mifc.po test.metainfo.xml.in
 if ! test -f ./mifc.po  ; then
-  PSPP_REQUIRED_PREREQ([appstream 0.12 or later for metainfo.its])
+  PSPP_OPTIONAL_PREREQ([org.fsf.metainfo.xml will not be translated. Install gettext >=0.20 or appstream.])
 fi
 rm -f mifc.po test.metainfo.xml.in
 
@@ -119,7 +123,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,8 +138,13 @@ 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([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])
+
+  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])
@@ -311,7 +320,7 @@ 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
@@ -319,7 +328,7 @@ PSPP_CHECK_PREREQS
 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])