X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.ac;h=e62a77504d01186f444a2debf8dea18e0f0736f3;hb=6fa20f2f419eac61340d9b93d5cdde01c281c9ec;hp=6bb1b260c136158be8e20a8b2aeaea2a3684c686;hpb=ad94d35e0cd52356d44456fc14769548ef4dd368;p=pspp diff --git a/configure.ac b/configure.ac index 6bb1b260c1..e62a77504d 100644 --- a/configure.ac +++ b/configure.ac @@ -17,12 +17,12 @@ dnl 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_PREREQ(2.64) +AC_INIT([GNU PSPP], [1.5.2], [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 info-in-builddir]) dnl Checks for programs. AC_GNU_SOURCE @@ -46,6 +46,16 @@ AM_CONDITIONAL(cc_is_gcc, test x"$GCC" = x"yes" ) PSPP_CC_FOR_BUILD PSPP_PERL PSPP_PYTHON +AC_CHECK_PROGS([TEX], [tex], [no]) +AC_SUBST([TEX]) +AC_CHECK_PROGS([GWC], [gwc wc], [no]) +AC_SUBST([GWC]) + +# 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]) @@ -56,6 +66,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 '' > test.metainfo.xml.in +$as_echo '' >> test.metainfo.xml.in +$as_echo 'Hallo' >> test.metainfo.xml.in +$as_echo '' >> test.metainfo.xml.in +xgettext -o mifc.po test.metainfo.xml.in +if ! test -f ./mifc.po ; then + PSPP_OPTIONAL_PREREQ([org.fsf.metainfo.xml will not be translated. Install gettext >=0.20 or appstream.]) +fi +rm -f mifc.po test.metainfo.xml.in dnl Checks for libraries. AC_SYS_LARGEFILE @@ -97,7 +123,7 @@ AC_ARG_WITH([gui], [AS_HELP_STRING([--without-gui], [Don't build the PSPPIRE GUI (using GTK+)])], [], [with_gui=yes]) -AM_CONDITIONAL([HAVE_GUI], +AM_CONDITIONAL([building_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], [], @@ -112,8 +138,13 @@ 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.7], [], + [PSPP_REQUIRED_PREREQ([spread-sheet-widget 0.7 (or use --without-gui)])]) + PKG_CHECK_VAR([SPREAD_SHEET_WIDGET_LIBDIR], [spread-sheet-widget], [libdir]) + + PKG_CHECK_MODULES([LIBRSVG], [librsvg-2.0 >= 2.44], + [AC_DEFINE([HAVE_RSVG], 1, [Define to 1 if librsvg is available])], + [PSPP_OPTIONAL_PREREQ([librsvg >= 2.44 required for high dpi Copy and Paste])]) AC_ARG_VAR([GLIB_GENMARSHAL]) AC_CHECK_PROGS([GLIB_GENMARSHAL], [glib-genmarshal]) @@ -231,14 +262,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,17 +311,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 - -# 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 @@ -308,15 +320,19 @@ LIBS="$LIBICONV $LIBS" dnl Required by the gnulib 'relocatable-prog' module. dnl See doc/relocatable-maint.texi in the gnulib tree for details. -RELOCATABLE_LIBRARY_PATH='$(pkglibdir)' +RELOCATABLE_LIBRARY_PATH='$(pkglibdir):$(SPREAD_SHEET_WIDGET_LIBDIR)' RELOCATABLE_STRIP=: PSPP_CHECK_PREREQS +dnl The makefile needs to know if we're cross compiling, so that +dnl it can make arrangements to build the documentation examples. +AM_CONDITIONAL(cross_compiling, test x"$cross_compiling" = x"yes" ) + AC_CONFIG_FILES( [Makefile gl/Makefile po/Makefile tests/atlocal perl-module/lib/PSPP.pm]) -AC_CONFIG_COMMANDS([doc/dummy], [:]) +AC_CONFIG_COMMANDS([doc/pspp-figures/dummy], [:]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])