X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.ac;h=18dd2e83f081db0c5507b1f9cf4b5f3424bc1075;hb=refs%2Fheads%2Ffbuf;hp=733923fb01d34c45b33e46743128a51099755372;hpb=212afd869b27a300dc9974ba1f12a7fdd9050334;p=pspp
diff --git a/configure.ac b/configure.ac
index 733923fb01..18dd2e83f0 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.8.4], [bug-gnu-pspp@gnu.org], [pspp])
+AC_INIT([GNU PSPP], [1.1.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_DOT
PSPP_ENABLE_WERROR
@@ -31,6 +49,11 @@ 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
@@ -55,10 +78,23 @@ if test "$with_cairo" != no; then
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.22 or later (or use --without-cairo)])])
- AC_PATH_PROG([XMLLINT], [xmllint], [echo], [$PATH])
- AC_SUBST(XMLLINT)
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 useful, 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.
+
+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 &&
+ test `$ac_path_XMLLINT --version 2>&1 | $SED 's/^.* \([0-9]*\).*/\1/'` -gt 20900 &&
+ ac_cv_path_XMLLINT=$ac_path_XMLLINT]],
+ [AC_MSG_WARN([no appropriate xmllint program found. Using a dummy (echo)]); ac_cv_path_XMLLINT=$ECHO])])
+
+AC_SUBST([XMLLINT],[$ac_cv_path_XMLLINT])
+
# Support for GUI.
AC_ARG_WITH([gui],
[AS_HELP_STRING([--without-gui],
@@ -70,15 +106,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+-2.0 >= 2.24], [],
- [PSPP_REQUIRED_PREREQ([gtk+ 2.0 version 2.24 or later (or use --without-gui)])])
+ PKG_CHECK_MODULES([GTK], [gtk+-3.0 >= 3.14.5], [],
+ [PSPP_REQUIRED_PREREQ([gtk+ 3.0 version 3.14.5 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([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.44], [],
+ [PSPP_REQUIRED_PREREQ([glib 2.0 version 2.44 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([SPREAD_SHEET_WIDGET], [spread-sheet-widget >= 0.2], [],
+ [PSPP_REQUIRED_PREREQ([spread-sheet-widget 0.2 (or use --without-gui)])])
AC_ARG_VAR([GLIB_GENMARSHAL])
AC_CHECK_PROGS([GLIB_GENMARSHAL], [glib-genmarshal])
@@ -86,6 +124,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])
@@ -223,7 +266,7 @@ 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.])])
if test x"$with_gui_tools" = x"yes" ; then
- PKG_CHECK_MODULES(GLADE_UI, gladeui-1.0)
+ PKG_CHECK_MODULES(GLADE_UI, gladeui-2.0)
fi
AM_CONDITIONAL(WITH_GUI_TOOLS, test x"$with_gui_tools" = x"yes")
@@ -250,50 +293,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. */