Bump version to 1.5.0

[pspp] / configure.ac

diff --git a/configure.ac b/configure.ac
index b85803642c6c7ceb4ce80a22fc9d69f9bb840376..cac18c36fb2a6abcbd627daad9e019ad891b6594 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,12 +1,28 @@
+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 <http://www.gnu.org/licenses/>.
+dnl

 dnl Process this file with autoconf to produce a configure script.
 
 dnl Initialize.
 AC_PREREQ(2.63)
 dnl Process this file with autoconf to produce a configure script.
 
 dnl Initialize.
 AC_PREREQ(2.63)

-AC_INIT([GNU PSPP], [0.8.0], [bug-gnu-pspp@gnu.org], [pspp])
+AC_INIT([GNU PSPP], [1.5.0], [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])

-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([tar-ustar])

 
 dnl Checks for programs.
 AC_GNU_SOURCE
 
 dnl Checks for programs.
 AC_GNU_SOURCE


@@ -16,22 +32,30 @@ AM_PROG_CC_C_O
 AC_LIBTOOL_WIN32_DLL
 AC_LIBTOOL_DLOPEN
 AC_PROG_LIBTOOL
 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
 PKG_PROG_PKG_CONFIG
 m4_pattern_forbid([PKG_CHECK_MODULES])
 PSPP_CHECK_CLICKSEQUENCE

+PSPP_CHECK_MAKEINFO_DOCBOOK_XML
+PSPP_CHECK_DOT

 
 

-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_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"
 
 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
 
 dnl Checks for libraries.
 AC_SYS_LARGEFILE


@@ -45,7 +69,7 @@ AC_ARG_VAR([PSPPIRE_LDFLAGS], [linker flags to be used for linking the psppire b
 # Support for Cairo and Pango.
 AC_ARG_WITH([cairo],
   [AS_HELP_STRING(
 # Support for Cairo and Pango.
 AC_ARG_WITH([cairo],
   [AS_HELP_STRING(

-    [--without-cairo], 
+    [--without-cairo],

     [Don't build support for charts (using Cairo and Pango);
      implies --without-gui])],
   [], [with_cairo=yes])
     [Don't build support for charts (using Cairo and Pango);
      implies --without-gui])],
   [], [with_cairo=yes])


@@ -53,29 +77,43 @@ AM_CONDITIONAL([HAVE_CAIRO], [test "$with_cairo" != no])
 if test "$with_cairo" != no; then
   PKG_CHECK_MODULES([CAIRO], [cairo >= 1.5 pango >= 1.22 pangocairo],
     [CPPFLAGS="$CPPFLAGS $CAIRO_CFLAGS"
 if test "$with_cairo" != no; then
   PKG_CHECK_MODULES([CAIRO], [cairo >= 1.5 pango >= 1.22 pangocairo],
     [CPPFLAGS="$CPPFLAGS $CAIRO_CFLAGS"

-     AC_DEFINE([HAVE_CAIRO], 1, 
+     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)])])
        [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
 
 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.
 # Support for GUI.

-AC_ARG_WITH([gui], 
-  [AS_HELP_STRING([--without-gui], 
+AC_ARG_WITH([gui],
+  [AS_HELP_STRING([--without-gui],

                   [Don't build the PSPPIRE GUI (using GTK+)])],
   [], [with_gui=yes])
                   [Don't build the PSPPIRE GUI (using GTK+)])],
   [], [with_gui=yes])

-AM_CONDITIONAL([HAVE_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([GTHREAD], [gthread-2.0], [],
     [PSPP_REQUIRED_PREREQ([gthread 2.0 (or use --without-gui)])])
 
                [test "$with_cairo" != no && test "$with_gui" != "no"])
 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.16], [],
-    [PSPP_REQUIRED_PREREQ([gtk+ 2.0 version 2.16 or later (or use --without-gui)])])
+  PKG_CHECK_MODULES([GTK], [gtk+-3.0 >= 3.22.0], [],
+    [PSPP_REQUIRED_PREREQ([gtk+ 3.0 version 3.22.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.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.6], [],
+    [PSPP_REQUIRED_PREREQ([spread-sheet-widget 0.6 (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])


@@ -83,6 +121,11 @@ if test "$with_cairo" != no && test "$with_gui" != "no"; then
     PSPP_REQUIRED_PREREQ([glib-genmarshal (or use --without-gui)])
   fi
 
     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])
 fi
 
 gl_NEXT_HEADERS([gtk/gtk.h])


@@ -96,27 +139,27 @@ dnl If the libpq.so file is in a non standard path, (one which the linker
 dnl doesn't search) then we must set the PG_LDFLAGS to -R/usr/wherever/
 dnl However, if the system happens to have more than one version of other
 dnl dependent libraries (eg. libgtk) in different standard paths. (eg:
 dnl doesn't search) then we must set the PG_LDFLAGS to -R/usr/wherever/
 dnl However, if the system happens to have more than one version of other
 dnl dependent libraries (eg. libgtk) in different standard paths. (eg:

-dnl /usr and /usr/local) then the wrong one may get linked. 
+dnl /usr and /usr/local) then the wrong one may get linked.

 
 dnl To overcome this, we first check for libpq in the standard places, and
 dnl only set PG_LDFLAGS if it's not found.
 
 
 AC_ARG_WITH(
 
 dnl To overcome this, we first check for libpq in the standard places, and
 dnl only set PG_LDFLAGS if it's not found.
 
 
 AC_ARG_WITH(

-  libpq, 
+  libpq,

   [AS_HELP_STRING([--without-libpq], [don't compile in Postgres capability])])
   [AS_HELP_STRING([--without-libpq], [don't compile in Postgres capability])])

-AC_ARG_VAR([PG_CONFIG], 
+AC_ARG_VAR([PG_CONFIG],

            [Full pathname of the pg_config program shipped with Postgresql])
            [Full pathname of the pg_config program shipped with Postgresql])

-AC_PATH_PROG([PG_CONFIG], [pg_config], [], 
+AC_PATH_PROG([PG_CONFIG], [pg_config], [],

              [$PATH:/usr/local/pgsql/bin:/usr/pgsql/bin])
 
              [$PATH:/usr/local/pgsql/bin:/usr/pgsql/bin])
 

-if test x"$with_libpq" != x"no" && test -n "$PG_CONFIG" ; then 
+if test x"$with_libpq" != x"no" && test -n "$PG_CONFIG" ; then

   AC_SUBST(PG_CONFIG)
   AC_SUBST(PG_CONFIG)

-  PG_CFLAGS=-I`$PG_CONFIG --includedir` 
+  PG_CFLAGS=-I`$PG_CONFIG --includedir`

   AC_SUBST(PG_CFLAGS)
 
   AC_CHECK_LIB([pq], [PQexec],
   AC_SUBST(PG_CFLAGS)
 
   AC_CHECK_LIB([pq], [PQexec],

-     [:], 
+     [:],

      [PG_LDFLAGS="-L`$PG_CONFIG --libdir` -R`$PG_CONFIG --libdir`"])
   AC_SUBST(PG_LDFLAGS)
 
      [PG_LDFLAGS="-L`$PG_CONFIG --libdir` -R`$PG_CONFIG --libdir`"])
   AC_SUBST(PG_LDFLAGS)
 


@@ -170,22 +213,11 @@ AC_SUBST([PSQL_SUPPORT])
 
 dnl Check for libxml2
 PKG_CHECK_MODULES(
 
 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.
 
 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
 
 dnl Avoid interference between zlib's crc32() function and gnulib's
 dnl crc32() function, which have different signatures.  PSPP calls


@@ -199,36 +231,11 @@ 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 and OpenDocument (read) support requires libxml2 and zlib.
-if test $HAVE_LIBXML2 = yes && test $HAVE_ZLIB = 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.])])
 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)
+if test x"$with_gui_tools" = x"yes" ; then
+       PKG_CHECK_MODULES(GLADE_UI, gladeui-2.0)

 fi
 AM_CONDITIONAL(WITH_GUI_TOOLS, test x"$with_gui_tools" = x"yes")
 
 fi
 AM_CONDITIONAL(WITH_GUI_TOOLS, test x"$with_gui_tools" = x"yes")
 


@@ -249,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])])
 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
 
 
 
 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])
 
 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 <signal.h>
           /* NetBSD declares sys_siglist in unistd.h.  */
 AC_CHECK_DECLS([SIGWINCH], [], [],
           [#include <signal.h>
           /* NetBSD declares sys_siglist in unistd.h.  */


@@ -313,10 +282,6 @@ gl_INIT
 
 AC_C_INLINE
 
 
 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 isinf isnan finite getpid feholdexcept fpsetmask popen round])
 AC_C_BIGENDIAN
 
 AC_CHECK_FUNCS([__setfpucw fork execl isinf isnan finite getpid feholdexcept fpsetmask popen round])


@@ -324,8 +289,8 @@ AC_CHECK_FUNCS([__setfpucw fork execl isinf isnan finite getpid feholdexcept fps
 AC_PROG_LN_S
 
 AC_ARG_ENABLE(
 AC_PROG_LN_S
 
 AC_ARG_ENABLE(

-  debug, 
-  [AS_HELP_STRING([--enable-debug], 
+  debug,
+  [AS_HELP_STRING([--enable-debug],

                   [Turn on diagnostic features in the program])])
 if test x"$enable_debug" = x"yes"  ; then
   AC_DEFINE(DEBUGGING, 1, [Define to 1 if debugging is enabled.])
                   [Turn on diagnostic features in the program])])
 if test x"$enable_debug" = x"yes"  ; then
   AC_DEFINE(DEBUGGING, 1, [Define to 1 if debugging is enabled.])


@@ -348,6 +313,10 @@ PSPP_CHECK_PREREQS
 AC_CONFIG_FILES(
   [Makefile gl/Makefile po/Makefile tests/atlocal perl-module/lib/PSPP.pm])
 
 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."
 
 AC_OUTPUT
 echo "PSPP configured successfully."