X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.ac;h=e62a77504d01186f444a2debf8dea18e0f0736f3;hb=4045b0283a12c8fbc0211b0449cbd0e51f51470e;hp=551438ab49d9262b868578516c2dd4afe68815fc;hpb=1c5d2755b719a8598eb78a15fc7b090b9a9c7d75;p=pspp

diff --git a/configure.ac b/configure.ac
index 551438ab49..e62a77504d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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:
@@ -136,6 +140,7 @@ if test "$with_cairo" != no && test "$with_gui" != "no"; then
 
   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])],
@@ -315,15 +320,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])