X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.ac;h=6b8ef74edb490385992445928f7343eaa3b29ba8;hb=refs%2Fheads%2Fctables10;hp=953e230190c2cc6caac875c9d2c562fbbe0b7717;hpb=785e3f589d044effe179195bf2428d765833cae9;p=pspp diff --git a/configure.ac b/configure.ac index 953e230190..6b8ef74edb 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ dnl PSPP - a program for statistical analysis. -dnl Copyright (C) 2017 Free Software Foundation, Inc. +dnl Copyright (C) 2017, 2021 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 @@ -17,22 +17,34 @@ 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.6.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 info-in-builddir]) dnl Checks for programs. AC_GNU_SOURCE AC_PROG_CC gl_EARLY +if test x"$cross_compiling" = x"yes"; then + if test x"$srcdir" = x"."; then + AC_ERROR([Cross compiling must be done out of source.]) + fi +fi + AM_PROG_CC_C_O AC_LIBTOOL_WIN32_DLL AC_LIBTOOL_DLOPEN AC_PROG_LIBTOOL AC_HEADER_TIOCGWINSZ + +AC_CHECK_SIZEOF([ptrdiff_t]) +binary_width=`expr 8 '*' $ac_cv_sizeof_ptrdiff_t` +AC_SUBST([binary_width]) + + PKG_PROG_PKG_CONFIG m4_pattern_forbid([PKG_CHECK_MODULES]) PSPP_CHECK_CLICKSEQUENCE @@ -40,22 +52,48 @@ PSPP_CHECK_MAKEINFO_DOCBOOK_XML PSPP_CHECK_DOT PSPP_ENABLE_WERROR +PSPP_ENABLE_OPTION([-Wall]) +PSPP_ENABLE_OPTION([-Wextra]) +PSPP_ENABLE_OPTION([-Wwrite-strings]) +PSPP_ENABLE_OPTION([-Wstrict-prototypes]) +PSPP_ENABLE_OPTION([-Wpointer-arith]) +PSPP_ENABLE_OPTION([-Wno-sign-compare]) +PSPP_ENABLE_OPTION([-Wmissing-prototypes]) AM_CONDITIONAL(cc_is_gcc, test x"$GCC" = x"yes" ) +AM_CONDITIONAL(host_is_w32, [case $host_os in mingw*) true;; *) false;; esac] ) -PSPP_CC_FOR_BUILD PSPP_PERL -PSPP_PYTHON +PSPP_PYTHON3 +AC_CHECK_PROGS([TEX], [tex], [no]) +AC_SUBST([TEX]) + +# 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]) + LIBS="$LIBINTL $LIBS" AC_CHECK_PROGS([MSGFMT], [msgfmt]) 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 + +PSPP_CHECK_XGETTEXT + +if test "$pspp_cv_progrecent_xgettext" != "yes"; then + PSPP_REQUIRED_PREREQ([xgettext version 0.20 or greater]) +fi dnl Checks for libraries. AC_SYS_LARGEFILE @@ -67,20 +105,9 @@ AC_ARG_VAR([PSPP_LDFLAGS], [linker flags to be used for linking the pspp binary AC_ARG_VAR([PSPPIRE_LDFLAGS], [linker flags to be used for linking the psppire binary only]) # Support for Cairo and Pango. -AC_ARG_WITH([cairo], - [AS_HELP_STRING( - [--without-cairo], - [Don't build support for charts (using Cairo and Pango); - implies --without-gui])], - [], [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.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.22 or later (or use --without-cairo)])]) -fi +PKG_CHECK_MODULES([CAIRO], [cairo >= 1.5 pango >= 1.22 pangocairo], + [CPPFLAGS="$CPPFLAGS $CAIRO_CFLAGS"], + [PSPP_REQUIRED_PREREQ([cairo 1.5 or later and pango 1.22 or later])]) dnl One of the tests uses xmllint. AC_CACHE_CHECK([for an xmllint program which fits our needs],[ac_cv_path_XMLLINT], @@ -97,23 +124,24 @@ AC_ARG_WITH([gui], [AS_HELP_STRING([--without-gui], [Don't build the PSPPIRE GUI (using GTK+)])], [], [with_gui=yes]) -AM_CONDITIONAL([HAVE_GUI], - [test "$with_cairo" != no && test "$with_gui" != "no"]) -if test "$with_cairo" != no && test "$with_gui" != "no"; then +AM_CONDITIONAL([building_gui], [test "$with_gui" != "no"]) +if 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+-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([GTKSOURCEVIEW], [gtksourceview-4 >= 4.0], [], + [PKG_CHECK_MODULES([GTKSOURCEVIEW], [gtksourceview-3.0 >= 3.4.2], [], + [PSPP_REQUIRED_PREREQ([gtksourceview 4.x or gtksourceview 3.x 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.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]) AC_ARG_VAR([GLIB_GENMARSHAL]) AC_CHECK_PROGS([GLIB_GENMARSHAL], [glib-genmarshal]) @@ -231,29 +259,7 @@ 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])], - [case $with_perl_module in # ( - yes|no) ;; # ( - *) AC_MSG_FAILURE([--with-perl-module argument must be 'yes' or 'no']) ;; - esac - WITH_PERL_MODULE=$with_perl_module], - [if test x"$cross_compiling" != x"yes"; then - WITH_PERL_MODULE=yes - else - WITH_PERL_MODULE=no - fi]) -AC_SUBST([WITH_PERL_MODULE]) -AM_CONDITIONAL(WITH_PERL_MODULE, test $WITH_PERL_MODULE = yes) +PSPP_PERL_MODULE AC_SEARCH_LIBS([cblas_dsdot], [gslcblas],,[PSPP_REQUIRED_PREREQ([libgslcblas])]) PKG_CHECK_MODULES([GSL], [gsl >= 1.13], [], @@ -288,14 +294,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 @@ -305,15 +303,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]) + [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])