added appstream as a build requirement

[pspp] / configure.ac

diff --git a/configure.ac b/configure.ac
index 1d68d55a7ef45219b2e53b47592796c4abc5e106..ab68fe2e132be8548201391de87aa1d56fc58b93 100644 (file)
--- 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])
@@ -56,6 +62,22 @@ if test "x$MSGFMT" = x; then
   PSPP_REQUIRED_PREREQ([msgfmt (is usually provided with gettext)])
 fi
 
+AC_CHECK_PROGS([XGETTEXT], [xgettext])
+if test "x$XGETTEXT" = x; then
+  PSPP_REQUIRED_PREREQ([xgettext (is usually provided with gettext)])
+fi
+dnl appstream required for metainfo.its
+dnl if metainfo.its is not there, then the following small
+dnl file will not produce an outputfile
+$as_echo '<?xml version="1.0" encoding="UTF-8"?>' > test.metainfo.xml.in
+$as_echo '<component type="desktop">' >> test.metainfo.xml.in
+$as_echo '<name>Hallo</name>' >> test.metainfo.xml.in
+$as_echo '</component>' >> test.metainfo.xml.in
+xgettext -o mifc.po test.metainfo.xml.in
+if ! test -f ./mifc.po  ; then
+  PSPP_REQUIRED_PREREQ([appstream 0.12 or later for metainfo.its])
+fi
+rm -f mifc.po test.metainfo.xml.in
 
 dnl Checks for libraries.
 AC_SYS_LARGEFILE
@@ -112,8 +134,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.3], [],
-    [PSPP_REQUIRED_PREREQ([spread-sheet-widget 0.3 (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 +253,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])],
@@ -288,14 +302,6 @@ AC_CHECK_FUNCS([__setfpucw fork execl isinf isnan finite getpid feholdexcept fps
 
 AC_PROG_LN_S
 
-AC_ARG_ENABLE(
-  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.])
-fi
-
 # iconv is required
 AM_ICONV
 if test "$am_cv_func_iconv" != "yes"; then