projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/stable'
[pspp]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index 3284ec818d32a5ebbfadfd5d6b5e8d39f5d04e93..345ac46bd4569a418458cea29f00066277161388 100644
(file)
--- 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)
dnl Initialize.
AC_PREREQ(2.60)
-AC_INIT([pspp],[0.
6.1
],[bug-gnu-pspp@gnu.org])
+AC_INIT([pspp],[0.
7.0
],[bug-gnu-pspp@gnu.org])
AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE
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
AC_LIBTOOL_DLOPEN
AC_PROG_LIBTOOL
PKG_PROG_PKG_CONFIG
+m4_pattern_forbid([PKG_CHECK_MODULES])
AC_ARG_ENABLE(
anachronistic-dependencies,
AC_ARG_ENABLE(
anachronistic-dependencies,
@@
-49,9
+50,6
@@
AC_ARG_WITH(
[AS_HELP_STRING([--without-gui], [don't build the PSPPIRE gui])])
required_gtk_version=2.12
[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,,
if test x"$with_gui" != x"no" ; then
PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $required_gtk_version,,
@@
-125,7
+123,7
@@
AM_CONDITIONAL(GNM_SUPPORT, test x"$gnm_support" = x"yes")
AC_ARG_WITH(
gui_tools,
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
if test x"$with_gui_tools" = x"yes" ; then
PKG_CHECK_MODULES(GLADE_UI, gladeui-1.0)
fi