X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.ac;h=7bdd87f073756d61c3bb6d2192de2a6057a77482;hb=2b0538e3901bfc1301729ab5b84e4d3e05ee4ccc;hp=d6415d0fc43c25b858b09e17604f3112c5e08588;hpb=a3dbdbf5fafb47979f2489ff80aff74685f83386;p=pspp-builds.git diff --git a/configure.ac b/configure.ac index d6415d0f..7bdd87f0 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. dnl Initialize. AC_PREREQ(2.63) -AC_INIT([GNU PSPP], [0.7.5], [bug-gnu-pspp@gnu.org], [pspp]) +AC_INIT([GNU PSPP], [0.7.6], [bug-gnu-pspp@gnu.org], [pspp]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_TESTDIR([tests]) @@ -36,10 +36,6 @@ dnl Internationalization macros. AC_PROVIDE([AM_PO_SUBDIRS]) # PSPP provides its own po/ support. 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 dnl Checks for libraries. AC_SYS_LARGEFILE @@ -151,19 +147,22 @@ if test x"$with_libpq" != x"no" && test -n "$PG_CONFIG" ; then 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( @@ -205,7 +204,7 @@ if test $HAVE_LIBXML2 = yes && test $HAVE_ZLIB = yes; then else GNM_SUPPORT=no fi -AM_CONDITIONAL([GNM_SUPPORT], [test $GNM_SUPPORT = yes]) +AC_SUBST([GNM_SUPPORT]) dnl ODT support requires libxml2. if test $HAVE_LIBXML2 = yes; then @@ -240,7 +239,9 @@ AC_SUBST([WITH_PERL_MODULE]) AM_CONDITIONAL(WITH_PERL_MODULE, test $WITH_PERL_MODULE = yes) AC_SEARCH_LIBS([cblas_dsdot], [gslcblas],,[PSPP_REQUIRED_PREREQ([libgslcblas])]) -PKG_CHECK_MODULES([GSL], [gsl >= 1.12], [], [PSPP_REQUIRED_PREREQ([gsl 2.0 version 1.12 or later])]) +PKG_CHECK_MODULES([GSL], [gsl >= 1.12], [], + AC_SEARCH_LIBS([gsl_linalg_cholesky_invert], [gsl],,[PSPP_REQUIRED_PREREQ([gsl 2.0 version 1.12 or later])])) + PSPP_GSL_NEEDS_FGNU89_INLINE @@ -287,12 +288,24 @@ PSPP_READLINE 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 + /* NetBSD declares sys_siglist in unistd.h. */ + #ifdef HAVE_UNISTD_H + # include + #endif + ]) + + # For gnulib. gl_INIT AC_C_INLINE -AC_CHECK_SIZEOF(double) +AC_CHECK_SIZEOF([size_t]) +SIZEOF_SIZE_T=$ac_cv_sizeof_size_t +AC_SUBST([SIZEOF_SIZE_T]) AC_C_BIGENDIAN