projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New widget PsppireValChooser.
[pspp-builds.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index d6415d0fc43c25b858b09e17604f3112c5e08588..719f4c7411d68517adaeb31186257da92bceffb5 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.
5
], [bug-gnu-pspp@gnu.org], [pspp])
+AC_INIT([GNU PSPP], [0.7.
8
], [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])
@@
-32,19
+32,14
@@
AM_CONDITIONAL(cc_is_gcc, test x"$GCC" = x"yes" )
PSPP_CC_FOR_BUILD
PSPP_PERL
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([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])
dnl Checks for libraries.
AC_SYS_LARGEFILE
AC_SEARCH_LIBS([sin], [m])
-AC_SEARCH_LIBS([dcgettext], [intl])
PSPP_LC_PAPER
PSPP_LC_PAPER
@@
-85,6
+80,8
@@
if test "$with_cairo" != no && test "$with_gui" != "no"; then
if test "x$GLIB_GENMARSHAL" = x; then
PSPP_REQUIRED_PREREQ([glib-genmarshal (or use --without-gui)])
fi
if test "x$GLIB_GENMARSHAL" = x; then
PSPP_REQUIRED_PREREQ([glib-genmarshal (or use --without-gui)])
fi
+
+ gl_NEXT_HEADERS([gtk/gtk.h])
fi
dnl Checks needed for psql reader
fi
dnl Checks needed for psql reader
@@
-151,19
+148,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(
@@
-196,24
+196,30
@@
AC_DEFINE(
[crc32], [gl_crc32],
[Avoid making zlib call gnulib's crc32() instead of its own.])
[crc32], [gl_crc32],
[Avoid making zlib call gnulib's crc32() instead of its own.])
-dnl Gnumeric support requires libxml2 and zlib.
+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 && test $HAVE_ZLIB = yes; then
GNM_SUPPORT=yes
+ ODF_READ_SUPPORT=yes
AC_DEFINE(
[GNM_SUPPORT], [1],
[Define to 1 if building in support for reading Gnumeric files.])
AC_DEFINE(
[GNM_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
else
GNM_SUPPORT=no
+ ODF_READ_SUPPORT=no
fi
fi
-AM_CONDITIONAL([GNM_SUPPORT], [test $GNM_SUPPORT = yes])
+AC_SUBST([GNM_SUPPORT])
+AC_SUBST([ODF_READ_SUPPORT])
-dnl OD
T support requires libxml2
.
+dnl OD
F support requires libxml2 (zlib is optional)
.
if test $HAVE_LIBXML2 = yes; then
AC_DEFINE(
if test $HAVE_LIBXML2 = yes; then
AC_DEFINE(
- [OD
T
_SUPPORT], [1],
- [Define to 1 if building in support for writing O
DT
files.])
+ [OD
F_WRITE
_SUPPORT], [1],
+ [Define to 1 if building in support for writing O
penDocument
files.])
fi
fi
-AM_CONDITIONAL([OD
T
_SUPPORT], [test $HAVE_LIBXML2 = yes])
+AM_CONDITIONAL([OD
F_WRITE
_SUPPORT], [test $HAVE_LIBXML2 = yes])
AC_ARG_WITH(
gui_tools,
AC_ARG_WITH(
gui_tools,
@@
-240,7
+246,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])])
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
PSPP_GSL_NEEDS_FGNU89_INLINE
@@
-287,12
+295,24
@@
PSPP_READLINE
dnl Checks for header files.
AC_CHECK_HEADERS([sys/wait.h fpu_control.h ieeefp.h fenv.h pwd.h])
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
# 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
AC_C_BIGENDIAN
@@
-309,9
+329,11
@@
if test x"$enable_debug" = x"yes" ; then
fi
# iconv is required
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
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.
dnl Required by the gnulib 'relocatable-prog' module.
dnl See doc/relocatable-maint.texi in the gnulib tree for details.