projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
doc: Document decryption support in pspp-convert.
[pspp]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index 2f3a8da725ea4e89b84d69b1d926d43f064ba95d..7e976a8ca62d9857a80618fbf8036fc86be31b53 100644
(file)
--- 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)
dnl Initialize.
AC_PREREQ(2.63)
-AC_INIT([GNU PSPP], [0.
7.9
], [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])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_TESTDIR([tests])
@@
-20,12
+20,6
@@
PKG_PROG_PKG_CONFIG
m4_pattern_forbid([PKG_CHECK_MODULES])
PSPP_CHECK_CLICKSEQUENCE
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_ENABLE_WERROR
AM_CONDITIONAL(cc_is_gcc, test x"$GCC" = x"yes" )
@@
-56,11
+50,11
@@
AC_ARG_WITH([cairo],
[], [with_cairo=yes])
AM_CONDITIONAL([HAVE_CAIRO], [test "$with_cairo" != no])
if test "$with_cairo" != no; then
[], [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.2
0 pangocairo],
+ PKG_CHECK_MODULES([CAIRO], [cairo >= 1.5 pango >= 1.2
2 pangocairo],
[CPPFLAGS="$CPPFLAGS $CAIRO_CFLAGS"
AC_DEFINE([HAVE_CAIRO], 1,
[Define to 1 if Cairo and Pango are available.])],
[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.2
0
or later (or use --without-cairo)])])
+ [PSPP_REQUIRED_PREREQ([cairo 1.5 or later and pango 1.2
2
or later (or use --without-cairo)])])
AC_PATH_PROG([XMLLINT], [xmllint], [echo], [$PATH])
AC_SUBST(XMLLINT)
fi
AC_PATH_PROG([XMLLINT], [xmllint], [echo], [$PATH])
AC_SUBST(XMLLINT)
fi
@@
-76,8
+70,8
@@
if test "$with_cairo" != no && test "$with_gui" != "no"; then
PKG_CHECK_MODULES([GTHREAD], [gthread-2.0], [],
[PSPP_REQUIRED_PREREQ([gthread 2.0 (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.
16
], [],
- [PSPP_REQUIRED_PREREQ([gtk+ 2.0 version 2.
16
or later (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)])])
PKG_CHECK_MODULES([GTKSOURCEVIEW], [gtksourceview-2.0 >= 2.2], [],
[PSPP_REQUIRED_PREREQ([gtksourceview 2.0 version 2.2 or later (or use --without-gui)])])
@@
-181,16
+175,8
@@
PKG_CHECK_MODULES(
PSPP_OPTIONAL_PREREQ([libxml2])])
dnl Check for zlib.
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
dnl Avoid interference between zlib's crc32() function and gnulib's
dnl crc32() function, which have different signatures. PSPP calls
@@
-205,20
+191,20
@@
AC_DEFINE(
[Avoid making zlib call gnulib's crc32() instead of its own.])
dnl Gnumeric and OpenDocument (read) support requires libxml2 and zlib.
[Avoid making zlib call gnulib's crc32() instead of its own.])
dnl Gnumeric and OpenDocument (read) support requires libxml2 and zlib.
-if test $HAVE_LIBXML2 = yes
&& test $HAVE_ZLIB = yes
; then
- GNM_SUPPORT=yes
+if test $HAVE_LIBXML2 = yes; then
+ GNM_
READ_
SUPPORT=yes
ODF_READ_SUPPORT=yes
AC_DEFINE(
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
[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
ODF_READ_SUPPORT=no
fi
-AC_SUBST([GNM_SUPPORT])
+AC_SUBST([GNM_
READ_
SUPPORT])
AC_SUBST([ODF_READ_SUPPORT])
dnl ODF support requires libxml2 (zlib is optional).
AC_SUBST([ODF_READ_SUPPORT])
dnl ODF support requires libxml2 (zlib is optional).
@@
-254,8
+240,8
@@
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])])
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.1
2
], [],
- AC_SEARCH_LIBS([gsl_
linalg_cholesky_invert], [gsl],,[PSPP_REQUIRED_PREREQ([gsl 2.0 version 1.12
or later])]))
+PKG_CHECK_MODULES([GSL], [gsl >= 1.1
3
], [],
+ AC_SEARCH_LIBS([gsl_
poly_eval_derivs], [gsl],,[PSPP_REQUIRED_PREREQ([gsl version 1.13
or later])]))
PSPP_GSL_NEEDS_FGNU89_INLINE
PSPP_GSL_NEEDS_FGNU89_INLINE
@@
-318,13
+304,9
@@
gl_INIT
AC_C_INLINE
AC_C_INLINE
-AC_CHECK_SIZEOF([size_t])
-SIZEOF_SIZE_T=$ac_cv_sizeof_size_t
-AC_SUBST([SIZEOF_SIZE_T])
-
AC_C_BIGENDIAN
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
AC_PROG_LN_S
@@
-353,6
+335,8
@@
PSPP_CHECK_PREREQS
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])
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
+
AC_OUTPUT
echo "PSPP configured successfully."
AC_OUTPUT
echo "PSPP configured successfully."