projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
EXAMINE: Convert another test to Autotest framework.
[pspp-builds.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index 40626e809c03740b40168614ea002365df710ff6..2d8b6a45919d46d344588962a49be423327701c6 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-2,7
+2,8
@@
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.4], [bug-gnu-pspp@gnu.org], [pspp])
+AC_INIT([GNU PSPP], [0.7.5], [bug-gnu-pspp@gnu.org], [pspp])
+AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_TESTDIR([tests])
AM_INIT_AUTOMAKE
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_TESTDIR([tests])
AM_INIT_AUTOMAKE
@@
-35,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])
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
dnl Checks for libraries.
AC_SYS_LARGEFILE
@@
-76,8
+73,8
@@
AC_ARG_WITH([gui],
AM_CONDITIONAL([HAVE_GUI],
[test "$with_cairo" != no && test "$with_gui" != "no"])
if test "$with_cairo" != no && test "$with_gui" != "no"; then
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.1
2
], [],
- [PSPP_REQUIRED_PREREQ([gtk+ 2.0 version 2.1
2
or later (or use --without-gui)])])
+ PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.1
6
], [],
+ [PSPP_REQUIRED_PREREQ([gtk+ 2.0 version 2.1
6
or later (or use --without-gui)])])
AC_ARG_VAR([GLIB_GENMARSHAL])
AC_CHECK_PROGS([GLIB_GENMARSHAL], [glib-genmarshal])
AC_ARG_VAR([GLIB_GENMARSHAL])
AC_CHECK_PROGS([GLIB_GENMARSHAL], [glib-genmarshal])
@@
-150,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
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
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
PG_CONFIG=
PG_CFLAGS=
PG_LDFLAGS=
PG_LIBS=
fi
else
+ PSQL_SUPPORT=no
pspp_cv_have_libpq=no
fi
pspp_cv_have_libpq=no
fi
-A
M_CONDITIONAL(PSQL_SUPPORT, test $pspp_cv_have_libpq = yes
)
+A
C_SUBST([PSQL_SUPPORT]
)
dnl Check for libxml2
PKG_CHECK_MODULES(
dnl Check for libxml2
PKG_CHECK_MODULES(
@@
-204,7
+204,7
@@
if test $HAVE_LIBXML2 = yes && test $HAVE_ZLIB = yes; then
else
GNM_SUPPORT=no
fi
else
GNM_SUPPORT=no
fi
-A
M_CONDITIONAL([GNM_SUPPORT], [test $GNM_SUPPORT = yes
])
+A
C_SUBST([GNM_SUPPORT
])
dnl ODT support requires libxml2.
if test $HAVE_LIBXML2 = yes; then
dnl ODT support requires libxml2.
if test $HAVE_LIBXML2 = yes; then
@@
-239,7
+239,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])])
-AC_SEARCH_LIBS([gsl_cdf_binomial_P], [gsl],,[PSPP_REQUIRED_PREREQ([libgsl (version 1.8 or later)])])
+PKG_CHECK_MODULES([GSL], [gsl >= 1.12], [], [PSPP_REQUIRED_PREREQ([gsl 2.0 version 1.12 or later])])
+
PSPP_GSL_NEEDS_FGNU89_INLINE
dnl Recent versions of GNU ncurses install the curses header files into
PSPP_GSL_NEEDS_FGNU89_INLINE
dnl Recent versions of GNU ncurses install the curses header files into