X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.ac;h=6b8ef74edb490385992445928f7343eaa3b29ba8;hb=refs%2Fheads%2Fctables10;hp=dfa5625c7ce1448eadc5e9724c9a587ccbf2d47c;hpb=210739b77d0f943b5073375fe39d1f09723adb2c;p=pspp diff --git a/configure.ac b/configure.ac index dfa5625c7c..6b8ef74edb 100644 --- a/configure.ac +++ b/configure.ac @@ -18,7 +18,7 @@ dnl Process this file with autoconf to produce a configure script. dnl Initialize. AC_PREREQ(2.64) -AC_INIT([GNU PSPP], [1.5.2], [bug-gnu-pspp@gnu.org], [pspp]) +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]) @@ -39,6 +39,12 @@ 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 @@ -46,16 +52,21 @@ 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]) -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: @@ -94,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], @@ -124,17 +124,17 @@ AC_ARG_WITH([gui], [AS_HELP_STRING([--without-gui], [Don't build the PSPPIRE GUI (using GTK+)])], [], [with_gui=yes]) -AM_CONDITIONAL([building_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)])]) @@ -259,21 +259,7 @@ AC_DEFINE( [crc32], [gl_crc32], [Avoid making zlib call gnulib's crc32() instead of its own.]) -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], [], @@ -327,7 +313,7 @@ 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/pspp-figures/dummy], [:])