diff -Nurd virtuoso-opensource-6.1.0/appsrc/ODS-Wiki/plugin/Makefile.in virtuoso-opensource-6.1.0-patched/appsrc/ODS-Wiki/plugin/Makefile.in
--- virtuoso-opensource-6.1.0/appsrc/ODS-Wiki/plugin/Makefile.in	2010-02-03 15:54:18.000000000 -0500
+++ virtuoso-opensource-6.1.0-patched/appsrc/ODS-Wiki/plugin/Makefile.in	2010-03-27 14:35:11.000000000 -0400
@@ -343,11 +343,11 @@
 	wikilex.c \
 	$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c
 
-wikiv_la_CFLAGS = @VIRT_AM_CFLAGS@ -I$(top_srcdir)/libsrc \
+wikiv_la_CFLAGS = -I$(top_srcdir)/libsrc \
 	-I$(top_srcdir)/libsrc/Dk -I$(top_srcdir)/libsrc/Wi \
 	-I$(top_srcdir)/libsrc/odbcsdk/include \
 	-I$(top_srcdir)/libsrc/langfunc -I$(top_srcdir)/libsrc/plugin \
-	@ZLIB_INC@ -D_GNU_SOURCE -DGLOBALREF=extern -D_USRDLL
+	@VIRT_AM_CFLAGS@ @ZLIB_INC@ -D_GNU_SOURCE -DGLOBALREF=extern -D_USRDLL
 wikiv_la_LDFLAGS = $(LTFLAGS) -export-symbols wikiv.exp
 mediawiki_la_SOURCES = \
 	mediawiki.c \
@@ -355,11 +355,11 @@
 	media_wikilex.c \
 	$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c
 
-mediawiki_la_CFLAGS = @VIRT_AM_CFLAGS@ -I$(top_srcdir)/libsrc \
+mediawiki_la_CFLAGS = -I$(top_srcdir)/libsrc \
 	-I$(top_srcdir)/libsrc/Dk -I$(top_srcdir)/libsrc/Wi \
 	-I$(top_srcdir)/libsrc/odbcsdk/include \
 	-I$(top_srcdir)/libsrc/langfunc -I$(top_srcdir)/libsrc/plugin \
-	@ZLIB_INC@ -D_GNU_SOURCE -DGLOBALREF=extern -D_USRDLL
+	@VIRT_AM_CFLAGS@ @ZLIB_INC@ -D_GNU_SOURCE -DGLOBALREF=extern -D_USRDLL
 mediawiki_la_LDFLAGS = $(LTFLAGS) -export-symbols mediawiki.exp
 creolewiki_la_SOURCES = \
 	creolewiki.c \
@@ -367,11 +367,11 @@
 	creole_wikilex.c \
 	$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c
 
-creolewiki_la_CFLAGS = @VIRT_AM_CFLAGS@ -I$(top_srcdir)/libsrc \
+creolewiki_la_CFLAGS = -I$(top_srcdir)/libsrc \
 	-I$(top_srcdir)/libsrc/Dk -I$(top_srcdir)/libsrc/Wi \
 	-I$(top_srcdir)/libsrc/odbcsdk/include \
 	-I$(top_srcdir)/libsrc/langfunc -I$(top_srcdir)/libsrc/plugin \
-	@ZLIB_INC@ -D_GNU_SOURCE -DGLOBALREF=extern -D_USRDLL
+	@VIRT_AM_CFLAGS@ @ZLIB_INC@ -D_GNU_SOURCE -DGLOBALREF=extern -D_USRDLL
 creolewiki_la_LDFLAGS = $(LTFLAGS) -export-symbols creolewiki.exp
 BUILT_SOURCES = \
 	maclex.c \
diff -Nurd virtuoso-opensource-6.1.0/binsrc/driver/Makefile.in virtuoso-opensource-6.1.0-patched/binsrc/driver/Makefile.in
--- virtuoso-opensource-6.1.0/binsrc/driver/Makefile.in	2010-02-03 15:54:18.000000000 -0500
+++ virtuoso-opensource-6.1.0-patched/binsrc/driver/Makefile.in	2010-03-27 14:35:20.000000000 -0400
@@ -371,11 +371,11 @@
 DRIVER_DESC = OpenLink Virtuoso ODBC Driver
 noinst_LTLIBRARIES = libvirtodbc.la libvirtodbc_u.la
 lib_LTLIBRARIES = virtodbc.la virtodbc_r.la virtodbcu.la virtodbcu_r.la
-base_cflags = @VIRT_AM_CFLAGS@ -I$(top_srcdir)/libsrc \
+base_cflags = -I$(top_srcdir)/libsrc \
 	-I$(top_srcdir)/libsrc/Dk -I$(top_srcdir)/libsrc/Wi \
 	-I$(top_srcdir)/libsrc/odbcsdk/include \
 	-I$(top_srcdir)/libsrc/langfunc -I$(top_srcdir)/libsrc/plugin \
-	-DUNIX -DUNIX_ODBC -DDSN_TRANSLATION
+	@VIRT_AM_CFLAGS@ -DUNIX -DUNIX_ODBC -DDSN_TRANSLATION
 
 #
 #  Virtuoso ODBC Driver FLAGS and libraries
diff -Nurd virtuoso-opensource-6.1.0/binsrc/hosting/mono/Makefile.in virtuoso-opensource-6.1.0-patched/binsrc/hosting/mono/Makefile.in
--- virtuoso-opensource-6.1.0/binsrc/hosting/mono/Makefile.in	2010-02-03 15:54:19.000000000 -0500
+++ virtuoso-opensource-6.1.0-patched/binsrc/hosting/mono/Makefile.in	2010-03-27 14:35:32.000000000 -0400
@@ -414,11 +414,11 @@
 	sql_code_clr.c \
 	sql_code_xslt.c
 
-base_cflags = @VIRT_AM_CFLAGS@ -I$(top_srcdir)/libsrc \
+base_cflags = -I$(top_srcdir)/libsrc \
 	-I$(top_srcdir)/libsrc/Dk -I$(top_srcdir)/libsrc/Wi \
 	-I$(top_srcdir)/libsrc/plugin -I$(top_srcdir)/libsrc/langfunc \
 	-I$(top_srcdir)/libsrc/odbcsdk/include \
-	-I$(top_srcdir)/mono/include
+	-I$(top_srcdir)/mono/include @VIRT_AM_CFLAGS@
 virtuoso_iodbc_mono_cli_t_CFLAGS = $(base_cflags) -D_REENTRANT \
 	-pthread $(GLIB_CFLAGS) $(GMODULE_CFLAGS) -D_VIRTMONO -DMONO \
 	-DUSE_INCLUDED_LIBGC=1 -DNO_UDBC_SDK \
diff -Nurd virtuoso-opensource-6.1.0/binsrc/hosting/perl/Makefile.in virtuoso-opensource-6.1.0-patched/binsrc/hosting/perl/Makefile.in
--- virtuoso-opensource-6.1.0/binsrc/hosting/perl/Makefile.in	2010-02-03 15:54:19.000000000 -0500
+++ virtuoso-opensource-6.1.0-patched/binsrc/hosting/perl/Makefile.in	2010-03-27 15:38:34.000000000 -0400
@@ -322,9 +322,9 @@
 dist_hosting_perl_la_SOURCES = virt_handler.c
 BUILT_SOURCES = virt_handler.c
 CLEANFILES = virt_handler.c
-hosting_perl_la_CFLAGS = @VIRT_AM_CFLAGS@ -I$(top_srcdir)/libsrc \
+hosting_perl_la_CFLAGS = $(PERL_CFLAGS) -I$(top_srcdir)/libsrc \
 	-I$(top_srcdir)/libsrc/Dk -I$(top_srcdir)/libsrc/Wi \
-	-I$(top_srcdir)/libsrc/plugin $(PERL_CFLAGS)
+	-I$(top_srcdir)/libsrc/plugin @VIRT_AM_CFLAGS@
 hosting_perl_la_LDFLAGS = -module -avoid-version -export-dynamic \
 	$(PERL_LDFLAGS)
 
diff -Nurd virtuoso-opensource-6.1.0/binsrc/hosting/perl/hosting_perl.c virtuoso-opensource-6.1.0-patched/binsrc/hosting/perl/hosting_perl.c
--- virtuoso-opensource-6.1.0/binsrc/hosting/perl/hosting_perl.c	2007-05-04 08:45:19.000000000 -0400
+++ virtuoso-opensource-6.1.0-patched/binsrc/hosting/perl/hosting_perl.c	2010-03-28 11:13:18.000000000 -0400
@@ -166,7 +166,7 @@
       HOSTING_TITLE,			/*!< Title of unit, filled by unit */
       DBMS_SRV_GEN_MAJOR DBMS_SRV_GEN_MINOR,/*!< Version number, filled by unit */
       "OpenLink Software",			/*!< Plugin's developer, filled by unit */
-      "Perl " PERL_XS_APIVERSION " hosting plugin",			/*!< Any additional info, filled by unit */
+      "Perl hosting plugin",			/*!< Any additional info, filled by unit */
       NULL,					/*!< Error message, filled by unit loader */
       NULL,					/*!< Name of file with unit's code, filled by unit loader */
       hosting_perl_connect,		/*!< Pointer to connection function, cannot be NULL */
diff -Nurd virtuoso-opensource-6.1.0/binsrc/hosting/php/Makefile.in virtuoso-opensource-6.1.0-patched/binsrc/hosting/php/Makefile.in
--- virtuoso-opensource-6.1.0/binsrc/hosting/php/Makefile.in	2010-02-03 15:54:19.000000000 -0500
+++ virtuoso-opensource-6.1.0-patched/binsrc/hosting/php/Makefile.in	2010-03-27 14:35:54.000000000 -0400
@@ -320,10 +320,10 @@
 	hosting_php.c \
 	$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c
 
-hosting_php_la_CFLAGS = @VIRT_AM_CFLAGS@ -I$(top_srcdir)/libsrc \
+hosting_php_la_CFLAGS = -I$(top_srcdir)/libsrc \
 	-I$(top_srcdir)/libsrc/Dk -I$(top_srcdir)/libsrc/Wi \
 	-I$(top_srcdir)/libsrc/plugin -I$(top_srcdir)/libsrc/langfunc \
-	-I$(top_srcdir)/libsrc/odbcsdk/include $(php5_CFLAGS)
+	-I$(top_srcdir)/libsrc/odbcsdk/include @VIRT_AM_CFLAGS@ $(php5_CFLAGS)
 hosting_php_la_LDFLAGS = -module -avoid-version -export-dynamic \
 	-export-symbols hosting_php.exp
 
diff -Nurd virtuoso-opensource-6.1.0/binsrc/hosting/python/Makefile.in virtuoso-opensource-6.1.0-patched/binsrc/hosting/python/Makefile.in
--- virtuoso-opensource-6.1.0/binsrc/hosting/python/Makefile.in	2010-02-03 15:54:19.000000000 -0500
+++ virtuoso-opensource-6.1.0-patched/binsrc/hosting/python/Makefile.in	2010-03-27 14:36:03.000000000 -0400
@@ -324,10 +324,10 @@
 dist_hosting_python_la_SOURCES = virt_handler.c
 BUILT_SOURCES = virt_handler.c
 CLEANFILES = virt_handler.c
-hosting_python_la_CFLAGS = @VIRT_AM_CFLAGS@ -I$(top_srcdir)/libsrc \
+hosting_python_la_CFLAGS = -I$(top_srcdir)/libsrc \
 	-I$(top_srcdir)/libsrc/Dk -I$(top_srcdir)/libsrc/Wi \
 	-I$(top_srcdir)/libsrc/plugin -I$(top_srcdir)/libsrc/langfunc \
-	$(PYTHON_CFLAGS)
+	@VIRT_AM_CFLAGS@ $(PYTHON_CFLAGS)
 hosting_python_la_LDFLAGS = -module -avoid-version -export-dynamic \
 	$(PYTHON_LDFLAGS)
 
diff -Nurd virtuoso-opensource-6.1.0/binsrc/hosting/ruby/Makefile.in virtuoso-opensource-6.1.0-patched/binsrc/hosting/ruby/Makefile.in
--- virtuoso-opensource-6.1.0/binsrc/hosting/ruby/Makefile.in	2010-02-03 15:54:19.000000000 -0500
+++ virtuoso-opensource-6.1.0-patched/binsrc/hosting/ruby/Makefile.in	2010-03-27 14:36:11.000000000 -0400
@@ -324,10 +324,10 @@
 	ruby_io.c
 
 noinst_HEADERS = hosting_ruby.h
-hosting_ruby_la_CFLAGS = @VIRT_AM_CFLAGS@ -I$(top_srcdir)/libsrc \
+hosting_ruby_la_CFLAGS = -I$(top_srcdir)/libsrc \
 	-I$(top_srcdir)/libsrc/Dk -I$(top_srcdir)/libsrc/Wi \
 	-I$(top_srcdir)/libsrc/plugin -I$(top_srcdir)/libsrc/langfunc \
-	$(RUBY_CFLAGS)
+	@VIRT_AM_CFLAGS@ $(RUBY_CFLAGS)
 hosting_ruby_la_LDFLAGS = -module -avoid-version -export-dynamic \
 	$(RUBY_LDFLAGS)
 
diff -Nurd virtuoso-opensource-6.1.0/binsrc/maildrop/Makefile.in virtuoso-opensource-6.1.0-patched/binsrc/maildrop/Makefile.in
--- virtuoso-opensource-6.1.0/binsrc/maildrop/Makefile.in	2010-02-03 15:54:19.000000000 -0500
+++ virtuoso-opensource-6.1.0-patched/binsrc/maildrop/Makefile.in	2010-03-27 14:36:23.000000000 -0400
@@ -321,9 +321,9 @@
 noinst_HEADERS = sysexits.h
 BUILT_SOURCES = virt_mail_vers.c odbc_mail_vers.c
 CLEANFILES = virt_mail_vers.c odbc_mail_vers.c
-virt_mail_CFLAGS = @VIRT_AM_CFLAGS@ -DUDBC -I$(top_srcdir)/libsrc \
+virt_mail_CFLAGS = -DUDBC -I$(top_srcdir)/libsrc \
 	-I$(top_srcdir)/libsrc/Dk -I$(top_srcdir)/libsrc/Wi \
-	-I$(top_srcdir)/libsrc/odbcsdk/include
+	-I$(top_srcdir)/libsrc/odbcsdk/include @VIRT_AM_CFLAGS@
 virt_mail_LDADD = \
 	$(top_srcdir)/libsrc/util/libutil.la \
 	$(top_builddir)/libsrc/Wi/libwic.la \
@@ -336,9 +336,9 @@
 	odbc_mail.c \
 	odbc_mail_vers.c
 
-odbc_mail_CFLAGS = @VIRT_AM_CFLAGS@ -I$(top_srcdir)/libsrc \
+odbc_mail_CFLAGS = -I$(top_srcdir)/libsrc \
 	-I$(top_srcdir)/libsrc/Dk -I$(top_srcdir)/libsrc/Wi \
-	-I$(top_srcdir)/libsrc/odbcsdk/include
+	-I$(top_srcdir)/libsrc/odbcsdk/include @VIRT_AM_CFLAGS@
 odbc_mail_LDADD = \
 	$(top_srcdir)/libsrc/util/libutil.la \
 	$(top_builddir)/libsrc/Dk/libdk1t.la \
diff -Nurd virtuoso-opensource-6.1.0/binsrc/samples/demo/Makefile.in virtuoso-opensource-6.1.0-patched/binsrc/samples/demo/Makefile.in
--- virtuoso-opensource-6.1.0/binsrc/samples/demo/Makefile.in	2010-02-03 15:54:20.000000000 -0500
+++ virtuoso-opensource-6.1.0-patched/binsrc/samples/demo/Makefile.in	2010-03-28 11:40:20.000000000 -0400
@@ -767,7 +767,6 @@
 	mkdir -p "$(DESTDIR)$(dbdir)"
 	$(SHELL) install_ini.sh database
 @WITH_HTMLDOC_TRUE@	mkdir -p "$(DESTDIR)$(htmldocdir)"
-@WITH_HTMLDOC_TRUE@	$(INSTALL_DATA) $(top_srcdir)/docsrc/html_virt/*.html "$(DESTDIR)$(htmldocdir)"
 @WITH_HTMLDOC_TRUE@	mkdir -p "$(DESTDIR)$(htmldocdir)/../images"
 @WITH_HTMLDOC_TRUE@	(cd $(top_srcdir)/docsrc/images; find . -name \*.gif -print | cpio -dump "$(DESTDIR)$(htmldocdir)/../images")
 @WITH_HTMLDOC_TRUE@	(cd $(top_srcdir)/docsrc/images; find . -name \*.jpg -print | cpio -dump "$(DESTDIR)$(htmldocdir)/../images")
diff -Nurd virtuoso-opensource-6.1.0/binsrc/samples/hslookup/Makefile.in virtuoso-opensource-6.1.0-patched/binsrc/samples/hslookup/Makefile.in
--- virtuoso-opensource-6.1.0/binsrc/samples/hslookup/Makefile.in	2010-02-03 15:54:20.000000000 -0500
+++ virtuoso-opensource-6.1.0-patched/binsrc/samples/hslookup/Makefile.in	2010-03-27 14:36:34.000000000 -0400
@@ -321,11 +321,11 @@
 	hslookup.c \
 	$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c
 
-hslookup_la_CFLAGS = @VIRT_AM_CFLAGS@ -I$(top_srcdir)/libsrc \
+hslookup_la_CFLAGS = -I$(top_srcdir)/libsrc \
 	-I$(top_srcdir)/libsrc/Dk -I$(top_srcdir)/libsrc/Wi \
 	-I$(top_srcdir)/libsrc/odbcsdk/include \
 	-I$(top_srcdir)/libsrc/plugin -I$(top_srcdir)/libsrc/langfunc \
-	@ZLIB_INC@ $(HSL_CPPFLAGS) -D_GNU_SOURCE -DGLOBALREF=extern \
+	@VIRT_AM_CFLAGS@ @ZLIB_INC@ $(HSL_CPPFLAGS) -D_GNU_SOURCE -DGLOBALREF=extern \
 	-D_USRDLL
 hslookup_la_LDFLAGS = -module -avoid-version -export-dynamic -export-symbols hslookup.exp -no-undefined
 hslookup_la_LIBADD = $(HSL_LDFLAGS) $(HSL_LIBS)
diff -Nurd virtuoso-opensource-6.1.0/binsrc/samples/image_magick/Makefile.in virtuoso-opensource-6.1.0-patched/binsrc/samples/image_magick/Makefile.in
--- virtuoso-opensource-6.1.0/binsrc/samples/image_magick/Makefile.in	2010-02-03 15:54:20.000000000 -0500
+++ virtuoso-opensource-6.1.0-patched/binsrc/samples/image_magick/Makefile.in	2010-03-27 14:36:42.000000000 -0400
@@ -320,11 +320,11 @@
 	im.c \
 	$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c
 
-im_la_CFLAGS = @VIRT_AM_CFLAGS@ -I$(top_srcdir)/libsrc \
+im_la_CFLAGS = -I$(top_srcdir)/libsrc \
 	-I$(top_srcdir)/libsrc/Dk -I$(top_srcdir)/libsrc/Wi \
 	-I$(top_srcdir)/libsrc/odbcsdk/include \
 	-I$(top_srcdir)/libsrc/plugin -I$(top_srcdir)/libsrc/langfunc \
-	@ZLIB_INC@ $(IM_CPPFLAGS) -D_GNU_SOURCE -DGLOBALREF=extern \
+	@VIRT_AM_CFLAGS@ @ZLIB_INC@ $(IM_CPPFLAGS) -D_GNU_SOURCE -DGLOBALREF=extern \
 	-D_USRDLL
 im_la_LDFLAGS = -module -avoid-version -export-dynamic -export-symbols im.exp -no-undefined
 im_la_LIBADD = $(IM_LDFLAGS) $(IM_LIBS)
diff -Nurd virtuoso-opensource-6.1.0/binsrc/samples/wbxml2/Makefile.in virtuoso-opensource-6.1.0-patched/binsrc/samples/wbxml2/Makefile.in
--- virtuoso-opensource-6.1.0/binsrc/samples/wbxml2/Makefile.in	2010-02-03 15:54:21.000000000 -0500
+++ virtuoso-opensource-6.1.0-patched/binsrc/samples/wbxml2/Makefile.in	2010-03-27 14:36:49.000000000 -0400
@@ -321,11 +321,11 @@
 	wbxml2.c \
 	$(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c
 
-wbxml2_la_CFLAGS = @VIRT_AM_CFLAGS@ -I$(top_srcdir)/libsrc \
+wbxml2_la_CFLAGS = -I$(top_srcdir)/libsrc \
 	-I$(top_srcdir)/libsrc/Dk -I$(top_srcdir)/libsrc/Wi \
 	-I$(top_srcdir)/libsrc/odbcsdk/include \
 	-I$(top_srcdir)/libsrc/plugin -I$(top_srcdir)/libsrc/langfunc \
-	@ZLIB_INC@ $(WBXML2_CFLAGS) -D_GNU_SOURCE -DGLOBALREF=extern \
+	@VIRT_AM_CFLAGS@ @ZLIB_INC@ $(WBXML2_CFLAGS) -D_GNU_SOURCE -DGLOBALREF=extern \
 	-D_USRDLL
 wbxml2_la_LDFLAGS = -module -avoid-version -export-dynamic -no-undefined -export-symbols wbxml2.exp
 wbxml2_la_LIBADD = $(WBXML2_LDFLAGS) -lexpat
diff -Nurd virtuoso-opensource-6.1.0/binsrc/tests/Makefile.in virtuoso-opensource-6.1.0-patched/binsrc/tests/Makefile.in
--- virtuoso-opensource-6.1.0/binsrc/tests/Makefile.in	2010-02-03 15:54:22.000000000 -0500
+++ virtuoso-opensource-6.1.0-patched/binsrc/tests/Makefile.in	2010-03-27 14:36:57.000000000 -0400
@@ -517,11 +517,11 @@
 @WITH_IODBC_TRUE@IODBC_PROGS = isql-iodbc isqlw-iodbc 
 @WITH_IODBC_TRUE@NOINST_IODBC_PROGS = scroll-iodbc ins-iodbc getdata-iodbc burstoff-iodbc force_dbms_name-iodbc
 noinst_HEADERS = butils.h isql_tchar.h odbcinc.h odbcuti.h timeacct.h tpcc.h
-AM_CFLAGS = @VIRT_AM_CFLAGS@ -I$(top_srcdir)/libsrc \
+AM_CFLAGS = -I$(top_srcdir)/libsrc \
 	-I$(top_srcdir)/libsrc/Dk -I$(top_srcdir)/libsrc/Wi \
 	-I$(top_srcdir)/libsrc/odbcsdk/include \
 	-I$(top_srcdir)/libsrc/langfunc -I$(top_srcdir)/libsrc/plugin \
-	-DUNIX
+	-DUNIX @VIRT_AM_CFLAGS@
 server_libs = \
 	$(top_builddir)/libsrc/Dk/libdksrv.la \
 	$(top_builddir)/libsrc/Thread/libthrp.la \
diff -Nurd virtuoso-opensource-6.1.0/binsrc/tests/biftest/Makefile.in virtuoso-opensource-6.1.0-patched/binsrc/tests/biftest/Makefile.in
--- virtuoso-opensource-6.1.0/binsrc/tests/biftest/Makefile.in	2010-02-03 15:54:22.000000000 -0500
+++ virtuoso-opensource-6.1.0-patched/binsrc/tests/biftest/Makefile.in	2010-03-27 14:37:04.000000000 -0400
@@ -349,11 +349,11 @@
 @WITH_IODBC_TRUE@IODBC_EXTRA = virtuoso-iodbc-sample-t
 @INTEG_JDK_TRUE@INTEG_JDK_PROGS = virtuoso-javavm-t
 @INTEG_JDK_TRUE@@WITH_IODBC_TRUE@IODBC_JDK_EXTRA = virtuoso-iodbc-javavm_t
-base_cflags = @VIRT_AM_CFLAGS@ -I$(top_srcdir)/libsrc \
+base_cflags = -I$(top_srcdir)/libsrc \
 	-I$(top_srcdir)/libsrc/Dk -I$(top_srcdir)/libsrc/Wi \
 	-I$(top_srcdir)/libsrc/odbcsdk/include \
 	-I$(top_srcdir)/libsrc/langfunc -I$(top_srcdir)/libsrc/plugin \
-	-DUNIX
+	-DUNIX @VIRT_AM_CFLAGS@
 TESTS = thook.sh
 BUILT_SOURCES = sql_code_javavm.c sql_code_clr.c sql_code_xslt.c
 CLEANFILES = \
diff -Nurd virtuoso-opensource-6.1.0/binsrc/virtuoso/Makefile.in virtuoso-opensource-6.1.0-patched/binsrc/virtuoso/Makefile.in
--- virtuoso-opensource-6.1.0/binsrc/virtuoso/Makefile.in	2010-02-03 15:54:24.000000000 -0500
+++ virtuoso-opensource-6.1.0-patched/binsrc/virtuoso/Makefile.in	2010-03-27 14:37:15.000000000 -0400
@@ -408,10 +408,10 @@
 @WITH_IODBC_TRUE@VIRTUOSO_BIN = virtuoso-iodbc-t
 lib_LTLIBRARIES = libvirtuoso-t.la $(IODBC_LIBS) $(MONO_LIBS) $(IODBC_MONO_LIBS)
 noinst_SCRIPTS = virtuoso
-virtuoso_base_cflags = @VIRT_AM_CFLAGS@ -I$(top_srcdir)/libsrc \
+virtuoso_base_cflags = -I$(top_srcdir)/libsrc \
 	-I$(top_srcdir)/libsrc/Dk -I$(top_srcdir)/libsrc/Wi \
 	-I$(top_srcdir)/libsrc/odbcsdk/include \
-	-I$(top_srcdir)/libsrc/plugin -I$(top_srcdir)/libsrc/langfunc
+	-I$(top_srcdir)/libsrc/plugin -I$(top_srcdir)/libsrc/langfunc @VIRT_AM_CFLAGS@
 server_libs = \
 	$(top_builddir)/libsrc/Dk/libdksrv.la \
 	$(top_builddir)/libsrc/Thread/$(THRP).la \
diff -Nurd virtuoso-opensource-6.1.0/libsrc/Dk/Makefile.in virtuoso-opensource-6.1.0-patched/libsrc/Dk/Makefile.in
--- virtuoso-opensource-6.1.0/libsrc/Dk/Makefile.in	2010-02-03 15:54:26.000000000 -0500
+++ virtuoso-opensource-6.1.0-patched/libsrc/Dk/Makefile.in	2010-03-27 14:37:27.000000000 -0400
@@ -354,7 +354,7 @@
 	Dkstubs.c \
 	Dkernel.c
 
-libdksrv_la_CFLAGS = @VIRT_AM_CFLAGS@ -I$(top_srcdir)/libsrc
+libdksrv_la_CFLAGS = -I$(top_srcdir)/libsrc @VIRT_AM_CFLAGS@
 libdksrv_la_LDFLAGS = -prefer-pic
 
 #############################################
@@ -381,7 +381,7 @@
 	Dkstubs.c \
 	Dkstkern.c
 
-libdk1t_la_CFLAGS = @VIRT_AM_CFLAGS@ -I$(top_srcdir)/libsrc
+libdk1t_la_CFLAGS = -I$(top_srcdir)/libsrc @VIRT_AM_CFLAGS@
 libdk1t_la_LDFLAGS = -prefer-pic
 
 # ----------------------------------------------------------------------
diff -Nurd virtuoso-opensource-6.1.0/libsrc/Thread/Makefile.in virtuoso-opensource-6.1.0-patched/libsrc/Thread/Makefile.in
--- virtuoso-opensource-6.1.0/libsrc/Thread/Makefile.in	2010-02-03 15:54:27.000000000 -0500
+++ virtuoso-opensource-6.1.0-patched/libsrc/Thread/Makefile.in	2010-03-27 14:37:35.000000000 -0400
@@ -321,11 +321,11 @@
 vaddir = @vaddir@
 @WITH_PTHREADS_TRUE@THRP = libthrp.la
 @HAVE_MONO_TRUE@@WITH_PTHREADS_TRUE@libthrp_gc_la_CFLAGS =  \
-@HAVE_MONO_TRUE@@WITH_PTHREADS_TRUE@	@VIRT_AM_CFLAGS@ \
 @HAVE_MONO_TRUE@@WITH_PTHREADS_TRUE@	-I$(top_srcdir)/binsrc/mono/mono-1.1.7/libgc/include \
 @HAVE_MONO_TRUE@@WITH_PTHREADS_TRUE@	-I$(top_srcdir)/libsrc \
 @HAVE_MONO_TRUE@@WITH_PTHREADS_TRUE@	-I$(top_srcdir)/libsrc/Dk \
 @HAVE_MONO_TRUE@@WITH_PTHREADS_TRUE@	-DNO_UDBC_SDK \
+@HAVE_MONO_TRUE@@WITH_PTHREADS_TRUE@	@VIRT_AM_CFLAGS@ \
 @HAVE_MONO_TRUE@@WITH_PTHREADS_TRUE@	-DUSE_INCLUDED_LIBGC=1
 @HAVE_MONO_TRUE@@WITH_PTHREADS_TRUE@THRP_GC = libthrp_gc.la
 noinst_LTLIBRARIES = libthrs.la $(THRP) $(THRP_GC)
diff -Nurd virtuoso-opensource-6.1.0/libsrc/Tidy/Makefile.in virtuoso-opensource-6.1.0-patched/libsrc/Tidy/Makefile.in
--- virtuoso-opensource-6.1.0/libsrc/Tidy/Makefile.in	2010-02-03 15:54:27.000000000 -0500
+++ virtuoso-opensource-6.1.0-patched/libsrc/Tidy/Makefile.in	2010-03-27 14:37:48.000000000 -0400
@@ -313,8 +313,8 @@
 	tags.c \
 	tidy.c
 
-libtidy_la_CFLAGS = @VIRT_AM_CFLAGS@ -I$(top_srcdir)/libsrc \
-	-I$(top_srcdir)/libsrc/Dk
+libtidy_la_CFLAGS = -I$(top_srcdir)/libsrc \
+	-I$(top_srcdir)/libsrc/Dk @VIRT_AM_CFLAGS@
 
 # ----------------------------------------------------------------------
 #
diff -Nurd virtuoso-opensource-6.1.0/libsrc/Wi/Makefile.in virtuoso-opensource-6.1.0-patched/libsrc/Wi/Makefile.in
--- virtuoso-opensource-6.1.0/libsrc/Wi/Makefile.in	2010-02-03 15:54:29.000000000 -0500
+++ virtuoso-opensource-6.1.0-patched/libsrc/Wi/Makefile.in	2010-03-27 14:33:16.000000000 -0400
@@ -725,11 +725,11 @@
 	xpathp.c xpf.c xqf.c xslt.c xslt_fmt.c xslt_opt.c $(LDAP_BIF) \
 	$(KRB_BIF) $(IMSG_BIF) bif_xper.c 2pc.c bif_repl.c bif_xml.c \
 	odbccat.c sqlrbuf.c sqlrcomp.c sqlrrun.c wi_xid.c
-libwi_base_la_cflags = @VIRT_AM_CFLAGS@ -I$(top_srcdir)/libsrc \
+libwi_base_la_cflags = -I$(top_srcdir)/libsrc \
 	-I$(top_srcdir)/libsrc/Dk @ZLIB_INC@ -I$(srcdir) \
 	-I$(top_srcdir)/libsrc/langfunc -I$(top_srcdir)/libsrc/plugin \
 	-I$(top_srcdir)/libsrc/Tidy -I$(top_srcdir)/libsrc/Xml.new \
-	-I$(top_srcdir)/libsrc/odbcsdk/include -DVAD -DDBP -DBIF_XPER \
+	-I$(top_srcdir)/libsrc/odbcsdk/include @VIRT_AM_CFLAGS@ -DVAD -DDBP -DBIF_XPER \
 	-DOPSYS=\"@OPSYS@\" -DHOST=\"@host@\"
 libwi_base_la_ldlags = -static
 libwi_la_CFLAGS = $(libwi_base_la_cflags)
@@ -739,10 +739,10 @@
 libwic_la_SOURCES = blobio.c CLIcr.c CLIodbc3.c CLIsql1.c CLIsql2.c \
 	CLIsql3.c CLIsql3W.c CLIuti.c CLIw.c datesupp.c multibyte.c \
 	numeric.c wirpc.c wi_xid.c $(PLDEBUG_CLI_FILES)
-libwic_la_CFLAGS = @VIRT_AM_CFLAGS@ -I$(top_srcdir)/libsrc \
+libwic_la_CFLAGS = -I$(top_srcdir)/libsrc \
 	-I$(top_srcdir)/libsrc/Dk -I$(top_srcdir)/libsrc/plugin \
 	-I$(top_srcdir)/libsrc/langfunc \
-	-I$(top_srcdir)/libsrc/odbcsdk/include
+	-I$(top_srcdir)/libsrc/odbcsdk/include @VIRT_AM_CFLAGS@
 libwic_la_LDLAGS = -static
 
 ###################################################################
diff -Nurd virtuoso-opensource-6.1.0/libsrc/zlib/Makefile.in virtuoso-opensource-6.1.0-patched/libsrc/zlib/Makefile.in
--- virtuoso-opensource-6.1.0/libsrc/zlib/Makefile.in	2010-02-03 15:54:30.000000000 -0500
+++ virtuoso-opensource-6.1.0-patched/libsrc/zlib/Makefile.in	2010-03-27 14:38:02.000000000 -0400
@@ -327,8 +327,8 @@
 	uncompr.c \
 	zutil.c
 
-libz_la_CFLAGS = @VIRT_AM_CFLAGS@ -I$(top_srcdir)/libsrc \
-	-I$(top_srcdir)/libsrc/Dk
+libz_la_CFLAGS = -I$(top_srcdir)/libsrc \
+	-I$(top_srcdir)/libsrc/Dk @VIRT_AM_CFLAGS@
 libz_la_LDFLAGS = -prefer-pic
 
 # ----------------------------------------------------------------------
