[libgda] Firebird detection corrections

[Vivien Malerba <vivien src gnome org>]

commit 6ce0ac3da0b40fd31cd46de0526ce051b3480a8a
Author: Vivien Malerba <malerba gnome-db org>
Date:   Sun Jun 3 18:06:41 2012 +0200

    Firebird detection corrections

 configure.ac                   |    7 -------
 m4/firebird.m4                 |    4 +++-
 providers/firebird/Makefile.am |    5 +++--
 3 files changed, 6 insertions(+), 10 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 07f463f..eca49fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -783,13 +783,6 @@ dnl
 LIBGDA_DTDDIR=${datadir}/libgda-$LIBGDA_ABI_VERSION/dtd
 AC_SUBST(LIBGDA_DTDDIR)
 
-
-dnl ******************************
-dnl Variables
-dnl ******************************
-AC_SUBST(FIREBIRD_LIBS)
-AC_SUBST(FIREBIRD_CFLAGS)
-
 dnl
 dnl Check if lib should be build with the debug mode
 dnl
diff --git a/m4/firebird.m4 b/m4/firebird.m4
index ab65404..6a166bd 100644
--- a/m4/firebird.m4
+++ b/m4/firebird.m4
@@ -76,10 +76,12 @@ m4_define([_FIREBIRD_CHECK_INTERNAL],
 	fi
     fi
 
+    firebird_client_found=no
+    firebird_embed_found=no
+
     # determine if Firebird should be searched for
     firebird_found=no
     try_firebird=true
-    FIREBIRD_LIBS=""
     firebird_test_dir="$FIREBIRD_HOME /usr /opt/firebird /local"
     AC_ARG_WITH(firebird,
               AS_HELP_STRING([--with-firebird[=@<:@yes/no/<directory>@:>@]],
diff --git a/providers/firebird/Makefile.am b/providers/firebird/Makefile.am
index 1e8b9a7..a524690 100644
--- a/providers/firebird/Makefile.am
+++ b/providers/firebird/Makefile.am
@@ -13,7 +13,7 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/libgda \
 	-I$(top_builddir) \
-	$(COREDEPS_CFLAGS) $(COREDEPS_WFLAGS) $(FIREBIRD_CFLAGS)
+	$(COREDEPS_CFLAGS) $(COREDEPS_WFLAGS)
 
 # parser generation
 parser.c parser.h: parser.y $(top_builddir)/libgda/sql-parser/lemon$(EXEEXT_FOR_BUILD)
@@ -50,13 +50,14 @@ firebird_sources = \
 	firebird_token_types.h
 
 libgda_firebird_client_la_SOURCES = $(firebird_sources) libmain-client.c
+libgda_firebird_client_la_CFLAGS = $(FIREBIRD_CLIENT_CFLAGS)
 libgda_firebird_client_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED) $(LIBTOOL_PROV_EXPORT_OPTIONS)
 libgda_firebird_client_la_LIBADD = \
 	$(top_builddir)/libgda/libgda-5.0.la \
 	$(COREDEPS_LIBS) $(FIREBIRD_CLIENT_LIBS)
 
 libgda_firebird_embed_la_SOURCES = $(firebird_sources) libmain-embed.c
-libgda_firebird_embed_la_CFLAGS = -DFIREBIRD_EMBED
+libgda_firebird_embed_la_CFLAGS = -DFIREBIRD_EMBED $(FIREBIRD_EMBED_CFLAGS)
 libgda_firebird_embed_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED) $(LIBTOOL_PROV_EXPORT_OPTIONS)
 libgda_firebird_embed_la_LIBADD = \
 	$(top_builddir)/libgda/libgda-5.0.la \