X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.ac;h=5fa4ea384350b2ee4b137b6379189e19dc82c7fb;hb=4a49e8177df96e6947609fcb6066d1d68e0f6675;hp=d560941024f800084e2470651accd431cc463eeb;hpb=aea57010adca9f26dd3abef66a3f7a5c169964ec;p=pspp diff --git a/configure.ac b/configure.ac index d560941024..5fa4ea3843 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. dnl Initialize. AC_PREREQ(2.63) -AC_INIT([GNU PSPP], [0.7.8], [bug-gnu-pspp@gnu.org], [pspp]) +AC_INIT([GNU PSPP], [0.9.0], [bug-gnu-pspp@gnu.org], [pspp]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_TESTDIR([tests]) @@ -20,12 +20,7 @@ PKG_PROG_PKG_CONFIG m4_pattern_forbid([PKG_CHECK_MODULES]) PSPP_CHECK_CLICKSEQUENCE -AC_ARG_ENABLE( - anachronistic-dependencies, - [AS_HELP_STRING([--enable-anachronistic-dependencies], - [Attempt to allow building against older versions of dependent libraries])]) - -PSPP_ENABLE_OPTION(-Wdeclaration-after-statement) +PSPP_ENABLE_WERROR AM_CONDITIONAL(cc_is_gcc, test x"$GCC" = x"yes" ) @@ -35,11 +30,11 @@ PSPP_PERL 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" dnl Checks for libraries. AC_SYS_LARGEFILE AC_SEARCH_LIBS([sin], [m]) -AC_SEARCH_LIBS([dcgettext], [intl]) PSPP_LC_PAPER @@ -55,15 +50,28 @@ AC_ARG_WITH([cairo], [], [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.20 pangocairo], + 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.20 or later (or use --without-cairo)])]) - AC_PATH_PROG([XMLLINT], [xmllint], [echo], [$PATH]) - AC_SUBST(XMLLINT) + [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 usefull, 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. + +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 && + 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])]) + +AC_SUBST([XMLLINT],[$ac_cv_path_XMLLINT]) + # Support for GUI. AC_ARG_WITH([gui], [AS_HELP_STRING([--without-gui], @@ -72,8 +80,17 @@ AC_ARG_WITH([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([GTK], [gtk+-2.0 >= 2.16], [], - [PSPP_REQUIRED_PREREQ([gtk+ 2.0 version 2.16 or later (or use --without-gui)])]) + 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.4.2], [], + [PSPP_REQUIRED_PREREQ([gtk+ 3.0 version 3.4.2 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)])]) AC_ARG_VAR([GLIB_GENMARSHAL]) AC_CHECK_PROGS([GLIB_GENMARSHAL], [glib-genmarshal]) @@ -81,9 +98,10 @@ if test "$with_cairo" != no && test "$with_gui" != "no"; then PSPP_REQUIRED_PREREQ([glib-genmarshal (or use --without-gui)]) fi - gl_NEXT_HEADERS([gtk/gtk.h]) fi +gl_NEXT_HEADERS([gtk/gtk.h]) + dnl Checks needed for psql reader dnl The 8.x series postgres tarballs installs with a default prefix of @@ -173,16 +191,8 @@ PKG_CHECK_MODULES( PSPP_OPTIONAL_PREREQ([libxml2])]) dnl Check for zlib. -AC_SEARCH_LIBS( - [gzopen], [z], - [HAVE_ZLIB=yes], - [HAVE_ZLIB=no - PSPP_OPTIONAL_PREREQ([zlib])]) -AC_CHECK_HEADERS( - [zlib.h], - [], - [HAVE_ZLIB=no - PSPP_OPTIONAL_PREREQ([zlib])]) +AC_SEARCH_LIBS([gzopen], [z], [], [PSPP_REQUIRED_PREREQ([zlib])]) +AC_CHECK_HEADERS([zlib.h], [], [PSPP_REQUIRED_PREREQ([zlib])]) dnl Avoid interference between zlib's crc32() function and gnulib's dnl crc32() function, which have different signatures. PSPP calls @@ -196,30 +206,36 @@ AC_DEFINE( [crc32], [gl_crc32], [Avoid making zlib call gnulib's crc32() instead of its own.]) -dnl Gnumeric support requires libxml2 and zlib. -if test $HAVE_LIBXML2 = yes && test $HAVE_ZLIB = yes; then - GNM_SUPPORT=yes +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_SUPPORT], [1], + [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_SUPPORT=no + GNM_READ_SUPPORT=no + ODF_READ_SUPPORT=no fi -AC_SUBST([GNM_SUPPORT]) +AC_SUBST([GNM_READ_SUPPORT]) +AC_SUBST([ODF_READ_SUPPORT]) -dnl ODT support requires libxml2. +dnl ODF support requires libxml2 (zlib is optional). if test $HAVE_LIBXML2 = yes; then AC_DEFINE( - [ODT_SUPPORT], [1], - [Define to 1 if building in support for writing ODT files.]) + [ODF_WRITE_SUPPORT], [1], + [Define to 1 if building in support for writing OpenDocument files.]) fi -AM_CONDITIONAL([ODT_SUPPORT], [test $HAVE_LIBXML2 = yes]) +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 - PKG_CHECK_MODULES(GLADE_UI, gladeui-1.0) + PKG_CHECK_MODULES(GLADE_UI, gladeui-2.0) fi AM_CONDITIONAL(WITH_GUI_TOOLS, test x"$with_gui_tools" = x"yes") @@ -240,8 +256,8 @@ AC_SUBST([WITH_PERL_MODULE]) AM_CONDITIONAL(WITH_PERL_MODULE, test $WITH_PERL_MODULE = yes) AC_SEARCH_LIBS([cblas_dsdot], [gslcblas],,[PSPP_REQUIRED_PREREQ([libgslcblas])]) -PKG_CHECK_MODULES([GSL], [gsl >= 1.12], [], - AC_SEARCH_LIBS([gsl_linalg_cholesky_invert], [gsl],,[PSPP_REQUIRED_PREREQ([gsl 2.0 version 1.12 or later])])) +PKG_CHECK_MODULES([GSL], [gsl >= 1.13], [], + AC_SEARCH_LIBS([gsl_poly_eval_derivs], [gsl],,[PSPP_REQUIRED_PREREQ([gsl version 1.13 or later])])) PSPP_GSL_NEEDS_FGNU89_INLINE @@ -304,13 +320,9 @@ gl_INIT AC_C_INLINE -AC_CHECK_SIZEOF([size_t]) -SIZEOF_SIZE_T=$ac_cv_sizeof_size_t -AC_SUBST([SIZEOF_SIZE_T]) - AC_C_BIGENDIAN -AC_CHECK_FUNCS([__setfpucw fork execl execlp isinf isnan finite getpid feholdexcept fpsetmask popen round]) +AC_CHECK_FUNCS([__setfpucw fork execl isinf isnan finite getpid feholdexcept fpsetmask popen round]) AC_PROG_LN_S @@ -327,10 +339,11 @@ AM_ICONV if test "$am_cv_func_iconv" != "yes"; then PSPP_REQUIRED_PREREQ([iconv (see http://www.gnu.org/software/libiconv/)]) fi +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='$(libdir)' +RELOCATABLE_LIBRARY_PATH='$(pkglibdir)' RELOCATABLE_STRIP=: PSPP_CHECK_PREREQS @@ -338,6 +351,10 @@ PSPP_CHECK_PREREQS AC_CONFIG_FILES( [Makefile gl/Makefile po/Makefile tests/atlocal perl-module/lib/PSPP.pm]) +AC_CONFIG_COMMANDS([doc/dummy], [:]) + +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES]) + AC_OUTPUT echo "PSPP configured successfully."