X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.ac;h=78853a84d8522bebb57bc76c0eb77234a82b8fec;hb=refs%2Fheads%2Fspv3;hp=417a6c2e350ea3a713a8ca3f262a629dd25a1dbb;hpb=9136cc81d49beece5e3e4d1bf85d02d66e0bb0bb;p=pspp
diff --git a/configure.ac b/configure.ac
index 417a6c2e35..78853a84d8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,24 @@
+dnl PSPP - a program for statistical analysis.
+dnl Copyright (C) 2017 Free Software Foundation, Inc.
+dnl
+dnl This program is free software: you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation, either version 3 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program. If not, see .
+dnl
dnl Process this file with autoconf to produce a configure script.
dnl Initialize.
AC_PREREQ(2.63)
-AC_INIT([GNU PSPP], [0.10.2], [bug-gnu-pspp@gnu.org], [pspp])
+AC_INIT([GNU PSPP], [1.2.0], [bug-gnu-pspp@gnu.org], [pspp])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_TESTDIR([tests])
@@ -16,9 +32,11 @@ AM_PROG_CC_C_O
AC_LIBTOOL_WIN32_DLL
AC_LIBTOOL_DLOPEN
AC_PROG_LIBTOOL
+AC_HEADER_TIOCGWINSZ
PKG_PROG_PKG_CONFIG
m4_pattern_forbid([PKG_CHECK_MODULES])
PSPP_CHECK_CLICKSEQUENCE
+PSPP_CHECK_MAKEINFO_DOCBOOK_XML
PSPP_CHECK_DOT
PSPP_ENABLE_WERROR
@@ -27,11 +45,17 @@ AM_CONDITIONAL(cc_is_gcc, test x"$GCC" = x"yes" )
PSPP_CC_FOR_BUILD
PSPP_PERL
+PSPP_PYTHON
dnl Disable automatic po/ support, because PSPP provides its own po/ support.
AC_PROVIDE([AM_PO_SUBDIRS])
AM_GNU_GETTEXT([external], [need-ngettext])
LIBS="$LIBINTL $LIBS"
+AC_CHECK_PROGS([MSGFMT], [msgfmt])
+if test "x$MSGFMT" = x; then
+ PSPP_REQUIRED_PREREQ([msgfmt (is usually provided with gettext)])
+fi
+
dnl Checks for libraries.
AC_SYS_LARGEFILE
@@ -58,12 +82,7 @@ if test "$with_cairo" != no; then
[PSPP_REQUIRED_PREREQ([cairo 1.5 or later and pango 1.22 or later (or use --without-cairo)])])
fi
-dnl Xmllint is used in the rules to build the documentation. It is not actually necessary,
-dnl but is used for post-build consistency checks. Thus, non-developers can live without it.
-dnl However for it to be usefull, it needs to be a certain version and have certain features.
-dnl The macros below check that it the xmllint available is up to scratch. If it isn't
-dnl then a dummy /bin/echo is subsituted instead.
-
+dnl One of the tests uses xmllint.
AC_CACHE_CHECK([for an xmllint program which fits our needs],[ac_cv_path_XMLLINT],
[AC_PATH_PROGS_FEATURE_CHECK([XMLLINT], [xmllint],
[[$ac_path_XMLLINT --version 2>&1 | $GREP XPath > /dev/null &&
@@ -84,14 +103,17 @@ 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([GTK], [gtk+-3.0 >= 3.4.2], [],
- [PSPP_REQUIRED_PREREQ([gtk+ 3.0 version 3.4.2 or later (or use --without-gui)])])
+ PKG_CHECK_MODULES([GTK], [gtk+-3.0 >= 3.18.0], [],
+ [PSPP_REQUIRED_PREREQ([gtk+ 3.0 version 3.18.0 or later (or use --without-gui)])])
PKG_CHECK_MODULES([GTKSOURCEVIEW], [gtksourceview-3.0 >= 3.4.2], [],
[PSPP_REQUIRED_PREREQ([gtksourceview 3.0 version 3.4.2 or later (or use --without-gui)])])
- PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.32], [],
- [PSPP_REQUIRED_PREREQ([glib 2.0 version 2.32 or later (or use --without-gui)])])
+ PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.44], [],
+ [PSPP_REQUIRED_PREREQ([glib 2.0 version 2.44 or later (or use --without-gui)])])
+
+ PKG_CHECK_MODULES([SPREAD_SHEET_WIDGET], [spread-sheet-widget >= 0.3], [],
+ [PSPP_REQUIRED_PREREQ([spread-sheet-widget 0.3 (or use --without-gui)])])
AC_ARG_VAR([GLIB_GENMARSHAL])
AC_CHECK_PROGS([GLIB_GENMARSHAL], [glib-genmarshal])
@@ -99,6 +121,11 @@ if test "$with_cairo" != no && test "$with_gui" != "no"; then
PSPP_REQUIRED_PREREQ([glib-genmarshal (or use --without-gui)])
fi
+ AC_CHECK_PROGS([GLIB_COMPILE_RESOURCES], [glib-compile-resources])
+ if test "x$GLIB_COMPILE_RESOURCES" = x; then
+ PSPP_REQUIRED_PREREQ([glib-compile-resources (or use --without-gui)])
+ fi
+
fi
gl_NEXT_HEADERS([gtk/gtk.h])
@@ -186,10 +213,7 @@ AC_SUBST([PSQL_SUPPORT])
dnl Check for libxml2
PKG_CHECK_MODULES(
- [LIBXML2], [libxml-2.0],
- [HAVE_LIBXML2=yes],
- [HAVE_LIBXML2=no
- PSPP_OPTIONAL_PREREQ([libxml2])])
+ [LIBXML2], [libxml-2.0], [], [PSPP_REQUIRED_PREREQ([libxml2])])
dnl Check for zlib.
AC_SEARCH_LIBS([gzopen], [z], [], [PSPP_REQUIRED_PREREQ([zlib])])
@@ -207,31 +231,6 @@ AC_DEFINE(
[crc32], [gl_crc32],
[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; then
- GNM_READ_SUPPORT=yes
- ODF_READ_SUPPORT=yes
- AC_DEFINE(
- [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_READ_SUPPORT=no
- ODF_READ_SUPPORT=no
-fi
-AC_SUBST([GNM_READ_SUPPORT])
-AC_SUBST([ODF_READ_SUPPORT])
-
-dnl ODF support requires libxml2 (zlib is optional).
-if test $HAVE_LIBXML2 = yes; then
- AC_DEFINE(
- [ODF_WRITE_SUPPORT], [1],
- [Define to 1 if building in support for writing OpenDocument files.])
-fi
-AM_CONDITIONAL([ODF_WRITE_SUPPORT], [test $HAVE_LIBXML2 = yes])
-
AC_ARG_WITH(
gui_tools,
[AS_HELP_STRING([--with-gui-tools], [build the gui developer tools. For DEVELOPERS only! There is no reason why users will need this flag.])])
@@ -263,50 +262,12 @@ PKG_CHECK_MODULES([GSL], [gsl >= 1.13], [],
PSPP_GSL_NEEDS_FGNU89_INLINE
-dnl Recent versions of GNU ncurses install the curses header files into
-dnl /usr/include/ncurses, and provide a 'ncurses5-config' program which
-dnl enables us to discover where they are. Earlier versions don't have
-dnl this, so we can't rely on it. So if ncurses5-config is present,
-dnl we'll trust it to find the right information. Otherwise, we'll
-dnl try to discover it ourselves.
-dnl To confound things further, Cygwin has decided to rename ncurses5-config
-dnl to ncurses8-config !!!
-AC_ARG_WITH(
- libncurses,
- [AS_HELP_STRING([--without-libncurses], [don't compile in ncurses functions])])
-
-if test x"$with_libncurses" != x"no" ; then
- if test x"$cross_compiling" != x"yes" ; then
- AC_CHECK_PROGS([NCURSES_CONFIG], [ncurses5-config ncurses8-config])
- fi
- if test x"$NCURSES_CONFIG" = x ; then
- AC_SEARCH_LIBS([tgetent], [ncurses],
- [curses_available=yes; AC_CHECK_HEADERS([term.h curses.h],,[curses_available=no])])
- else
- old_cflags=$CFLAGS
- CFLAGS="$CFLAGS `$NCURSES_CONFIG --cflags`"
- AC_CHECK_HEADERS([term.h curses.h],[curses_available=yes])
- CFLAGS=$old_cflags
- if test x"$curses_available" = x"yes" ; then
- NCURSES_LIBS=`$NCURSES_CONFIG --libs`
- NCURSES_CFLAGS=`$NCURSES_CONFIG --cflags`
- AC_SUBST(NCURSES_CFLAGS)
- AC_SUBST(NCURSES_LIBS)
- fi
- fi
- if test x"$curses_available" = x"yes" ; then
- AC_DEFINE([LIBNCURSES_USABLE], 1,
- [Define to 1 if the libncurses is both present and usable.])
- fi
- AC_CHECK_HEADERS([termcap.h])
-fi
-
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
+dnl Some systems don't have SIGWINCH
AC_CHECK_DECLS([SIGWINCH], [], [],
[#include
/* NetBSD declares sys_siglist in unistd.h. */