[libgda/libgda-vala: 34/36] Merge from master: fixing VALA_COMPILER and libgee support request

[Daniel Espinosa Ortiz <despinosa src gnome org>]

commit 749272e11cb168f810fe34d7be6d9b6b9d739065
Merge: e07195c ba20c1d
Author: Daniel Espinosa <despinosa src gnome org>
Date:   Wed Nov 30 14:56:39 2011 -0600

    Merge from master: fixing VALA_COMPILER and libgee support request

 NEWS                                               |   14 +
 configure.ac                                       |   28 +-
 .../{gda-browser.nsi => gda-browser-tmpl.nsi}      |    0
 installers/Windows/make-zip-setup.sh               |  323 ++++++----
 libgda-ui/data-entries/gdaui-entry-shell.c         |    2 -
 libgda-ui/data-entries/gdaui-numeric-entry.c       |    1 +
 libgda-ui/gdaui-data-proxy-info.c                  |    4 +-
 libgda-ui/gdaui-data-selector.c                    |   19 +-
 libgda-ui/gdaui-init.c                             |    2 +-
 libgda-ui/gdaui-rt-editor.c                        |    4 +-
 libgda/Makefile.am                                 |    4 +-
 libgda/gda-connection-internal.h                   |    7 +-
 libgda/gda-connection.c                            |   93 +++-
 libgda/gda-server-operation.c                      |    1 +
 libgda/handlers/gda-handler-numerical.c            |   18 +-
 libgda/libgda.symbols                              |    3 +-
 libgda/sqlite/gda-sqlite-meta.c                    |   22 +-
 libgda/sqlite/gda-sqlite-provider.c                |    6 +-
 libgda/sqlite/gda-sqlite-recordset.c               |    4 +-
 libgda/sqlite/gda-sqlite-util.c                    |   14 +-
 libgda/sqlite/gda-symbols-util.c                   |    2 +-
 libgda/sqlite/mkkeywordhash.c                      |    2 +-
 libgda/sqlite/virtual/gda-vconnection-data-model.c |    4 +-
 libgda/sqlite/virtual/gda-vprovider-data-model.c   |    3 +-
 libgda/thread-wrapper/gda-thread-meta.c            |    4 +-
 libgda/thread-wrapper/gda-thread-provider.c        |  238 ++++----
 m4/bdb.m4                                          |    2 +-
 po/POTFILES.in                                     |    1 +
 po/cs.po                                           |  314 +++++-----
 po/de.po                                           |  637 +++++++++----------
 po/es.po                                           |  671 ++++++++++----------
 po/sl.po                                           |  311 +++++-----
 providers/bdbsql/libmain.c                         |    2 +-
 providers/firebird/gda-firebird-provider.c         |   32 +-
 providers/firebird/gda-firebird-recordset.c        |    2 +-
 providers/firebird/gda-firebird-util.c             |    2 +-
 providers/jdbc/gda-jdbc-meta.c                     |    8 +-
 providers/jdbc/gda-jdbc-provider.c                 |   28 +-
 providers/jdbc/gda-jdbc-recordset.c                |    2 +-
 providers/mysql/gda-mysql-provider.c               |   28 +-
 providers/oracle/gda-oracle-meta.c                 |    6 +-
 providers/oracle/gda-oracle-provider.c             |   28 +-
 providers/oracle/gda-oracle-recordset.c            |    4 +-
 providers/oracle/gda-oracle-util.c                 |   18 +-
 providers/postgres/gda-postgres-ddl.c              |    4 +-
 providers/postgres/gda-postgres-provider.c         |   18 +-
 providers/postgres/gda-postgres-recordset.c        |    2 +-
 providers/reuseable/mysql/gda-mysql-meta.c         |   52 +-
 providers/reuseable/postgres/gda-postgres-meta.c   |   86 ++--
 .../skel-implementation/capi/gda-capi-provider.c   |   26 +-
 providers/web/gda-web-meta.c                       |   92 ++--
 providers/web/gda-web-provider.c                   |   22 +-
 providers/web/gda-web-recordset.c                  |    2 +-
 tests/providers/prov-test-common.c                 |    1 +
 tests/providers/prov-test-util.c                   |   21 +
 tests/test-cnc-utils.c                             |    2 +-
 tests/test-sql-builder.c                           |    7 +-
 tools/browser/browser-window.c                     |   29 +-
 tools/browser/doc/Makefile.am                      |    2 +-
 tools/browser/query-exec/query-console-page.c      |   26 +-
 tools/browser/support.c                            |    4 +-
 61 files changed, 1805 insertions(+), 1509 deletions(-)
---
diff --cc configure.ac
index f6df645,e982a31..960077b
--- a/configure.ac
+++ b/configure.ac
@@@ -494,30 -490,14 +494,34 @@@ the
  
      if test "x$have_vala" = "xyes"
      then
 -        AC_PATH_PROG(VAPIGEN, [vapigen], [no])
++	    AC_PATH_PROG(VAPIGEN, [vapigen], [no])
+         if test "x$VAPIGEN" = "xno"
+         then
+             AC_MSG_ERROR([Vala found but vapigen not found])
+         fi
+         VAPIDIR=`pkg-config $VALA_MODULES --variable=vapidir`
+         AC_SUBST(VAPIGEN)
+         AC_SUBST(VAPIDIR)
 +	    VALA_BINDIR=`pkg-config $VALA_MODULES --variable=bindir`
 +	    AC_SUBST(VALA_BINDIR)
 +	    VALA_COMPILER="$VALA_BINDIR/valac"
 +	    AC_SUBST(VALA_COMPILER)
- 	    VALA_VAPIGEN=`pkg-config $VALA_MODULES --variable=vapigen`
- 	    AC_SUBST(VALA_VAPIGEN)
- 	    VALA_VAPIDIR=`pkg-config $VALA_MODULES --variable=vapidir`
- 	    AC_SUBST(VALA_VAPIDIR)
 +	    
 +	    if test "x$enable_vala_ext" = "xyes"
 +	    then
 +dnl Check for libgee
 +        GEE_REQUIRED="0.6.1"
 +
 +        PKG_CHECK_MODULES(GEE, gee-1.0 >= $GEE_REQUIRED)
 +        AC_SUBST(GEE_CFLAGS)
 +        AC_SUBST(GEE_LIBS)
 +	    fi
 +    else
 +        if test "x$enable_vala_ext" = "xyes"
 +        then
 +            AC_MSG_ERROR([Vala extensions for Libgda are requested but Vala is not available or enable])
 +            $enable_vala_ext = "no"
 +        fi
      fi
  else
      if test "x$enable_vala" = xyes