projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
table-item: Change title from table_item_text to table_cell.
[pspp]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index 838b7462368c567f962a9a007e805a1b8358b629..d68d1bf5f8922e101aab62edd1a5b046448f5c8e 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-17,7
+17,7
@@
dnl
dnl Process this file with autoconf to produce a configure script.
dnl Initialize.
dnl Process this file with autoconf to produce a configure script.
dnl Initialize.
-AC_PREREQ(2.6
3
)
+AC_PREREQ(2.6
4
)
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_INIT([GNU PSPP], [1.5.2], [bug-gnu-pspp@gnu.org], [pspp])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_HEADERS([config.h])
@@
-28,6
+28,12
@@
dnl Checks for programs.
AC_GNU_SOURCE
AC_PROG_CC
gl_EARLY
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
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
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:
# This suppresses an error in gl/careadlinkat.c that otherwise can't be
# avoided in GCC 10.x:
@@
-136,10
+146,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_MODULES([SPREAD_SHEET_WIDGET], [spread-sheet-widget >= 0.7], [],
[PSPP_REQUIRED_PREREQ([spread-sheet-widget 0.7 (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_VAR([SPREAD_SHEET_WIDGET_LIBDIR], [spread-sheet-widget], [libdir])
AC_ARG_VAR([GLIB_GENMARSHAL])
AC_CHECK_PROGS([GLIB_GENMARSHAL], [glib-genmarshal])
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.
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
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_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])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])