projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed src/math/linreg/
[pspp-builds.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index 67ee0b7a65d2814ab370d7fdd7e6893596d4aa29..a028fcbf5d8c09fc0611298a8329aeb0df85c13a 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-1,8
+1,8
@@
dnl Process this file with autoconf to produce a configure script.
dnl Initialize.
dnl Process this file with autoconf to produce a configure script.
dnl Initialize.
-A
X
_PREREQ(2.60)
-AC_INIT([pspp],[0.
4.3
],[bug-gnu-pspp@gnu.org])
+A
C
_PREREQ(2.60)
+AC_INIT([pspp],[0.
6.0
],[bug-gnu-pspp@gnu.org])
AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE
AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE
@@
-11,10
+11,16
@@
AC_GNU_SOURCE
AC_PROG_CC
gl_EARLY
AM_PROG_CC_C_O
AC_PROG_CC
gl_EARLY
AM_PROG_CC_C_O
+AC_LIBTOOL_WIN32_DLL
AC_LIBTOOL_DLOPEN
AC_PROG_LIBTOOL
PKG_PROG_PKG_CONFIG
AC_LIBTOOL_DLOPEN
AC_PROG_LIBTOOL
PKG_PROG_PKG_CONFIG
+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)
AM_CONDITIONAL(cc_is_gcc, test x"$GCC" = x"yes" )
PSPP_ENABLE_OPTION(-Wdeclaration-after-statement)
AM_CONDITIONAL(cc_is_gcc, test x"$GCC" = x"yes" )
@@
-38,9
+44,14
@@
AC_ARG_WITH(
gui,
[AS_HELP_STRING([--without-gui], [don't build the PSPPIRE gui])])
gui,
[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
if test x"$with_gui" != x"no" ; then
- PKG_CHECK_MODULES(GTK, gtk+-2.0 >=
2.12.0
,,
- [PSPP_REQUIRED_PREREQ([gtk+ 2.0 v
2.12.0
or later (or use --without-gui)])])
+ 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
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
@@
-140,7
+151,7
@@
if test x"$with_libncurses" != x"no" ; then
[curses_available=yes; AC_CHECK_HEADERS([term.h curses.h],,[curses_available=no])])
else
old_cflags=$CFLAGS
[curses_available=yes; AC_CHECK_HEADERS([term.h curses.h],,[curses_available=no])])
else
old_cflags=$CFLAGS
- CFLAGS=
$CFLAGS `$NCURSES_CONFIG --cflags`
+ CFLAGS=
"$CFLAGS `$NCURSES_CONFIG --cflags`"
AC_CHECK_HEADERS([term.h curses.h],[curses_available=yes])
CFLAGS=$old_cflags
if test x"$curses_available" = x"yes" ; then
AC_CHECK_HEADERS([term.h curses.h],[curses_available=yes])
CFLAGS=$old_cflags
if test x"$curses_available" = x"yes" ; then