X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.ac;h=1d68d55a7ef45219b2e53b47592796c4abc5e106;hb=9b19443fe5e2d060eb0fda661be684eca77a6335;hp=68b160e68cd0c1fc99364bd8b849387a132a99dc;hpb=21be45a1d9e7e07d41e0f9d7293b8db2e20ca5d7;p=pspp diff --git a/configure.ac b/configure.ac index 68b160e68c..1d68d55a7e 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,24 @@ +dnl PSPP - a program for statistical analysis. +dnl Copyright (C) 2017 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 +dnl the Free Software Foundation, either version 3 of the License, or +dnl (at your option) any later version. +dnl +dnl This program is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +dnl GNU General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with this program. If not, see . +dnl dnl Process this file with autoconf to produce a configure script. dnl Initialize. AC_PREREQ(2.63) -AC_INIT([GNU PSPP], [0.10.5pre1], [bug-gnu-pspp@gnu.org], [pspp]) +AC_INIT([GNU PSPP], [1.3.0], [bug-gnu-pspp@gnu.org], [pspp]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_TESTDIR([tests]) @@ -20,6 +36,7 @@ AC_HEADER_TIOCGWINSZ PKG_PROG_PKG_CONFIG m4_pattern_forbid([PKG_CHECK_MODULES]) PSPP_CHECK_CLICKSEQUENCE +PSPP_CHECK_MAKEINFO_DOCBOOK_XML PSPP_CHECK_DOT PSPP_ENABLE_WERROR @@ -28,6 +45,7 @@ AM_CONDITIONAL(cc_is_gcc, test x"$GCC" = x"yes" ) PSPP_CC_FOR_BUILD PSPP_PERL +PSPP_PYTHON dnl Disable automatic po/ support, because PSPP provides its own po/ support. AC_PROVIDE([AM_PO_SUBDIRS]) @@ -51,7 +69,7 @@ AC_ARG_VAR([PSPPIRE_LDFLAGS], [linker flags to be used for linking the psppire b # Support for Cairo and Pango. AC_ARG_WITH([cairo], [AS_HELP_STRING( - [--without-cairo], + [--without-cairo], [Don't build support for charts (using Cairo and Pango); implies --without-gui])], [], [with_cairo=yes]) @@ -59,20 +77,15 @@ 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, + 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 -dnl Xmllint is used in the rules to build the documentation. It is not actually necessary, -dnl but is used for post-build consistency checks. Thus, non-developers can live without it. -dnl However for it to be useful, it needs to be a certain version and have certain features. -dnl The macros below check that it the xmllint available is up to scratch. If it isn't -dnl then a dummy /bin/echo is subsituted instead. - +dnl One of the tests uses xmllint. AC_CACHE_CHECK([for an xmllint program which fits our needs],[ac_cv_path_XMLLINT], -[AC_PATH_PROGS_FEATURE_CHECK([XMLLINT], [xmllint], - [[$ac_path_XMLLINT --version 2>&1 | $GREP XPath > /dev/null && +[AC_PATH_PROGS_FEATURE_CHECK([XMLLINT], [xmllint], + [[$ac_path_XMLLINT --version 2>&1 | $GREP XPath > /dev/null && test `$ac_path_XMLLINT --version 2>&1 | $SED 's/^.* \([0-9]*\).*/\1/'` -gt 20900 && ac_cv_path_XMLLINT=$ac_path_XMLLINT]], [AC_MSG_WARN([no appropriate xmllint program found. Using a dummy (echo)]); ac_cv_path_XMLLINT=$ECHO])]) @@ -80,24 +93,27 @@ AC_CACHE_CHECK([for an xmllint program which fits our needs],[ac_cv_path_XMLLINT AC_SUBST([XMLLINT],[$ac_cv_path_XMLLINT]) # Support for GUI. -AC_ARG_WITH([gui], - [AS_HELP_STRING([--without-gui], +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([HAVE_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], [], [PSPP_REQUIRED_PREREQ([gthread 2.0 (or use --without-gui)])]) - PKG_CHECK_MODULES([GTK], [gtk+-3.0 >= 3.14.5], [], - [PSPP_REQUIRED_PREREQ([gtk+ 3.0 version 3.14.5 or later (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([GLIB], [glib-2.0 >= 2.32], [], - [PSPP_REQUIRED_PREREQ([glib 2.0 version 2.32 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.3], [], + [PSPP_REQUIRED_PREREQ([spread-sheet-widget 0.3 (or use --without-gui)])]) AC_ARG_VAR([GLIB_GENMARSHAL]) AC_CHECK_PROGS([GLIB_GENMARSHAL], [glib-genmarshal]) @@ -123,27 +139,27 @@ dnl If the libpq.so file is in a non standard path, (one which the linker dnl doesn't search) then we must set the PG_LDFLAGS to -R/usr/wherever/ dnl However, if the system happens to have more than one version of other dnl dependent libraries (eg. libgtk) in different standard paths. (eg: -dnl /usr and /usr/local) then the wrong one may get linked. +dnl /usr and /usr/local) then the wrong one may get linked. dnl To overcome this, we first check for libpq in the standard places, and dnl only set PG_LDFLAGS if it's not found. AC_ARG_WITH( - libpq, + libpq, [AS_HELP_STRING([--without-libpq], [don't compile in Postgres capability])]) -AC_ARG_VAR([PG_CONFIG], +AC_ARG_VAR([PG_CONFIG], [Full pathname of the pg_config program shipped with Postgresql]) -AC_PATH_PROG([PG_CONFIG], [pg_config], [], +AC_PATH_PROG([PG_CONFIG], [pg_config], [], [$PATH:/usr/local/pgsql/bin:/usr/pgsql/bin]) -if test x"$with_libpq" != x"no" && test -n "$PG_CONFIG" ; then +if test x"$with_libpq" != x"no" && test -n "$PG_CONFIG" ; then AC_SUBST(PG_CONFIG) - PG_CFLAGS=-I`$PG_CONFIG --includedir` + PG_CFLAGS=-I`$PG_CONFIG --includedir` AC_SUBST(PG_CFLAGS) AC_CHECK_LIB([pq], [PQexec], - [:], + [:], [PG_LDFLAGS="-L`$PG_CONFIG --libdir` -R`$PG_CONFIG --libdir`"]) AC_SUBST(PG_LDFLAGS) @@ -197,10 +213,7 @@ AC_SUBST([PSQL_SUPPORT]) dnl Check for libxml2 PKG_CHECK_MODULES( - [LIBXML2], [libxml-2.0], - [HAVE_LIBXML2=yes], - [HAVE_LIBXML2=no - PSPP_OPTIONAL_PREREQ([libxml2])]) + [LIBXML2], [libxml-2.0], [], [PSPP_REQUIRED_PREREQ([libxml2])]) dnl Check for zlib. AC_SEARCH_LIBS([gzopen], [z], [], [PSPP_REQUIRED_PREREQ([zlib])]) @@ -218,35 +231,10 @@ AC_DEFINE( [crc32], [gl_crc32], [Avoid making zlib call gnulib's crc32() instead of its own.]) -dnl Gnumeric and OpenDocument (read) support requires libxml2 and zlib. -if test $HAVE_LIBXML2 = yes; then - GNM_READ_SUPPORT=yes - ODF_READ_SUPPORT=yes - AC_DEFINE( - [GNM_READ_SUPPORT], [1], - [Define to 1 if building in support for reading Gnumeric files.]) - AC_DEFINE( - [ODF_READ_SUPPORT], [1], - [Define to 1 if building in support for reading OpenDocument files.]) -else - GNM_READ_SUPPORT=no - ODF_READ_SUPPORT=no -fi -AC_SUBST([GNM_READ_SUPPORT]) -AC_SUBST([ODF_READ_SUPPORT]) - -dnl ODF support requires libxml2 (zlib is optional). -if test $HAVE_LIBXML2 = yes; then - AC_DEFINE( - [ODF_WRITE_SUPPORT], [1], - [Define to 1 if building in support for writing OpenDocument files.]) -fi -AM_CONDITIONAL([ODF_WRITE_SUPPORT], [test $HAVE_LIBXML2 = yes]) - 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 +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") @@ -301,8 +289,8 @@ 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], + 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.])