projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/master' into sheet
[pspp]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index b8c84ea33d5354a5e9843286cc2d19f23bd8a0e3..401779f5da0f5e8c64e94b88f45642d9b71f136c 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.63)
dnl Initialize.
AC_PREREQ(2.63)
-AC_INIT([GNU PSPP], [0.
9.0
], [bug-gnu-pspp@gnu.org], [pspp])
+AC_INIT([GNU PSPP], [0.
10.4
], [bug-gnu-pspp@gnu.org], [pspp])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_TESTDIR([tests])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_TESTDIR([tests])
@@
-84,8
+84,8
@@
if test "$with_cairo" != no && test "$with_gui" != "no"; then
PKG_CHECK_MODULES([GTHREAD], [gthread-2.0], [],
[PSPP_REQUIRED_PREREQ([gthread 2.0 (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([GTK], [gtk+-3.0 >= 3.
14.5
], [],
+ [PSPP_REQUIRED_PREREQ([gtk+ 3.0 version 3.
14.5
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([GTKSOURCEVIEW], [gtksourceview-3.0 >= 3.4.2], [],
[PSPP_REQUIRED_PREREQ([gtksourceview 3.0 version 3.4.2 or later (or use --without-gui)])])
@@
-99,6
+99,11
@@
if test "$with_cairo" != no && test "$with_gui" != "no"; then
PSPP_REQUIRED_PREREQ([glib-genmarshal (or use --without-gui)])
fi
PSPP_REQUIRED_PREREQ([glib-genmarshal (or use --without-gui)])
fi
+ AC_CHECK_PROGS([GLIB_COMPILE_RESOURCES], [glib-compile-resources])
+ if test "x$GLIB_COMPILE_RESOURCES" = x; then
+ PSPP_REQUIRED_PREREQ([glib-compile-resources (or use --without-gui)])
+ fi
+
fi
gl_NEXT_HEADERS([gtk/gtk.h])
fi
gl_NEXT_HEADERS([gtk/gtk.h])