dnl Initialize.
AC_PREREQ(2.63)
-AC_INIT([GNU PSPP], [0.7.5], [bug-gnu-pspp@gnu.org], [pspp])
+AC_INIT([GNU PSPP], [0.8.4], [bug-gnu-pspp@gnu.org], [pspp])
+AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_TESTDIR([tests])
AM_INIT_AUTOMAKE
m4_pattern_forbid([PKG_CHECK_MODULES])
PSPP_CHECK_CLICKSEQUENCE
-AC_ARG_ENABLE(
- anachronistic-dependencies,
- [AS_HELP_STRING([--enable-anachronistic-dependencies],
- [Attempt to allow building against older versions of dependent libraries])])
-
PSPP_ENABLE_OPTION(-Wdeclaration-after-statement)
+PSPP_ENABLE_WERROR
AM_CONDITIONAL(cc_is_gcc, test x"$GCC" = x"yes" )
PSPP_CC_FOR_BUILD
PSPP_PERL
-dnl Internationalization macros.
-AC_PROVIDE([AM_PO_SUBDIRS]) # PSPP provides its own po/ support.
+dnl Disable automatic po/ support, because PSPP provides its own po/ support.
+AC_PROVIDE([AM_PO_SUBDIRS])
AM_GNU_GETTEXT([external], [need-ngettext])
-AM_GNU_GETTEXT_VERSION([0.17])
-if test -n "$LIBINTL"; then
- AC_DEFINE([DEPENDS_ON_LIBINTL], [1],
- [Define to 1 if libintl is a separate library, not integrated into libc])
-fi
+LIBS="$LIBINTL $LIBS"
dnl Checks for libraries.
AC_SYS_LARGEFILE
AC_SEARCH_LIBS([sin], [m])
-AC_SEARCH_LIBS([dcgettext], [intl])
PSPP_LC_PAPER
[], [with_cairo=yes])
AM_CONDITIONAL([HAVE_CAIRO], [test "$with_cairo" != no])
if test "$with_cairo" != no; then
- PKG_CHECK_MODULES([CAIRO], [cairo >= 1.5 pango >= 1.20 pangocairo],
+ PKG_CHECK_MODULES([CAIRO], [cairo >= 1.5 pango >= 1.22 pangocairo],
[CPPFLAGS="$CPPFLAGS $CAIRO_CFLAGS"
AC_DEFINE([HAVE_CAIRO], 1,
[Define to 1 if Cairo and Pango are available.])],
- [PSPP_REQUIRED_PREREQ([cairo 1.5 or later and pango 1.20 or later (or use --without-cairo)])])
+ [PSPP_REQUIRED_PREREQ([cairo 1.5 or later and pango 1.22 or later (or use --without-cairo)])])
AC_PATH_PROG([XMLLINT], [xmllint], [echo], [$PATH])
AC_SUBST(XMLLINT)
fi
AM_CONDITIONAL([HAVE_GUI],
[test "$with_cairo" != no && test "$with_gui" != "no"])
if test "$with_cairo" != no && test "$with_gui" != "no"; then
- PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.12], [],
- [PSPP_REQUIRED_PREREQ([gtk+ 2.0 version 2.12 or later (or use --without-gui)])])
+ PKG_CHECK_MODULES([GTHREAD], [gthread-2.0], [],
+ [PSPP_REQUIRED_PREREQ([gthread 2.0 (or use --without-gui)])])
+
+ PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.24], [],
+ [PSPP_REQUIRED_PREREQ([gtk+ 2.0 version 2.24 or later (or use --without-gui)])])
+
+ PKG_CHECK_MODULES([GTKSOURCEVIEW], [gtksourceview-2.0 >= 2.2], [],
+ [PSPP_REQUIRED_PREREQ([gtksourceview 2.0 version 2.2 or later (or use --without-gui)])])
AC_ARG_VAR([GLIB_GENMARSHAL])
AC_CHECK_PROGS([GLIB_GENMARSHAL], [glib-genmarshal])
if test "x$GLIB_GENMARSHAL" = x; then
PSPP_REQUIRED_PREREQ([glib-genmarshal (or use --without-gui)])
fi
+
fi
+gl_NEXT_HEADERS([gtk/gtk.h])
+
dnl Checks needed for psql reader
dnl The 8.x series postgres tarballs installs with a default prefix of
LDFLAGS=$save_LDFLAGS])
if test $pspp_cv_have_libpq = yes; then
+ PSQL_SUPPORT=yes
AC_DEFINE([PSQL_SUPPORT], [1],
[Define to 1 if building in support for reading from postgres
databases.])
else
+ PSQL_SUPPORT=no
PG_CONFIG=
PG_CFLAGS=
PG_LDFLAGS=
PG_LIBS=
fi
else
+ PSQL_SUPPORT=no
pspp_cv_have_libpq=no
fi
-AM_CONDITIONAL(PSQL_SUPPORT, test $pspp_cv_have_libpq = yes)
+AC_SUBST([PSQL_SUPPORT])
dnl Check for libxml2
PKG_CHECK_MODULES(
PSPP_OPTIONAL_PREREQ([libxml2])])
dnl Check for zlib.
-AC_SEARCH_LIBS(
- [gzopen], [z],
- [HAVE_ZLIB=yes],
- [HAVE_ZLIB=no
- PSPP_OPTIONAL_PREREQ([zlib])])
-AC_CHECK_HEADERS(
- [zlib.h],
- [],
- [HAVE_ZLIB=no
- PSPP_OPTIONAL_PREREQ([zlib])])
+AC_SEARCH_LIBS([gzopen], [z], [], [PSPP_REQUIRED_PREREQ([zlib])])
+AC_CHECK_HEADERS([zlib.h], [], [PSPP_REQUIRED_PREREQ([zlib])])
dnl Avoid interference between zlib's crc32() function and gnulib's
dnl crc32() function, which have different signatures. PSPP calls
[crc32], [gl_crc32],
[Avoid making zlib call gnulib's crc32() instead of its own.])
-dnl Gnumeric support requires libxml2 and zlib.
-if test $HAVE_LIBXML2 = yes && test $HAVE_ZLIB = yes; then
- GNM_SUPPORT=yes
+dnl Gnumeric and OpenDocument (read) support requires libxml2 and zlib.
+if test $HAVE_LIBXML2 = yes; then
+ GNM_READ_SUPPORT=yes
+ ODF_READ_SUPPORT=yes
AC_DEFINE(
- [GNM_SUPPORT], [1],
+ [GNM_READ_SUPPORT], [1],
[Define to 1 if building in support for reading Gnumeric files.])
+ AC_DEFINE(
+ [ODF_READ_SUPPORT], [1],
+ [Define to 1 if building in support for reading OpenDocument files.])
else
- GNM_SUPPORT=no
+ GNM_READ_SUPPORT=no
+ ODF_READ_SUPPORT=no
fi
-AM_CONDITIONAL([GNM_SUPPORT], [test $GNM_SUPPORT = yes])
+AC_SUBST([GNM_READ_SUPPORT])
+AC_SUBST([ODF_READ_SUPPORT])
-dnl ODT support requires libxml2.
+dnl ODF support requires libxml2 (zlib is optional).
if test $HAVE_LIBXML2 = yes; then
AC_DEFINE(
- [ODT_SUPPORT], [1],
- [Define to 1 if building in support for writing ODT files.])
+ [ODF_WRITE_SUPPORT], [1],
+ [Define to 1 if building in support for writing OpenDocument files.])
fi
-AM_CONDITIONAL([ODT_SUPPORT], [test $HAVE_LIBXML2 = yes])
+AM_CONDITIONAL([ODF_WRITE_SUPPORT], [test $HAVE_LIBXML2 = yes])
AC_ARG_WITH(
gui_tools,
AM_CONDITIONAL(WITH_PERL_MODULE, test $WITH_PERL_MODULE = yes)
AC_SEARCH_LIBS([cblas_dsdot], [gslcblas],,[PSPP_REQUIRED_PREREQ([libgslcblas])])
-AC_SEARCH_LIBS([gsl_cdf_binomial_P], [gsl],,[PSPP_REQUIRED_PREREQ([libgsl (version 1.8 or later)])])
+PKG_CHECK_MODULES([GSL], [gsl >= 1.13], [],
+ AC_SEARCH_LIBS([gsl_poly_eval_derivs], [gsl],,[PSPP_REQUIRED_PREREQ([gsl version 1.13 or later])]))
+
+
PSPP_GSL_NEEDS_FGNU89_INLINE
dnl Recent versions of GNU ncurses install the curses header files into
dnl Checks for header files.
AC_CHECK_HEADERS([sys/wait.h fpu_control.h ieeefp.h fenv.h pwd.h])
+dnl Some systems dont have SIGWINCH
+AC_CHECK_DECLS([SIGWINCH], [], [],
+ [#include <signal.h>
+ /* NetBSD declares sys_siglist in unistd.h. */
+ #ifdef HAVE_UNISTD_H
+ # include <unistd.h>
+ #endif
+ ])
+
+
# For gnulib.
gl_INIT
AC_C_INLINE
-AC_CHECK_SIZEOF(double)
-
AC_C_BIGENDIAN
-AC_CHECK_FUNCS([__setfpucw fork execl execlp isinf isnan finite getpid feholdexcept fpsetmask popen round])
+AC_CHECK_FUNCS([__setfpucw fork execl isinf isnan finite getpid feholdexcept fpsetmask popen round])
AC_PROG_LN_S
fi
# iconv is required
+AM_ICONV
if test "$am_cv_func_iconv" != "yes"; then
PSPP_REQUIRED_PREREQ([iconv (see http://www.gnu.org/software/libiconv/)])
fi
+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='$(libdir)'
+RELOCATABLE_LIBRARY_PATH='$(pkglibdir)'
RELOCATABLE_STRIP=:
PSPP_CHECK_PREREQS
AC_CONFIG_FILES(
[Makefile gl/Makefile po/Makefile tests/atlocal perl-module/lib/PSPP.pm])
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
+
AC_OUTPUT
echo "PSPP configured successfully."
projects / pspp / blobdiff