Skip to content

Commit

Permalink
Bump glib2 minimum requirement to 2.12.
Browse files Browse the repository at this point in the history
At the same time, remove all the conditional code and workarounds
that were in the code to cater for glib < 2.12.

Note: this commit will require a rerun of autogen.sh and configure.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18696 57a11ea4-9604-0410-9ed3-97b8803252fd
  • Loading branch information
gjanssens committed Feb 20, 2010
1 parent 13ce6a1 commit 86c7ae0
Show file tree
Hide file tree
Showing 35 changed files with 227 additions and 1,075 deletions.
36 changes: 3 additions & 33 deletions configure.in
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ dnl Process this file with autoconf to produce a configure script.

# Autoconf initialization
AC_PREREQ(2.59)
AC_INIT([gnucash], [2.3.10], [gnucash-devel@gnucash.org])
AC_INIT([GnuCash], [2.3.10], [gnucash-devel@gnucash.org])
AC_CONFIG_HEADERS(config.h)
AC_CONFIG_SRCDIR(src/engine/Transaction.h)

Expand Down Expand Up @@ -233,8 +233,8 @@ fi
### --------------------------------------------------------------------------
### Glib checks..

AM_PATH_GLIB_2_0(2.6.0,,AC_MSG_ERROR([
*** GLIB >= 2.6 is required to build Gnucash; please make sure you have the
AM_PATH_GLIB_2_0(2.12.0,,AC_MSG_ERROR([
*** GLIB >= 2.12 is required to build Gnucash; please make sure you have the
*** development headers installed. The latest version of GLIB is
*** always available at ftp://ftp.gnome.org/pub/gnome/sources/glib/.]),
gthread gobject gmodule)
Expand All @@ -244,35 +244,6 @@ then
AC_MSG_ERROR([Cannot find glib. Check config.log])
fi

AC_MSG_CHECKING(for GLIB - version >= 2.8.0)
if $PKG_CONFIG 'glib-2.0 >= 2.8.0'
then
AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_GLIB_2_8,1,[System has glib 2.8.0 or better])
HAVE_GLIB_2_8=yes
else
AC_MSG_RESULT(no)
if test "x${native_win32}" = "xyes"; then
AC_MSG_ERROR([*** GLIB >= 2.8 is required to build Gnucash on Windows.])
else
GLIB26_LIBS="$GLIB_LIBS"
GLIB_LIBS="\${top_builddir}/lib/glib28/libgnc-glib.la $GLIB_LIBS"
GLIB_CFLAGS="-I\${top_srcdir}/lib/glib28 $GLIB_CFLAGS"
AC_SUBST(GLIB26_LIBS)
fi
fi
AM_CONDITIONAL(HAVE_GLIB_2_8, test "x$HAVE_GLIB_2_8" = "xyes")

AC_MSG_CHECKING(for GLIB - version >= 2.9.0)
if $PKG_CONFIG 'glib-2.0 >= 2.9.0'
then
AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_GLIB29,1,[System has glib 2.9.0 or better])
HAVE_GLIB29=yes
else
AC_MSG_RESULT(no)
fi

AC_MSG_CHECKING(for GLIB - version >= 2.12.0)
if $PKG_CONFIG 'glib-2.0 >= 2.12.0'
then
Expand Down Expand Up @@ -1524,7 +1495,6 @@ AC_CONFIG_FILES(po/Makefile.in
doc/examples/Makefile
intl-scm/Makefile
lib/Makefile
lib/glib28/Makefile
lib/guile-www/Makefile
lib/srfi/Makefile
lib/libc/Makefile
Expand Down
4 changes: 2 additions & 2 deletions lib/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
SUBDIRS = libc glib28 guile-www srfi stf
DIST_SUBDIRS = libc glib28 guile-www srfi stf
SUBDIRS = libc guile-www srfi stf
DIST_SUBDIRS = libc guile-www srfi stf

EXTRA_DIST = README

18 changes: 0 additions & 18 deletions lib/glib28/Makefile.am

This file was deleted.

6 changes: 0 additions & 6 deletions lib/glib28/dummy.c

This file was deleted.

Loading

0 comments on commit 86c7ae0

Please sign in to comment.