rpms/virtuoso-opensource/F-11 virtuoso-opensource-6.1.0-external_iodbc.patch, NONE, 1.1 virtuoso-opensource-6.1.0-nodemos_buildfix.patch, NONE, 1.1 virtuoso-opensource-5.0.12-zlib.patch, 1.1, NONE

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/virtuoso-opensource/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25575

Added Files:
	virtuoso-opensource-6.1.0-external_iodbc.patch 
	virtuoso-opensource-6.1.0-nodemos_buildfix.patch 
Removed Files:
	virtuoso-opensource-5.0.12-zlib.patch 
Log Message:
update patches


virtuoso-opensource-6.1.0-external_iodbc.patch:
 configure    |    4 ++--
 configure.in |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE virtuoso-opensource-6.1.0-external_iodbc.patch ---
diff -up virtuoso-opensource-6.1.0/configure.external_iodbc virtuoso-opensource-6.1.0/configure
--- virtuoso-opensource-6.1.0/configure.external_iodbc	2010-02-03 14:54:32.000000000 -0600
+++ virtuoso-opensource-6.1.0/configure	2010-02-04 08:16:53.058591521 -0600
@@ -26773,7 +26773,7 @@ _ACEOF
 #
 if test "x$virt_do_iodbc" = "xyes"
 then
-    iodbc_CPPFLAGS="-I$virt_iodbc_dir/include"
+    iodbc_CPPFLAGS=`pkg-config --cflags libiodbc`
 
     saved_CPPFLAGS="$CPPFLAGS"
     CPPFLAGS="$iodbc_CPPFLAGS $CPPFLAGS"
@@ -26936,7 +26936,7 @@ done
 
     ccincl="$iodbc_CPPFLAGS $ccincl"
 
-    iodbc_LDFLAGS="-L$virt_iodbc_dir/lib -liodbc -liodbcinst $LIBDL"
+    iodbc_LDFLAGS=`pkg-config --libs libiodbc`
     { $as_echo "$as_me:$LINENO: checking for SQLTables in -liodbc" >&5
 $as_echo_n "checking for SQLTables in -liodbc... " >&6; }
 if test "${ac_cv_lib_iodbc_SQLTables+set}" = set; then
diff -up virtuoso-opensource-6.1.0/configure.in.external_iodbc virtuoso-opensource-6.1.0/configure.in
--- virtuoso-opensource-6.1.0/configure.in.external_iodbc	2010-02-03 14:49:18.000000000 -0600
+++ virtuoso-opensource-6.1.0/configure.in	2010-02-04 08:16:51.265605024 -0600
@@ -1833,7 +1833,7 @@ AC_DEFINE(NO_UDBC_SDK,1, [Define if usin
 #
 if test "x$virt_do_iodbc" = "xyes"
 then
-    iodbc_CPPFLAGS="-I$virt_iodbc_dir/include"
+    iodbc_CPPFLAGS=`pkg-config --cflags libiodbc`
 
     saved_CPPFLAGS="$CPPFLAGS"
     CPPFLAGS="$iodbc_CPPFLAGS $CPPFLAGS"
@@ -1842,7 +1842,7 @@ then
 
     ccincl="$iodbc_CPPFLAGS $ccincl"
 
-    iodbc_LDFLAGS="-L$virt_iodbc_dir/lib -liodbc -liodbcinst $LIBDL"
+    iodbc_LDFLAGS=`pkg-config --libs libiodbc`
     AC_CHECK_LIB(iodbc, SQLTables,
 		 [
 		  virt_do_iodbc="yes"

virtuoso-opensource-6.1.0-nodemos_buildfix.patch:
 samples/demo/Makefile.am |    2 ++
 vsp/Makefile.am          |    2 ++
 2 files changed, 4 insertions(+)

--- NEW FILE virtuoso-opensource-6.1.0-nodemos_buildfix.patch ---
diff -up virtuoso-opensource-6.1.0/binsrc/samples/demo/Makefile.am.nodemos_buildfix virtuoso-opensource-6.1.0/binsrc/samples/demo/Makefile.am
--- virtuoso-opensource-6.1.0/binsrc/samples/demo/Makefile.am.nodemos_buildfix	2009-08-31 03:08:47.000000000 -0500
+++ virtuoso-opensource-6.1.0/binsrc/samples/demo/Makefile.am	2010-02-04 11:51:33.650603771 -0600
@@ -164,6 +164,7 @@ install-data-local:
 	chmod +x install_ini.sh
 	mkdir -p "$(DESTDIR)$(dbdir)"
 	$(SHELL) install_ini.sh database
+if WITH_DEMO_VAD
 if WITH_HTMLDOC
 	mkdir -p "$(DESTDIR)$(htmldocdir)"
 	$(INSTALL_DATA) $(top_srcdir)/docsrc/html_virt/*.html "$(DESTDIR)$(htmldocdir)"
@@ -173,6 +174,7 @@ if WITH_HTMLDOC
 	(cd $(top_srcdir)/docsrc/images; find . -name \*.png -print | cpio -dump "$(DESTDIR)$(htmldocdir)/../images")
 	(cd $(top_srcdir)/docsrc/images; find . -name \*.ico -print | cpio -dump "$(DESTDIR)$(htmldocdir)/../images")
 endif
+endif
 
 uninstall-local:
 	rm -f "$(DESTDIR)$(dbdir)/virtuoso.ini"
diff -up virtuoso-opensource-6.1.0/binsrc/vsp/Makefile.am.nodemos_buildfix virtuoso-opensource-6.1.0/binsrc/vsp/Makefile.am
--- virtuoso-opensource-6.1.0/binsrc/vsp/Makefile.am.nodemos_buildfix	2008-04-15 16:47:43.000000000 -0500
+++ virtuoso-opensource-6.1.0/binsrc/vsp/Makefile.am	2010-02-04 11:57:45.894591421 -0600
@@ -24,6 +24,7 @@
 #dist_httproot_DATA = *.html *.css *.txt
 
 install-data-local:
+if WITH_DEMO_VAD
 	@echo Installing in "$(httprootdir)" 
 	mkdir -p "$(DESTDIR)$(httprootdir)"
 	mkdir -p "$(DESTDIR)$(httprootdir)"/images
@@ -37,6 +38,7 @@ install-data-local:
 	$(INSTALL_DATA) images/*.png "$(DESTDIR)$(httprootdir)"/images
 	$(INSTALL_DATA) images/*.jpg "$(DESTDIR)$(httprootdir)"/images
 	$(INSTALL_DATA) vsmx/*.* "$(DESTDIR)$(httprootdir)"/vsmx
+endif
 
 
 uninstall-local:


--- virtuoso-opensource-5.0.12-zlib.patch DELETED ---