--- library/grt/src/Makefile.am.orig	2008-12-10 18:46:05 +0300
+++ library/grt/src/Makefile.am	2009-01-17 23:55:49 +0300
@@ -41,7 +41,9 @@ libgrt_la_SOURCES=\
 	diff/grtdiff.cpp\
 	diff/grtlistdiff.cpp
 
-
+libgrt_la_LIBADD=\
+	$(top_srcdir)/library/utilities/src/libguiutil.la \
+	@GLIB_LIBS@ @PCRE_LIBS@ @GRT_LIBS@ @MYSQL_LIBS@ @LUA_LIBS@ @SIGC_LIBS@
 
 if BUILD_JAVA
 # no extra sources


--- tools/genobj/Makefile.am.orig	2008-12-10 18:46:06 +0300
+++ tools/genobj/Makefile.am	2009-01-18 00:00:55 +0300
@@ -9,7 +9,6 @@ INCLUDES=-I$(top_srcdir)/library/utiliti
 		-I$(top_srcdir)/generated\
 	  @GLIB_CFLAGS@ @PCRE_CFLAGS@ @SIGC_CFLAGS@
 
-genobj_LDADD=$(top_srcdir)/library/grt/src/libgrt.la $(top_srcdir)/library/utilities/src/libguiutil.la
-genobj_LDFLAGS= $(top_srcdir)/library/grt/src/libgrt.la $(top_srcdir)/library/utilities/src/libguiutil.la\
+genobj_LDADD=$(top_srcdir)/library/grt/src/libgrt.la $(top_srcdir)/library/utilities/src/libguiutil.la \
 	@GRT_LIBS@ @GLIB_LIBS@ @PCRE_LIBS@ @SIGC_LIBS@ 
 

--- backend/grt/Makefile.am.orig	2008-12-10 18:46:01 +0300
+++ backend/grt/Makefile.am	2009-01-18 00:32:56 +0300
@@ -2,7 +2,7 @@
 
 pkglib_LTLIBRARIES=libgrtbe.la
 
-INCLUDES=@GLIB_CFLAGS@ @SIGC_CFLAGS@ @GRT_CFLAGS@\
+libgrtbe_la_CXXFLAGS=@GLIB_CFLAGS@ @SIGC_CFLAGS@ @GRT_CFLAGS@ @PCRE_CFLAGS@\
 	-I$(top_srcdir)/library/grt/src -I$(top_srcdir)/library/utilities/src\
 	-I$(top_srcdir)/backend -I$(top_srcdir)/generated\
 	-I$(top_srcdir)/library -I$(top_srcdir)/modules\
@@ -27,3 +27,6 @@ libgrtbe_la_SOURCES=\
 	tree_model.cpp\
 	ui_form.cpp
 
+libgrtbe_la_LIBADD=\
+	$(top_srcdir)/library/utilities/src/libguiutil.la\
+	@GLIB_LIBS@ @SIGC_LIBS@ @GRT_LIBS@ @PCRE_LIBS@

--- backend/grtdb/Makefile.am.orig	2008-12-10 18:46:02 +0300
+++ backend/grtdb/Makefile.am	2009-01-18 00:43:29 +0300
@@ -1,6 +1,6 @@
 pkglib_LTLIBRARIES=libgrtdbbe.la
 
-INCLUDES=@GLIB_CFLAGS@ @SIGC_CFLAGS@ @GRT_CFLAGS@ @MYSQL_INCLUDE@\
+libgrtdbbe_la_CXXFLAGS=@GLIB_CFLAGS@ @SIGC_CFLAGS@ @GRT_CFLAGS@ @MYSQL_INCLUDE@ @PCRE_CFLAGS@\
 	-I$(top_srcdir)/library/grt/src -I$(top_srcdir)/library/utilities/src \
 	-I$(top_srcdir)/library/\
 	-I$(top_srcdir)/backend -I$(top_srcdir)/generated
@@ -33,3 +33,7 @@ libgrtdbbe_la_SOURCES=\
 	../grtsqlparser/sql_parser_base.cpp\
 	../sqlide/recordset.cpp\
 	../sqlide/sql_editor.cpp
+
+libgrtdbbe_la_LIBADD=\
+	$(top_srcdir)/library/utilities/src/libguiutil.la\
+	@GLIB_LIBS@ @SIGC_LIBS@ @GRT_LIBS@ @PCRE_LIBS@


--- backend/workbench/Makefile.am.orig	2008-12-10 18:46:02 +0300
+++ backend/workbench/Makefile.am	2009-01-18 00:54:09 +0300
@@ -2,9 +2,9 @@
 
 noinst_LIBRARIES=libwbbe.a
 
-INCLUDES=@GLIB_CFLAGS@ @SIGC_CFLAGS@ @GRT_CFLAGS@ @CAIRO_CFLAGS@ @GNOME_CFLAGS@\
+libwbbe_a_CXXFLAGS=@GLIB_CFLAGS@ @SIGC_CFLAGS@ @GRT_CFLAGS@ @CAIRO_CFLAGS@ @GNOME_CFLAGS@ @PCRE_CFLAGS@ @ZIP_CFLAGS@\
 	-I$(top_srcdir)/library/grt/src -I$(top_srcdir)/library/utilities/src \
-  -I$(top_srcdir)/modules\
+	-I$(top_srcdir)/modules\
 	-I$(top_srcdir)/backend -I$(top_srcdir)/generated -I$(top_srcdir)/library/canvas/src\
 	-I$(top_srcdir)/library/cppconn/ -I$(top_srcdir)/library/dbc/src
 
@@ -36,3 +36,7 @@ libwbbe_a_SOURCES=\
 	wb_overview_physical_schema.cpp\
 	wb_overview_privileges.cpp\
 	wb_user_datatypes.cpp
+
+libwbbe_la_LIBADD=\
+	$(top_srcdir)/library/utilities/src/libguiutil.la\
+	@GLIB_LIBS@ @SIGC_LIBS@ @GRT_LIBS@ @CAIRO_LIBS@ @GNOME_CLAGS@ @PCRE_LIBS@ @ZIP_LIBS@


--- configure.in.orig	2008-12-10 18:46:02 +0300
+++ configure.in	2009-01-18 01:39:00 +0300
@@ -41,11 +41,14 @@ AC_CHECK_HEADERS([sys/select.h])
 AC_CHECK_HEADERS([tr1/unordered_set tr1/unordered_map])
 
 
-## apparently fedora has hacked the default install dir of ctemplate headers.........
-#AC_CHECK_HEADERS([ctemplate/template.h], AC_DEFINE(CTEMPLATE_NOT_IN_GOOGLE, [], [ctemplate headers not in standard location]) ,
-#	[ AC_CHECK_HEADERS([google/template.h], [],AC_MSG_ERROR(["ctemplate not found"])) ] )
-#AC_ARG_WITH(ctemplate-libs, [  --with-ctemplates-libs=<libdir> ], [], [ac_LIBS=-lctemplate])
-#CTEMPLATE_LIBS=$ac_LIBS
+# apparently fedora has hacked the default install dir of ctemplate headers.........
+CTEMPLATE_CFLAGS=
+AC_CHECK_HEADERS([ctemplate/template.h], AC_DEFINE(CTEMPLATE_NOT_IN_GOOGLE, [CTEMPLATE_CFLAGS=-I/usr/include/ctemplate], [ctemplate headers not in standard location]) ,
+	[ AC_CHECK_HEADERS([google/template.h], [CTEMPLATE_CFLAGS=-I/usr/include/google],AC_MSG_ERROR(["ctemplate not found"])) ] )
+AC_ARG_WITH(ctemplate-libs, [  --with-ctemplates-libs=<libdir> ], [], [ac_LIBS=-lctemplate])
+CTEMPLATE_LIBS=$ac_LIBS
+AC_SUBST(CTEMPLATE_CFLAGS)
+AC_SUBST(CTEMPLATE_LIBS)
 
 AC_ARG_ENABLE(pcheaders,
 [  --enable-pcheaders	enable precompiling of headers by GCC],


--- modules/db.mysql/Makefile.am.orig	2008-12-10 18:46:05 +0300
+++ modules/db.mysql/Makefile.am	2009-01-18 01:32:13 +0300
@@ -22,7 +22,7 @@ INCLUDES=-I$(top_srcdir)/generated -I$(t
                 -I$(top_srcdir)/library/sql-parser/include\
                 -I$(top_srcdir)/library/sql-parser/source\
                 -I$(top_srcdir)/ext/ctemplate/ctemplate-src/src\
-                @GRT_CFLAGS@ @GLIB_CFLAGS@ @SIGC_CFLAGS@
+                @CTEMPLATE_CFLAGS@ @GRT_CFLAGS@ @GLIB_CFLAGS@ @SIGC_CFLAGS@ @PCRE_CFLAGS@
 
 
 #db_mysql_grt_la_SOURCES=db_mysql_reveng.cpp\
@@ -32,7 +32,7 @@ INCLUDES=-I$(top_srcdir)/generated -I$(t
 #
 
 db_mysql_grt_la_LDFLAGS=-module
-db_mysql_grt_la_LIBADD=$(CTEMPLATE_LIBS)
+db_mysql_grt_la_LIBADD=@CTEMPLATE_LIBS@ @GRT_LIBS@ @PCRE_LIBS@
 #db_mysql_grt_la_LIBADD=$(top_srcdir)/backend/grtdb/libgrtdbbe.la 
 
 db_mysql_grt_la_SOURCES=src/db_mysql_catalog_report.cpp\

--- modules/wb.model/Makefile.am.orig	2008-12-10 18:46:05 +0300
+++ modules/wb.model/Makefile.am	2009-01-18 01:44:28 +0300
@@ -63,10 +63,11 @@ INCLUDES=-I$(top_srcdir)/generated\
 	-I$(top_srcdir)/backend/grtdb\
 	-I$(top_srcdir)/library/tinyxml\
 	-I$(top_srcdir)/ext/ctemplate/ctemplate-src/src\
-	@MYSQL_INCLUDE@ @GRT_CFLAGS@ @GLIB_CFLAGS@ @SIGC_CFLAGS@
+	@MYSQL_INCLUDE@ @GRT_CFLAGS@ @GLIB_CFLAGS@ @SIGC_CFLAGS@ @PCRE_CFLAGS@
 
 
 wb_model_grt_la_LDFLAGS=-module
+wb_model_grt_la_LIBADD=@PCRE_LIBS@
 #wb_model_grt_la_LIBADD=$(top_srcdir)/ext/ctemplate
 
 wb_model_grt_la_SOURCES=src/graph_renderer.cpp \

--- modules/wb.mysql.validation/Makefile.am.orig	2008-12-10 18:46:05 +0300
+++ modules/wb.mysql.validation/Makefile.am	2009-01-18 01:46:41 +0300
@@ -17,10 +17,11 @@ INCLUDES=-I$(top_srcdir)/generated\
 	-I$(top_srcdir)/library/sql-parser/source/linux\
 	-I$(top_srcdir)/backend/grtdb\
 	-I$(top_srcdir)/library/tinyxml\
-	@MYSQL_INCLUDE@ @GRT_CFLAGS@ @GLIB_CFLAGS@ @SIGC_CFLAGS@
+	@MYSQL_INCLUDE@ @GRT_CFLAGS@ @GLIB_CFLAGS@ @SIGC_CFLAGS@ @PCRE_CFLAGS@
 
 
 wb_mysql_validation_grt_la_LDFLAGS=-module
+wb_mysql_import_grt_la_LIBADD=@PCRE_LIBS@
 #wb_mysql_import_grt_la_LIBADD=$(top_srcdir)
 
 wb_mysql_validation_grt_la_SOURCES=src/register_plugin.cpp\


--- modules/db.mysql.sqlparser/Makefile.am.orig	2008-12-10 18:46:05 +0300
+++ modules/db.mysql.sqlparser/Makefile.am	2009-01-18 01:50:25 +0300
@@ -16,9 +16,10 @@ INCLUDES=\
 	-I$(top_srcdir)/library/sql-parser/source/linux\
 	-I$(top_srcdir)/backend/grtdb\
 	-I$(top_srcdir)/library/tinyxml\
-	@MYSQL_INCLUDE@ @GRT_CFLAGS@ @GLIB_CFLAGS@ @SIGC_CFLAGS@
+	@MYSQL_INCLUDE@ @GRT_CFLAGS@ @GLIB_CFLAGS@ @SIGC_CFLAGS@ @PCRE_CFLAGS@
 
 db_mysql_sqlparser_grt_la_LDFLAGS=-module
+db_mysql_sqlparser_grt_la_LIBADD=@PCRE_LIBS@
 db_mysql_sqlparser_grt_la_SOURCES=\
 	src/db.mysql.sqlparser.cpp\
 	src/mysql_invalid_sql_parser.cpp\

--- modules/wb.mysql.import/Makefile.am.orig	2008-12-10 18:46:05 +0300
+++ modules/wb.mysql.import/Makefile.am	2009-01-18 01:52:56 +0300
@@ -16,11 +16,11 @@ INCLUDES=\
 	-I$(top_srcdir)/library/sql-parser/source/linux\
 	-I$(top_srcdir)/backend/grtdb\
 	-I$(top_srcdir)/library/tinyxml\
-	@MYSQL_INCLUDE@ @GRT_CFLAGS@ @GLIB_CFLAGS@ @SIGC_CFLAGS@
+	@MYSQL_INCLUDE@ @GRT_CFLAGS@ @GLIB_CFLAGS@ @SIGC_CFLAGS@ @PCRE_CFLAGS@
 
 
 wb_mysql_import_grt_la_LDFLAGS=-module
-#wb_mysql_import_grt_la_LIBADD=
+wb_mysql_import_grt_la_LIBADD=@PCRE_LIBS@
 
 wb_mysql_import_grt_la_SOURCES=\
 	src/wb_mysql_import.cpp\

--- backend/wbcanvas/Makefile.am.orig	2008-12-10 18:46:02 +0300
+++ backend/wbcanvas/Makefile.am	2009-01-18 02:07:21 +0300
@@ -10,6 +10,10 @@ INCLUDES=@GLIB_CFLAGS@ @SIGC_CFLAGS@ @GR
 	-I$(top_srcdir)/library/canvas/src\
 	-I$(top_srcdir)/backend -I$(top_srcdir)/generated
 
+libcanvasbe_la_LIBADD=\
+	$(top_srcdir)/library/canvas/src/libmdcanvas.la \
+	@GLIB_LIBS@ @SIGC_LIBS@ @GRT_LIBS@ @CAIRO_LIBS@
+
 libcanvasbe_la_SOURCES=\
 	figure_common.cpp\
 	connection_figure.cpp\

--- frontend/linux/sqlide/Makefile.am.orig	2008-12-10 18:46:03 +0300
+++ frontend/linux/sqlide/Makefile.am	2009-01-18 02:22:45 +0300
@@ -3,7 +3,8 @@ CXXFLAGS+=-rdynamic
 
 pkglib_LTLIBRARIES=libsqlide.la
 
-INCLUDES=@GLIB_CFLAGS@ @SIGC_CFLAGS@ @GRT_CFLAGS@ @CAIRO_CFLAGS@ @GNOME_CFLAGS@\
+libsqlide_la_CXXFLAGS=\
+	@GLIB_CFLAGS@ @SIGC_CFLAGS@ @GRT_CFLAGS@ @CAIRO_CFLAGS@ @GNOME_CFLAGS@\
 	-I$(top_srcdir)/library/grt/src -I$(top_srcdir)/library/utilities/src \
 	-I$(top_srcdir)/backend -I$(top_srcdir)/generated -I$(top_srcdir)/library/canvas/src\
 	-I$(top_srcdir)/frontend/linux/gtk_utilities\
@@ -14,6 +15,10 @@ INCLUDES=@GLIB_CFLAGS@ @SIGC_CFLAGS@ @GR
 	-I$(top_srcdir)/library/forms/mforms\
 	-I$(top_srcdir)/ext/scintilla/include
 
+libsqlide_la_LIBADD=\
+	$(top_srcdir)/ext/scintilla/gtk/libscintilla.la \
+	@GLIB_LIBS@ @SIGC_LIBS@ @GRT_LIBS@ @GNOME_LIBS@
+	
 libsqlide_la_SOURCES=\
         sql_editor_fe.cpp\
         errors_list.cpp

--- ext/scintilla/gtk/Makefile.am.orig	2008-12-10 18:46:03 +0300
+++ ext/scintilla/gtk/Makefile.am	2009-01-18 02:35:14 +0300
@@ -45,3 +45,6 @@ libscintilla_la_SOURCES=\
     ../src/LexPerl.cxx\
     ../src/LexSQL.cxx\
     ../src/LexMSSQL.cxx
+
+libscintilla_la_LIBADD=\
+	@GNOME_LIBS@

--- library/canvas/src/Makefile.am.orig	2008-12-10 18:46:04 +0300
+++ library/canvas/src/Makefile.am	2009-01-18 02:41:15 +0300
@@ -50,6 +50,13 @@ libmdcanvasgtk_la_SOURCES=\
 
 INCLUDES=@CAIRO_CFLAGS@ @GNOME_CFLAGS@ -I$(top_srcdir)/backend 
 
+libmdcanvas_la_LIBADD=\
+	@CAIRO_LIBS@ @GNOME_LIBS@
+
+libmdcanvasgtk_la_LIBADD=\
+	libmdcanvas.la \
+	@CAIRO_LIBS@ @GNOME_LIBS@
+
 #mdc_prefix.h.gch: mdc_prefix.h
 #	$(CXX) $< $(INCLUDES) -o $@