mirror of
https://github.com/Gnucash/gnucash.git
synced 2025-02-25 18:55:30 -06:00
Prepare for GSettings conversion
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@23215 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
parent
2e2cc12e6d
commit
e87957e632
10
configure.ac
10
configure.ac
@ -255,7 +255,7 @@ fi
|
|||||||
# We first check for other versions due to deprecations.
|
# We first check for other versions due to deprecations.
|
||||||
# 2.36 deprecated g_type_init
|
# 2.36 deprecated g_type_init
|
||||||
# 2.32 deprecated some gthread functions
|
# 2.32 deprecated some gthread functions
|
||||||
PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.38 gthread-2.0 gobject-2.0 gmodule-2.0,
|
PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.38 gio-2.0 >= 2.25 gthread-2.0 gobject-2.0 gmodule-2.0,
|
||||||
[
|
[
|
||||||
AC_DEFINE([HAVE_GLIB_2_38], [1], [Configure leading quote around assertions])
|
AC_DEFINE([HAVE_GLIB_2_38], [1], [Configure leading quote around assertions])
|
||||||
AC_DEFINE([HAVE_GLIB_2_36], [1], [Configure g_type_init deprecation])
|
AC_DEFINE([HAVE_GLIB_2_36], [1], [Configure g_type_init deprecation])
|
||||||
@ -263,20 +263,20 @@ PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.38 gthread-2.0 gobject-2.0 gmodule-2.0,
|
|||||||
],
|
],
|
||||||
[
|
[
|
||||||
PKG_CHECK_MODULES(GLIB,
|
PKG_CHECK_MODULES(GLIB,
|
||||||
glib-2.0 >= 2.36 gthread-2.0 gobject-2.0 gmodule-2.0,
|
glib-2.0 >= 2.36 gio-2.0 >= 2.25 gthread-2.0 gobject-2.0 gmodule-2.0,
|
||||||
[
|
[
|
||||||
AC_DEFINE([HAVE_GLIB_2_36], [1], [Configure g_type_init deprecation])
|
AC_DEFINE([HAVE_GLIB_2_36], [1], [Configure g_type_init deprecation])
|
||||||
AC_DEFINE([HAVE_GLIB_2_32], [1], [Configure gthread deprecations])
|
AC_DEFINE([HAVE_GLIB_2_32], [1], [Configure gthread deprecations])
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
PKG_CHECK_MODULES(GLIB,
|
PKG_CHECK_MODULES(GLIB,
|
||||||
glib-2.0 >= 2.32 gthread-2.0 gobject-2.0 gmodule-2.0,
|
glib-2.0 >= 2.32 gio-2.0 >= 2.25 gthread-2.0 gobject-2.0 gmodule-2.0,
|
||||||
[
|
[
|
||||||
AC_DEFINE([HAVE_GLIB_2_32], [1], [Configure gthread deprecations])
|
AC_DEFINE([HAVE_GLIB_2_32], [1], [Configure gthread deprecations])
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
PKG_CHECK_MODULES(GLIB,
|
PKG_CHECK_MODULES(GLIB,
|
||||||
glib-2.0 >= 2.28 gthread-2.0 gobject-2.0 gmodule-2.0)
|
glib-2.0 >= 2.28 gio-2.0 >= 2.25 gthread-2.0 gobject-2.0 gmodule-2.0)
|
||||||
])
|
])
|
||||||
])
|
])
|
||||||
])
|
])
|
||||||
@ -477,7 +477,7 @@ AM_CONDITIONAL(GNC_HAVE_GUILE_WWW, test "${gnc_have_guile_www}" = yes)
|
|||||||
### --------------------------------------------------------------------------
|
### --------------------------------------------------------------------------
|
||||||
### look for gconf
|
### look for gconf
|
||||||
|
|
||||||
PKG_CHECK_MODULES(GCONF, gconf-2.0 >= 2.22)
|
PKG_CHECK_MODULES(GCONF, gconf-2.0 >= 2.31.1)
|
||||||
# Look up gconftool-2
|
# Look up gconftool-2
|
||||||
AC_PATH_PROG(GCONFTOOL, gconftool-2)
|
AC_PATH_PROG(GCONFTOOL, gconftool-2)
|
||||||
AC_SUBST(GCONFTOOL)
|
AC_SUBST(GCONFTOOL)
|
||||||
|
Loading…
Reference in New Issue
Block a user