IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Increase trunk requirements to gtk-2.24, glib-2.28.

Browse Source 
This means SVN trunk does no longer support a stock RHEL6 distribution.
See http://lists.gnucash.org/pipermail/gnucash-devel/2012-April/033877.html
and http://lists.gnucash.org/pipermail/gnucash-devel/2011-November/032931.html
for the discussion.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22148 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Christian Stimming
2012-04-15 18:57:05 +00:00
parent 1052ebe778
commit a77ee1bc6f
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
configure.ac
View File

@@ -128,7 +128,7 @@ AC_ARG_ENABLE(gtkmm,
AS_IF([test x${enable_GTKMM} = "xtrue"],
[
# We require gtkmm, of course
PKG_CHECK_MODULES(GTKMM, gtkmm-2.4 >= 2.20)
PKG_CHECK_MODULES(GTKMM, gtkmm-2.4 >= 2.24)
# and also the c++ compiler
AC_PROG_CXXCPP
AC_PROG_CXX
@@ -229,8 +229,8 @@ fi
### --------------------------------------------------------------------------
### Glib checks.
# We require glib >= 2.20, released together with gtk-2.16
PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.20 gthread-2.0 gobject-2.0 gmodule-2.0)
# We require glib >= 2.28, released together with gtk-2.24
PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.28 gthread-2.0 gobject-2.0 gmodule-2.0)
AC_CHECK_HEADERS(dirent.h dlfcn.h dl.h utmp.h locale.h mcheck.h unistd.h wctype.h)
@@ -863,7 +863,7 @@ then
fi
GNOME_COMPILE_WARNINGS
PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.18.1)
PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.24.0)
AS_SCRUB_INCLUDE(GTK_CFLAGS)
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
@@ -879,11 +879,7 @@ then
AC_SUBST(GDK_PIXBUF_LIBS)
# checks for goffice
PKG_CHECK_MODULES(GOFFICE, libgoffice-0.8 >= 0.7.0, [goffice=1], [
PKG_CHECK_MODULES(GOFFICE, libgoffice-0.6 >= 0.6.0, [goffice=1], [
PKG_CHECK_MODULES(GOFFICE, libgoffice-0.5 >= 0.5.1, [goffice=1], [AC_MSG_ERROR([Cannot find libgoffice.>= 0.5.1])])
])
])
PKG_CHECK_MODULES(GOFFICE, libgoffice-0.8 >= 0.7.0, [goffice=1], [AC_MSG_ERROR([Cannot find libgoffice.>= 0.5.1])])
AS_SCRUB_INCLUDE(GOFFICE_CFLAGS)
AC_SUBST(GOFFICE_CFLAGS)
AC_SUBST(GOFFICE_LIBS)