[Debian-med-packaging] [SCM] The European Molecular Biology Open Software Suite. branch, master, updated. upstream/6.3.1-34-g5aae1dc

[Charles Plessy]

The following commit has been merged in the master branch:
commit 77b57cb66f92c4bff9e910ec37ece5faf89bf47d
Author: Charles Plessy <plessy at debian.org>
Date:   Tue Jul 20 15:33:34 2010 +0900

    Added support for MySQL and PostgreSQL.

diff --git a/debian/control b/debian/control
index b099a49..9c5f2ad 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 DM-Upload-Allowed: yes
 Uploaders: Charles Plessy <plessy at debian.org>, Nelson A. de Oliveira <naoliv at debian.org>
-Build-Depends: debhelper (>= 7), quilt, libx11-dev, x11proto-core-dev, libgdchart-gd2-xpm-dev, zlib1g-dev, libpng12-dev, libpcre3-dev, libexpat1-dev, antiword, sharutils, autotools-dev, tcsh | csh | c-shell
+Build-Depends: debhelper (>= 7), quilt, libx11-dev, x11proto-core-dev, libgdchart-gd2-xpm-dev, zlib1g-dev, libpng12-dev, libpcre3-dev, libexpat1-dev, libmysqlclient-dev, libpq-dev, antiword, sharutils, autotools-dev, tcsh | csh | c-shell
 Build-Depends-Indep: openjdk-6-jdk
 Vcs-Browser: http://git.debian.org/?p=debian-med/emboss.git
 Vcs-Git: git://git.debian.org/git/debian-med/emboss.git
diff --git a/debian/rules b/debian/rules
index 9ab19c5..f0e724c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,6 +23,11 @@ ifneq ($(wildcard /usr/lib/jvm/java-6-openjdk/include/classfile_constants.h),)
     CONFFLAGS += --with-javaos=/usr/lib/jvm/java-6-openjdk/include/linux
 endif
 
+DEB_LDFLAGS += -lexpat
+DEB_LDFLAGS += $(shell mysql_config --libs)
+DEB_LDFLAGS += -lpq
+#DEB_LDFLAGS += $(shell pg_config  | grep LIBS | cut -f2 -d=)
+
 config.status:
 	dh_testdir
 	ln -sf /usr/share/misc/config.sub .
@@ -34,7 +39,7 @@ include /usr/share/quilt/quilt.make
 build: config.status patch debian/copyright build-stamp
 build-stamp:
 	dh_testdir
-	$(MAKE) AJAX_FIXED_ROOT=\\\"/usr/share/EMBOSS\\\" LDFLAGS="-lexpat"
+	$(MAKE) AJAX_FIXED_ROOT=\\\"/usr/share/EMBOSS\\\" LDFLAGS="$(DEB_LDFLAGS)"
 	touch build-stamp
 
 # In order to use this rule you must install libemboss-acd-perl, xsltproc, docbook-xml and docbook-xsl

-- 
The European Molecular Biology Open Software Suite.