From 3d4d1096b8219024f3f780de06cc988719cf5b60 Mon Sep 17 00:00:00 2001 From: Li Yuan Date: Fri, 28 Nov 2008 11:49:42 +0000 Subject: [PATCH] Bug #562204. Remove dependency of gmodule. 2008-11-27 Li Yuan * configure.in: Bug #562204. Remove dependency of gmodule. svn path=/trunk/; revision=1305 --- ChangeLog | 5 +++++ configure.in | 13 +++---------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index f8d2cb8..39b4505 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2008-11-27 Li Yuan + * configure.in: + Bug #562204. Remove dependency of gmodule. + +2008-11-27 Li Yuan + * atk/atkobject.c: (atk_role_get_name), (atk_role_get_localized_name), (atk_role_for_name): * atk/atktext.c: (atk_text_attribute_get_value): diff --git a/configure.in b/configure.in index 4b3a645..609721a 100644 --- a/configure.in +++ b/configure.in @@ -153,15 +153,8 @@ if test "x$GCC" = "xyes"; then fi changequote([,])dnl -AM_PATH_GLIB_2_0(2.5.7,have_no_export=true,have_no_export=false) -if test "x$have_no_export" = "xtrue"; then - GLIB_REQUIRED_VERSION=2.5.7 - glib_no_export_package="gmodule-no-export-2.0" -else - GLIB_REQUIRED_VERSION=2.0.0 - glib_no_export_package= -fi -GLIB_PACKAGES="gobject-2.0 $glib_no_export_package" +GLIB_REQUIRED_VERSION=2.0.0 +GLIB_PACKAGES="gobject-2.0" AC_SUBST(GLIB_PACKAGES) AC_SUBST(GLIB_REQUIRED_VERSION) @@ -174,7 +167,7 @@ AM_PATH_GLIB_2_0($GLIB_REQUIRED_VERSION, :, *** GLIB is always available from ftp://ftp.gtk.org/. If GLIB is installed *** but not in the same location as pkg-config add the location of the file *** glib-2.0.pc to the environment variable PKG_CONFIG_PATH.]), - gobject gmodule-no-export) + gobject) PKG_CHECK_MODULES(DEP, glib-2.0 >= $GLIB_REQUIRED_VERSION $GLIB_PACKAGES, , AC_MSG_ERROR([ -- 2.7.4