X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.ac;h=7a67e6002438dfb8671b25d1553c86b6ace9fcf6;hb=6fad5485ff9ba8e6decd8625cb79eb2910e934f2;hp=22ef133134cf7b91aa31bfa6c3389680e296b221;hpb=b6af9f0d947384b5be3025877cbf4fddff2094ff;p=pspp-builds.git diff --git a/configure.ac b/configure.ac index 22ef1331..7a67e600 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,8 @@ dnl Process this file with autoconf to produce a configure script. dnl Initialize. -AX_PREREQ(2.60) -AC_INIT([pspp],[0.6.0],[bug-gnu-pspp@gnu.org]) +AC_PREREQ(2.60) +AC_INIT([pspp],[0.7.0],[bug-gnu-pspp@gnu.org]) AC_CONFIG_HEADERS([config.h]) AM_INIT_AUTOMAKE @@ -15,6 +15,7 @@ AC_LIBTOOL_WIN32_DLL AC_LIBTOOL_DLOPEN AC_PROG_LIBTOOL PKG_PROG_PKG_CONFIG +m4_pattern_forbid([PKG_CHECK_MODULES]) AC_ARG_ENABLE( anachronistic-dependencies, @@ -45,9 +46,6 @@ AC_ARG_WITH( [AS_HELP_STRING([--without-gui], [don't build the PSPPIRE gui])]) required_gtk_version=2.12 -if test x"$enable_anachronistic_dependencies" = x"yes" ; then - required_gtk_version=2.8.20 -fi if test x"$with_gui" != x"no" ; then PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $required_gtk_version,, @@ -121,14 +119,15 @@ AM_CONDITIONAL(GNM_SUPPORT, test x"$gnm_support" = x"yes") AC_ARG_WITH( gui_tools, - [AS_HELP_STRING([--with-gui-tools], [build the gui developer 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) fi AM_CONDITIONAL(WITH_GUI_TOOLS, test x"$with_gui_tools" = x"yes") AC_SEARCH_LIBS([cblas_dsdot], [gslcblas],,[PSPP_REQUIRED_PREREQ([libgslcblas])]) -AC_SEARCH_LIBS([gsl_cdf_chisq_Q], [gsl],,[PSPP_REQUIRED_PREREQ([libgsl (version 1.4 or later)])]) +AC_SEARCH_LIBS([gsl_cdf_binomial_P], [gsl],,[PSPP_REQUIRED_PREREQ([libgsl (version 1.8 or later)])]) +PSPP_GSL_NEEDS_FGNU89_INLINE dnl Recent versions of GNU ncurses install the curses header files into dnl /usr/include/ncurses, and provide a 'ncurses5-config' program which