X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.ac;h=78853a84d8522bebb57bc76c0eb77234a82b8fec;hb=refs%2Fheads%2Fspv3;hp=7d33ca25daf29827ced92b991aa0e05179380989;hpb=5cdb1f83c37674ee6d588bb0104729d564012ecb;p=pspp diff --git a/configure.ac b/configure.ac index 7d33ca25da..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.7.9], [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,27 +32,30 @@ 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 -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_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 @@ -56,15 +75,23 @@ AC_ARG_WITH([cairo], [], [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.20 pangocairo], + PKG_CHECK_MODULES([CAIRO], [cairo >= 1.5 pango >= 1.22 pangocairo], [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.20 or later (or use --without-cairo)])]) - AC_PATH_PROG([XMLLINT], [xmllint], [echo], [$PATH]) - AC_SUBST(XMLLINT) + [PSPP_REQUIRED_PREREQ([cairo 1.5 or later and pango 1.22 or later (or use --without-cairo)])]) fi +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 && + 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], @@ -73,11 +100,20 @@ 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 - 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([GTHREAD], [gthread-2.0], [], + [PSPP_REQUIRED_PREREQ([gthread 2.0 (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-2.0 >= 2.2], [], - [PSPP_REQUIRED_PREREQ([gtksourceview 2.0 version 2.2 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([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]) @@ -85,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]) @@ -172,22 +213,11 @@ 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], - [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 @@ -201,36 +231,11 @@ 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 && 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( - [ODF_READ_SUPPORT], [1], - [Define to 1 if building in support for reading OpenDocument files.]) -else - GNM_SUPPORT=no - ODF_READ_SUPPORT=no -fi -AC_SUBST([GNM_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.])]) 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") @@ -251,56 +256,18 @@ 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])]) -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])])) +PKG_CHECK_MODULES([GSL], [gsl >= 1.13], [], + AC_SEARCH_LIBS([gsl_poly_eval_derivs], [gsl],,[PSPP_REQUIRED_PREREQ([gsl version 1.13 or later])])) 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. */ @@ -315,13 +282,9 @@ gl_INIT 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_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 @@ -350,6 +313,10 @@ PSPP_CHECK_PREREQS AC_CONFIG_FILES( [Makefile gl/Makefile po/Makefile tests/atlocal perl-module/lib/PSPP.pm]) +AC_CONFIG_COMMANDS([doc/dummy], [:]) + +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES]) + AC_OUTPUT echo "PSPP configured successfully."