X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.ac;h=93395f1809fe3c7a3e2f78e945e775867bd57ffc;hb=e146819bbbfbb379df6e1a2f06ebf0bda0eed81f;hp=6bb1b260c136158be8e20a8b2aeaea2a3684c686;hpb=ad94d35e0cd52356d44456fc14769548ef4dd368;p=pspp

diff --git a/configure.ac b/configure.ac
index 6bb1b260c1..93395f1809 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,11 +18,11 @@ dnl Process this file with autoconf to produce a configure script.
 
 dnl Initialize.
 AC_PREREQ(2.63)
-AC_INIT([GNU PSPP], [1.3.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])
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([tar-ustar])
 
 dnl Checks for programs.
 AC_GNU_SOURCE
@@ -47,6 +47,12 @@ PSPP_CC_FOR_BUILD
 PSPP_PERL
 PSPP_PYTHON
 
+# This suppresses an error in gl/careadlinkat.c that otherwise can't be
+# avoided in GCC 10.x:
+#   ../../gl/careadlinkat.c: In function ‘careadlinkat’:
+#   cc1: error: function may return address of local variable
+CFLAGS="$CFLAGS -DGCC_LINT"
+
 dnl Disable automatic po/ support, because PSPP provides its own po/ support.
 AC_PROVIDE([AM_PO_SUBDIRS])
 AM_GNU_GETTEXT([external], [need-ngettext])
@@ -112,8 +118,8 @@ if test "$with_cairo" != no && test "$with_gui" != "no"; then
   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.4], [],
-    [PSPP_REQUIRED_PREREQ([spread-sheet-widget 0.4 (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])
@@ -231,14 +237,6 @@ AC_DEFINE(
   [crc32], [gl_crc32],
   [Avoid making zlib call gnulib's crc32() instead of its own.])
 
-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-2.0)
-fi
-AM_CONDITIONAL(WITH_GUI_TOOLS, test x"$with_gui_tools" = x"yes")
-
 AC_ARG_WITH(
   [perl-module],
   [AS_HELP_STRING([--without-perl-module], [do not build the Perl module])],
@@ -296,9 +294,6 @@ if test x"$enable_debug" = x"yes"  ; then
   AC_DEFINE(DEBUGGING, 1, [Define to 1 if debugging is enabled.])
 fi
 
-# exp10 is not available on all systems (MacOS)
-AC_CHECK_LIB(m, exp10, [AC_DEFINE([HAVE_EXP10],[1],[Define to 1 if your system has 'exp10'.])])
-
 # iconv is required
 AM_ICONV
 if test "$am_cv_func_iconv" != "yes"; then