projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
text-item: Use struct font_style instead of individual fields.
[pspp]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index 28ae3e4efde7af50f4aba083706ca9f38a510447..d68d1bf5f8922e101aab62edd1a5b046448f5c8e 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-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
@@
-142,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])
[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
AC_ARG_VAR([GLIB_GENMARSHAL])
AC_CHECK_PROGS([GLIB_GENMARSHAL], [glib-genmarshal])
if test "x$GLIB_GENMARSHAL" = x; then
@@
-325,10
+327,14
@@
RELOCATABLE_STRIP=:
PSPP_CHECK_PREREQS
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/
exampl
es/dummy], [:])
+AC_CONFIG_COMMANDS([doc/
pspp-figur
es/dummy], [:])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])