X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp-builds.git;a=blobdiff_plain;f=configure.ac;h=c44fdd565187e1b9f800e51b0adb609f0b99bf90;hp=7a67e6002438dfb8671b25d1553c86b6ace9fcf6;hb=4eec17311c5d0e9db3853e1550b6c8c8d0829c2c;hpb=b6bcae693f035491ae0625f301f3e630c1335555 diff --git a/configure.ac b/configure.ac index 7a67e600..c44fdd56 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.60) -AC_INIT([pspp],[0.7.0],[bug-gnu-pspp@gnu.org]) +AC_INIT([pspp],[0.7.2],[bug-gnu-pspp@gnu.org]) AC_CONFIG_HEADERS([config.h]) AM_INIT_AUTOMAKE @@ -41,6 +41,10 @@ PSPP_LC_PAPER AM_CONDITIONAL(WITHCHARTS, test x"$with_libplot" != x"no") +AC_ARG_VAR([PSPP_LDFLAGS], [linker flags to be used for linking the pspp binary only]) +AC_ARG_VAR([PSPPIRE_LDFLAGS], [linker flags to be used for linking the psppire binary only]) + + AC_ARG_WITH( gui, [AS_HELP_STRING([--without-gui], [don't build the PSPPIRE gui])]) @@ -50,8 +54,6 @@ required_gtk_version=2.12 if test x"$with_gui" != x"no" ; then PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $required_gtk_version,, [PSPP_REQUIRED_PREREQ([gtk+ 2.0 v$required_gtk_version or later (or use --without-gui)])]) - PKG_CHECK_MODULES(GLADE, libglade-2.0 >= 2.6.0,, - [PSPP_REQUIRED_PREREQ([libglade 2.0 v2.6.0 or later (or use --without-gui)])]) fi AM_CONDITIONAL(WITHGUI, test x"$with_gui" != x"no") @@ -104,7 +106,7 @@ if test x"$with_libpq" != x"no" ; then fi AM_CONDITIONAL(PSQL_SUPPORT, test -n "$PG_CONFIG") -dnl Checks needed for gnumeric reader +dnl Checks needed for Gnumeric reader gnm_support=yes; PKG_CHECK_MODULES(LIBXML2, libxml-2.0,, [PSPP_OPTIONAL_PREREQ([libxml2]); gnm_support=no;]); @@ -125,6 +127,8 @@ if test x"$with_gui_tools" = x"yes" ; then fi AM_CONDITIONAL(WITH_GUI_TOOLS, test x"$with_gui_tools" = x"yes") +AM_CONDITIONAL(WITH_PERL_MODULE, test x"$cross_compiling" != x"yes") + AC_SEARCH_LIBS([cblas_dsdot], [gslcblas],,[PSPP_REQUIRED_PREREQ([libgslcblas])]) AC_SEARCH_LIBS([gsl_cdf_binomial_P], [gsl],,[PSPP_REQUIRED_PREREQ([libgsl (version 1.8 or later)])]) PSPP_GSL_NEEDS_FGNU89_INLINE