[gtranslator] Depend on really high libs to not link against them.
- From: Ignacio Casal Quinteiro <icq src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtranslator] Depend on really high libs to not link against them.
- Date: Mon, 8 Nov 2010 09:22:32 +0000 (UTC)
commit 13a0e093aec7fb8f4e8cc47b6cb396ec73d17be9
Author: Ignacio Casal Quinteiro <icq gnome org>
Date: Wed Nov 3 13:33:05 2010 +0100
Depend on really high libs to not link against them.
This should be fixed later.
configure.ac | 19 +++++++------------
1 files changed, 7 insertions(+), 12 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index e045c2f..03f0078 100644
--- a/configure.ac
+++ b/configure.ac
@@ -84,9 +84,9 @@ GLIB_REQUIRED=2.25.10
LIBXML_REQUIRED=2.4.12
SOURCEVIEW_REQUIRED=2.90.0
GDL_REQUIRED=2.91.1
-GDICT_OPTIONAL=0.11.0
-GTKSPELL_OPTIONAL=2.0.2
-JSON_GLIB_OPTIONAL=0.7.6
+GDICT_OPTIONAL=100
+GTKSPELL_OPTIONAL=100
+JSON_GLIB_OPTIONAL=100
AC_SUBST(GTK_REQUIRED)
AC_SUBST(GLIB_REQUIRED)
@@ -171,7 +171,7 @@ dnl Check for json-glib, needed for Open-tran
dnl -------------------------------------------------------------------
if test "x$enable_opentran" != "xno"; then
PKG_CHECK_MODULES(JSON_GLIB, \
- json-glib-1.0,
+ json-glib-1.0 >= JSON_GLIB_OPTIONAL,
have_json_glib=yes,
have_json_glib=no)
if test x"$have_json_glib" = "xyes"; then
@@ -208,20 +208,15 @@ AM_CONDITIONAL(USE_DICTIONARY, test x"$have_gdict" = "xyes")
# gucharmap
# ================================================================
have_gucharmap=no
-GUCHARMAP2_OPTIONAL=2.23.0
-GUCHARMAP_OPTIONAL=1.6.0
+GUCHARMAP2_OPTIONAL=100
PKG_CHECK_MODULES([GUCHARMAP],[gucharmap-2 >= $GUCHARMAP2_OPTIONAL],
- [have_gucharmap=yes have_gucharmap_2=yes],[have_gucharmap_2=no])
-if test "$have_gucharmap_2" = "no"; then
- PKG_CHECK_MODULES([GUCHARMAP], [gucharmap >= $GUCHARMAP_OPTIONAL],
- [have_gucharmap=yes],[have_gucharmap=no])
-fi
+ [have_gucharmap_2=yes],[have_gucharmap_2=no])
if test "$have_gucharmap_2" = "yes"; then
AC_DEFINE([HAVE_GUCHARMAP_2],[1],[Define if gucharmap API is version 2])
fi
-AM_CONDITIONAL(USE_CHARMAP, test x"$have_gucharmap" = "xyes")
+AM_CONDITIONAL(USE_CHARMAP, test x"$have_gucharmap2" = "xyes")
dnl -------------------------------------------------------------------
dnl Enable debug builds.
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]