[libgda/LIBGDA_4.0] Removed redundant tools/binreloc

[Vivien Malerba <vivien src gnome org>]

commit 5a20d58de13c0a5cba1577365c155360ffcdea30
Author: Vivien Malerba <malerba gnome-db org>
Date:   Thu Oct 1 20:20:00 2009 +0200

    Removed redundant tools/binreloc
    
    backported to LIBGDA_4.0

 configure.in                  |    1 -
 tools/Makefile.am             |    5 +-
 tools/binreloc/Makefile.am    |   22 --
 tools/binreloc/binreloc.c     |  696 -----------------------------------------
 tools/binreloc/binreloc.h     |   73 -----
 tools/binreloc/sql-binreloc.c |  261 ---------------
 tools/binreloc/sql-binreloc.h |   49 ---
 tools/gda-sql.c               |    2 -
 tools/web-server.c            |    4 +-
 9 files changed, 3 insertions(+), 1110 deletions(-)
---
diff --git a/configure.in b/configure.in
index 514c810..4123978 100644
--- a/configure.in
+++ b/configure.in
@@ -1519,7 +1519,6 @@ libgda-report/RML/trml2pdf/Makefile
 libgda-xslt/Makefile
 tools/Makefile
 tools/gda-sql-4.0.1:tools/gda-sql.1.in
-tools/binreloc/Makefile
 testing/Makefile
 tests/Makefile
 tests/parser/Makefile
diff --git a/tools/Makefile.am b/tools/Makefile.am
index d172168..dc87ad8 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,5 +1,3 @@
-SUBDIRS = binreloc
-
 bin_PROGRAMS = \
 	gda-list-config-4.0 \
 	gda-sql-4.0 \
@@ -38,7 +36,6 @@ gda_sql_4_0_SOURCES = \
 
 gda_sql_4_0_LDADD = \
         $(top_builddir)/libgda/libgda-4.0.la \
-	binreloc/libgdasql_binreloc-4.0.la \
         $(LIBGDA_LIBS) \
 	$(READLINE_LIB) \
         $(HISTORY_LIB)
@@ -139,4 +136,4 @@ endif
 uninstall-local:
 if DEFAULT_BINARY
 	rm -f $(DESTDIR)$(bindir)/gda-list-config$(EXEEXT) $(DESTDIR)$(bindir)/gda-sql$(EXEEXT) $(DESTDIR)$(bindir)/gda-list-server-op$(EXEEXT)
-endif
\ No newline at end of file
+endif
diff --git a/tools/gda-sql.c b/tools/gda-sql.c
index 64f1730..4280853 100644
--- a/tools/gda-sql.c
+++ b/tools/gda-sql.c
@@ -35,7 +35,6 @@
 #include <libgda/gda-quark-list.h>
 #include <libgda/gda-meta-struct.h>
 #include <libgda/gda-blob-op.h>
-#include "binreloc/sql-binreloc.h"
 
 #ifndef G_OS_WIN32
 #include <signal.h>
@@ -175,7 +174,6 @@ main (int argc, char *argv[])
 	}
 
         gda_init ();
-	sql_gbr_init ();
 
 	has_threads = g_thread_supported ();
 	data = g_new0 (MainData, 1);
diff --git a/tools/web-server.c b/tools/web-server.c
index 9b51244..71d20c7 100644
--- a/tools/web-server.c
+++ b/tools/web-server.c
@@ -27,7 +27,7 @@
 #include "web-server.h"
 #include <libsoup/soup.h>
 #include "html-doc.h"
-#include "binreloc/sql-binreloc.h"
+#include <libgda/binreloc/gda-binreloc.h>
 
 /* Use the RSA reference implementation included in the RFC-1321, http://www.freesoft.org/CIE/RFC/1321/ */
 #include "global.h"
@@ -444,7 +444,7 @@ get_file (WebServer *server, SoupMessage *msg, const char *path, GError **error)
 	GMappedFile *mfile;
 	gchar *real_path;
 
-	real_path = sql_gbr_get_file_path (SQL_DATA_DIR, "libgda-4.0", "web", path, NULL);
+	real_path = gda_gbr_get_file_path (GDA_DATA_DIR, "libgda-4.0", "web", path, NULL);
 	if (!real_path)
 		return FALSE;