From: Andrea Zagli <azagli@libero.it>
Date: Sat, 18 Jun 2011 15:19:24 +0000 (+0200)
Subject: Merge branch 'master' into ui-decoder
X-Git-Tag: 0.3.1~5
X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=9ecd39dcb2046f4a53c9a1c531e57c5aacf14321;p=libgtkform

Merge branch 'master' into ui-decoder
---

9ecd39dcb2046f4a53c9a1c531e57c5aacf14321
diff --cc configure.ac
index 006876c,73a036e..37ac490
--- a/configure.ac
+++ b/configure.ac
@@@ -39,13 -44,9 +44,13 @@@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$G
  AM_GLIB_GNU_GETTEXT
  
  # Checks for libraries.
 +PKG_CHECK_EXISTS(gladeui-1.0 >= 3.2.0, [GLADEUI_FOUND=yes], [GLADEUI_FOUND=no])
 +
 +AM_CONDITIONAL(GLADEUI, test $GLADEUI_FOUND = yes)
 +
  PKG_CHECK_MODULES(GTKFORM, [gtk+-2.0 >= 2.12.0
                              libxml-2.0 >= 2.0.0
-                             libgdaex >= 0.1.0
+                             libgdaex >= 0.3.0
                              libgda-4.0 >= 4.2.3])
  
  AC_SUBST(GTKFORM_CFLAGS)