Merge branch 'master' into ui-decoder

diff --cc configure.ac
index 006876c3bdfbd51c5648b6012743bd0b5f8dad8e,73a036e35b6050bf7b47999cb97fd40617aefd5e..37ac490ac5468ea3cd9c714d419cff872466c162
--- 1/configure.ac
--- 2/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)