* [gentoo-commits] proj/sci:master commit in: sci-biology/embassy-domsearch/files/, sci-biology/embassy-domsearch/
@ 2011-03-10 19:00 Justin Lecher
0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher @ 2011-03-10 19:00 UTC (permalink / raw
To: gentoo-commits
commit: a23ede41ca8cfe2090e9e202c11cf7e90e679553
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 10 15:18:16 2011 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Mar 10 15:18:16 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=a23ede41
Move to new embassy-ng.eclass
(Portage version: 2.2.0_alpha26/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 70EB7916)
---
sci-biology/embassy-domsearch/ChangeLog | 95 +++++++++++++++++++
.../embassy-domsearch-0.1.0-r5.ebuild | 10 ++
.../files/embassy-domsearch-0.1.0-r5.patch | 99 ++++++++++++++++++++
sci-biology/embassy-domsearch/metadata.xml | 5 +
4 files changed, 209 insertions(+), 0 deletions(-)
diff --git a/sci-biology/embassy-domsearch/ChangeLog b/sci-biology/embassy-domsearch/ChangeLog
new file mode 100644
index 0000000..9917ea2
--- /dev/null
+++ b/sci-biology/embassy-domsearch/ChangeLog
@@ -0,0 +1,95 @@
+# ChangeLog for sci-biology/embassy-domsearch
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/embassy-domsearch/ChangeLog,v 1.19 2010/01/01 21:53:24 fauli Exp $
+
+*embassy-domsearch-0.1.0-r5 (10 Mar 2011)
+
+ 10 Mar 2011; Justin Lecher <jlec@gentoo.org>
+ +embassy-domsearch-0.1.0-r5.ebuild, +files/embassy-domsearch-0.1.0-r5.patch,
+ +metadata.xml:
+ Move to new embassy-ng.eclass
+
+ 01 Jan 2010; Christian Faulhammer <fauli@gentoo.org>
+ embassy-domsearch-0.1.0-r4.ebuild:
+ Transfer Prefix keywords
+
+ 01 Sep 2009; Olivier Fisette <ribosome@gentoo.org> metadata.xml:
+ Giving up maintainership of this package.
+
+*embassy-domsearch-0.1.0-r4 (01 Sep 2009)
+
+ 01 Sep 2009; Olivier Fisette <ribosome@gentoo.org>
+ +embassy-domsearch-0.1.0-r4.ebuild:
+ Updated version for EMBASSY 6.1.0.
+
+ 01 Sep 2009; Olivier Fisette <ribosome@gentoo.org>
+ embassy-domsearch-0.1.0-r3.ebuild:
+ Stabilised on amd64 and x86.
+
+ 27 Aug 2008; Olivier Fisette <ribosome@gentoo.org>
+ -embassy-domsearch-0.1.0-r2.ebuild:
+ Pruning version that will never be stabilised.
+
+*embassy-domsearch-0.1.0-r3 (27 Aug 2008)
+
+ 27 Aug 2008; Olivier Fisette <ribosome@gentoo.org>
+ +embassy-domsearch-0.1.0-r3.ebuild:
+ New upstream version/package for EMBASSY 6.0.1.
+
+*embassy-domsearch-0.1.0-r2 (18 Jul 2007)
+
+ 18 Jul 2007; Olivier Fisette <ribosome@gentoo.org>
+ +embassy-domsearch-0.1.0-r2.ebuild:
+ New upstream packaging for EMBOSS 5.0.0.
+
+ 15 Feb 2007; Jeff Gardner <je_fro@gentoo.org>
+ embassy-domsearch-0.1.0-r1.ebuild:
+ Added ~amd64.
+
+ 10 Dec 2006; Olivier Fisette <ribosome@gentoo.org>
+ -embassy-domsearch-0.1.0.ebuild:
+ Pruning old version.
+
+ 03 Nov 2006; nixnut <nixnut@gentoo.org> embassy-domsearch-0.1.0-r1.ebuild:
+ Stable on ppc wrt bug 153766
+
+ 03 Nov 2006; Fabian Groffen <grobian@gentoo.org>
+ embassy-domsearch-0.1.0.ebuild, embassy-domsearch-0.1.0-r1.ebuild:
+ Dropped ppc-macos, see you in prefix.
+
+ 03 Nov 2006; Jeff Gardner <je_fro@gentoo.org>
+ embassy-domsearch-0.1.0-r1.ebuild:
+ Added ~sparc
+
+ 02 Nov 2006; Olivier Fisette <ribosome@gentoo.org>
+ embassy-domsearch-0.1.0-r1.ebuild:
+ Added to x86.
+
+*embassy-domsearch-0.1.0-r1 (21 Jul 2006)
+
+ 21 Jul 2006; Olivier Fisette <ribosome@gentoo.org>
+ +embassy-domsearch-0.1.0-r1.ebuild:
+ New upstream version building against EMBOSS 4.0.0.
+
+ 20 Jul 2006; Olivier Fisette <ribosome@gentoo.org>
+ embassy-domsearch-0.1.0.ebuild:
+ Fixed download URL (silent upstream repackaging).
+
+ 03 Oct 2005; Olivier Fisette <ribosome@gentoo.org>
+ embassy-domsearch-0.1.0.ebuild:
+ Stable on ppc-macos (with j4rg0n's permission, bug #102420).
+
+ 02 Oct 2005; Michael Hanselmann <hansmi@gentoo.org>
+ embassy-domsearch-0.1.0.ebuild:
+ Stable on ppc.
+
+ 21 Sep 2005; Olivier Fisette <ribosome@gentoo.org>
+ embassy-domsearch-0.1.0.ebuild:
+ Added to x86.
+
+*embassy-domsearch-0.1.0 (07 Aug 2005)
+
+ 07 Aug 2005; Olivier Fisette <ribosome@gentoo.org> +metadata.xml,
+ +embassy-domsearch-0.1.0.ebuild:
+ Initial import. Part of EMBASSY 3.0.0.
+
diff --git a/sci-biology/embassy-domsearch/embassy-domsearch-0.1.0-r5.ebuild b/sci-biology/embassy-domsearch/embassy-domsearch-0.1.0-r5.ebuild
new file mode 100644
index 0000000..b46bfb2
--- /dev/null
+++ b/sci-biology/embassy-domsearch/embassy-domsearch-0.1.0-r5.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/embassy-domsearch/embassy-domsearch-0.1.0-r4.ebuild,v 1.2 2010/01/01 21:53:24 fauli Exp $
+
+EBOV="6.3.1"
+EBO_DESCRIPTION="Protein domain search add-on package"
+
+inherit embassy-ng
+
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-linux ~ppc-macos"
diff --git a/sci-biology/embassy-domsearch/files/embassy-domsearch-0.1.0-r5.patch b/sci-biology/embassy-domsearch/files/embassy-domsearch-0.1.0-r5.patch
new file mode 100644
index 0000000..303293c
--- /dev/null
+++ b/sci-biology/embassy-domsearch/files/embassy-domsearch-0.1.0-r5.patch
@@ -0,0 +1,99 @@
+diff --git a/Makefile.am b/Makefile.am
+index 6bfb6f0..d547b12 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,5 +1,6 @@
+ #
+
++ACLOCAL_AMFLAGS = -I m4
+ SUBDIRS = src emboss_acd emboss_doc
+
+ EXTRA_DIST = depcomp ltmain.sh install-sh config.sub config.guess
+diff --git a/configure.in b/configure.in
+index 8cce01f..7eb5148 100644
+--- a/configure.in
++++ b/configure.in
+@@ -187,15 +187,6 @@ AC_PROG_INSTALL
+ AC_PROG_LN_S
+ AC_PROG_MAKE_SET
+
+-dnl Intel MacOSX 10.6 puts X11 in a non-standard place
+-if test "${with_x}" != "no" ; then
+-if test "`uname -a | grep Darwin`"; then
+-OSXX=`sw_vers -productVersion | sed 's/\(10\.[[0-9]]*\).*/\1/'`
+-if test ${OSXX} '>' '10.4'; then
+-CFLAGS="$CFLAGS -I/usr/X11/include -L/usr/X11/lib"
+-fi
+-fi
+-fi
+
+ dnl Check for header files
+ AC_PATH_XTRA
+@@ -250,8 +241,8 @@ AX_LIB_POSTGRESQL
+ CFLAGS="$CFLAGS $MYSQL_CFLAGS"
+ LDFLAGS="$LDFLAGS $MYSQL_LDFLAGS"
+
+-CFLAGS="$CFLAGS $POSTGRESQL_CFLAGS"
+-LDFLAGS="$LDFLAGS $POSTGRESQL_LDFLAGS"
++CFLAGS="$POSTGRESQL_CFLAGS $CFLAGS"
++LDFLAGS="$POSTGRESQL_LDFLAGS $LDFLAGS"
+
+
+ dnl "Export" these variables for PCRE
+@@ -386,9 +377,30 @@ AC_ARG_ENABLE(systemlibs,
+ AS_HELP_STRING([--enable-systemlibs], [Use system versions of zlib/expat]))
+ if test "${enable_systemlibs}" = "yes" ; then
+ have_systemlibs=yes
++ DEFINE_USE_SYSTEM_PCRE="#define"
++ PKG_CHECK_MODULES([PLPLOT], [plplotd])
++ PKG_CHECK_MODULES([ZLIB], [zlib])
++else
++ dnl X11 is only used by plplot
++ dnl Intel MacOSX 10.6 puts X11 in a non-standard place
++ if test "${with_x}" != "no" ; then
++ if test "`uname -a | grep Darwin`"; then
++ OSXX=`sw_vers -productVersion | sed 's/\(10\.[[0-9]]*\).*/\1/'`
++ if test ${OSXX} '>' '10.4'; then
++ CFLAGS="$CFLAGS -I/usr/X11/include -L/usr/X11/lib"
++ fi
++ fi
++ fi
++ if test "${with_x}" != "no" ; then
++ LF_EMBOSS_PATH_XLIB
++ fi
++ AC_MSG_NOTICE(USING bundled LIBS)
+ fi
+ AM_CONDITIONAL(ESYSTEMLIBS, test "$have_systemlibs" = "yes")
+ AC_SUBST(ESYSTEMLIBS)
++AC_SUBST(DEFINE_USE_SYSTEM_PCRE)
++AC_SUBST(PLPLOT_CFLAGS)
++AC_SUBST(PLPLOT_LIBS)
+
+
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index c8c5fd7..9652a64 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -17,9 +17,9 @@ INCLUDES = -I../../../nucleus -I../../../ajax/pcre \
+ -I../../../ajax/ensembl -I../../../ajax/ajaxdb \
+ -I../../../ajax/acd -I../../../plplot
+ else
+-INCLUDES = -I${embprefix}/include -I${embprefix}/include/eplplot \
+- $(NLINCLUDES) \
+- -I${embprefix}/include/epcre
++INCLUDES = -I${embprefix}/include $(PLPLOT_CFLAGS) \
++ $(NLINCLUDES) -I${embprefix}/include/emboss \
++ -I${embprefix}/include/pcre
+ endif
+
+ if ISSHARED
+@@ -61,6 +61,6 @@ LDADD = ../../../nucleus/libnucleus.la ../../../ajax/acd/libacd.la \
+ ../../../ajax/pcre/libepcre.la \
+ ../../../plplot/libeplplot.la $(XLIB)
+ else
+-LDADD = -L${embprefix}/lib -lnucleus -lacd -lajaxdb -lensembl -lajaxg \
+- -lajax -lepcre $(NLADD) -leplplot $(XLIB)
++LDADD = -lnucleus -lacd -lajaxdb -lensembl -lajaxg \
++ -lajax -lpcre $(NLADD) $(PLPLOT_LIBS) $(XLIB)
+ endif
diff --git a/sci-biology/embassy-domsearch/metadata.xml b/sci-biology/embassy-domsearch/metadata.xml
new file mode 100644
index 0000000..d464821
--- /dev/null
+++ b/sci-biology/embassy-domsearch/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>sci-biology</herd>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 2+ messages in thread* [gentoo-commits] proj/sci:master commit in: sci-biology/embassy-domsearch/files/, sci-biology/embassy-domsearch/
@ 2011-03-20 16:28 Justin Lecher
0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher @ 2011-03-20 16:28 UTC (permalink / raw
To: gentoo-commits
commit: 05b9422a0583afc77f738bd1e93c983885e3a06f
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 19 19:37:28 2011 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Mar 19 19:37:28 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=05b9422a
Fixed for reviewed eclass
(Portage version: 2.2.0_alpha28/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 70EB7916)
---
sci-biology/embassy-domsearch/ChangeLog | 4 +
.../embassy-domsearch-0.1.0-r5.ebuild | 2 +
.../files/embassy-domsearch-0.1.0-r5.patch | 255 +++++++++++++++++++-
3 files changed, 257 insertions(+), 4 deletions(-)
diff --git a/sci-biology/embassy-domsearch/ChangeLog b/sci-biology/embassy-domsearch/ChangeLog
index c319ba2..5a4cb29 100644
--- a/sci-biology/embassy-domsearch/ChangeLog
+++ b/sci-biology/embassy-domsearch/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sci-biology/embassy-domsearch/ChangeLog,v 1.19 2010/01/01 21:53:24 fauli Exp $
+ 19 Mar 2011; Justin Lecher <jlec@gentoo.org>
+ embassy-domsearch-0.1.0-r5.ebuild, files/embassy-domsearch-0.1.0-r5.patch:
+ Fixed for reviewed eclass
+
15 Mar 2011; Justin Lecher <jlec@gentoo.org>
embassy-domsearch-0.1.0-r5.ebuild:
Naming of eclass changed
diff --git a/sci-biology/embassy-domsearch/embassy-domsearch-0.1.0-r5.ebuild b/sci-biology/embassy-domsearch/embassy-domsearch-0.1.0-r5.ebuild
index 6f6afd2..3deb535 100644
--- a/sci-biology/embassy-domsearch/embassy-domsearch-0.1.0-r5.ebuild
+++ b/sci-biology/embassy-domsearch/embassy-domsearch-0.1.0-r5.ebuild
@@ -2,6 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sci-biology/embassy-domsearch/embassy-domsearch-0.1.0-r4.ebuild,v 1.2 2010/01/01 21:53:24 fauli Exp $
+EAPI="4"
+
EBO_DESCRIPTION="Protein domain search add-on package"
inherit emboss
diff --git a/sci-biology/embassy-domsearch/files/embassy-domsearch-0.1.0-r5.patch b/sci-biology/embassy-domsearch/files/embassy-domsearch-0.1.0-r5.patch
index 303293c..2c4c6c4 100644
--- a/sci-biology/embassy-domsearch/files/embassy-domsearch-0.1.0-r5.patch
+++ b/sci-biology/embassy-domsearch/files/embassy-domsearch-0.1.0-r5.patch
@@ -10,7 +10,7 @@ index 6bfb6f0..d547b12 100644
EXTRA_DIST = depcomp ltmain.sh install-sh config.sub config.guess
diff --git a/configure.in b/configure.in
-index 8cce01f..7eb5148 100644
+index 8cce01f..441c2a0 100644
--- a/configure.in
+++ b/configure.in
@@ -187,15 +187,6 @@ AC_PROG_INSTALL
@@ -29,14 +29,17 @@ index 8cce01f..7eb5148 100644
dnl Check for header files
AC_PATH_XTRA
-@@ -250,8 +241,8 @@ AX_LIB_POSTGRESQL
+@@ -248,10 +239,10 @@ AX_LIB_MYSQL
+ AX_LIB_POSTGRESQL
+
CFLAGS="$CFLAGS $MYSQL_CFLAGS"
- LDFLAGS="$LDFLAGS $MYSQL_LDFLAGS"
+-LDFLAGS="$LDFLAGS $MYSQL_LDFLAGS"
++LIBS="${MYSQL_LIBS} ${LIBS}"
-CFLAGS="$CFLAGS $POSTGRESQL_CFLAGS"
-LDFLAGS="$LDFLAGS $POSTGRESQL_LDFLAGS"
+CFLAGS="$POSTGRESQL_CFLAGS $CFLAGS"
-+LDFLAGS="$POSTGRESQL_LDFLAGS $LDFLAGS"
++LIBS="$POSTGRESQL_LIBS $LIBS"
dnl "Export" these variables for PCRE
@@ -71,6 +74,250 @@ index 8cce01f..7eb5148 100644
+diff --git a/emboss_doc/html/Makefile.am b/emboss_doc/html/Makefile.am
+index 99468f4..1e1b806 100644
+--- a/emboss_doc/html/Makefile.am
++++ b/emboss_doc/html/Makefile.am
+@@ -2,4 +2,4 @@ pkgdata_DATA = index.html \
+ seqfraggle.html seqnr.html \
+ seqsearch.html seqsort.html seqwords.html
+
+-pkgdatadir=$(prefix)/share/EMBOSS/doc/html/embassy/domsearch
++pkgdatadir=$(docdir)/html/embassy/domsearch
+diff --git a/emboss_doc/text/Makefile.am b/emboss_doc/text/Makefile.am
+index b1b7423..796d202 100644
+--- a/emboss_doc/text/Makefile.am
++++ b/emboss_doc/text/Makefile.am
+@@ -1,4 +1,4 @@
+ pkgdata_DATA = seqfraggle.txt seqnr.txt \
+ seqsearch.txt seqsort.txt seqwords.txt
+
+-pkgdatadir=$(prefix)/share/EMBOSS/doc/programs/text
++pkgdatadir=$(docdir)/programs/text
+diff --git a/m4/hpdf.m4 b/m4/hpdf.m4
+index a37940f..80b329c 100644
+--- a/m4/hpdf.m4
++++ b/m4/hpdf.m4
+@@ -33,8 +33,8 @@ ALT_HOME=/usr
+ #
+ # Locate hpdf
+ #
+-if test -d "${ALT_HOME}"
+-then
++#if test -d "${ALT_HOME}"
++#then
+
+ #
+ # Keep a copy if it fails
+@@ -45,13 +45,13 @@ then
+ #
+ # Set
+ #
+- LDFLAGS="${LDFLAGS} -L${ALT_HOME}/lib"
+- CPPFLAGS="$CPPFLAGS -I$ALT_HOME/include"
++# LDFLAGS="${LDFLAGS} -L${ALT_HOME}/lib"
++# CPPFLAGS="$CPPFLAGS -I$ALT_HOME/include"
+
+ #
+ # Check for libharu in ALT_HOME
+ #
+- AC_CHECK_LIB(hpdf, HPDF_New, CHECK=1, CHECK=0, -L${ALT_HOME}/lib)
++ AC_CHECK_LIB(hpdf, HPDF_New, CHECK=1, CHECK=0)
+ #
+ #
+ # If everything found okay then proceed to include png driver in config.
+@@ -80,10 +80,4 @@ then
+ echo "No pdf support (libhpdf) found."
+ fi
+
+-else
+- if test $withval != "no"; then
+- echo "Directory $ALT_HOME does not exist"
+- exit 0
+- fi
+-fi
+ ])
+diff --git a/m4/mysql.m4 b/m4/mysql.m4
+index 12f8fe9..5cd8b90 100644
+--- a/m4/mysql.m4
++++ b/m4/mysql.m4
+@@ -26,7 +26,7 @@
+ # This macro calls:
+ #
+ # AC_SUBST(MYSQL_CFLAGS)
+-# AC_SUBST(MYSQL_LDFLAGS)
++# AC_SUBST(MYSQL_LIBS)
+ # AC_SUBST(MYSQL_VERSION)
+ #
+ # And sets:
+@@ -68,7 +68,7 @@ AC_DEFUN([AX_LIB_MYSQL],
+ )
+
+ MYSQL_CFLAGS=""
+- MYSQL_LDFLAGS=""
++ MYSQL_LIBS=""
+ MYSQL_VERSION=""
+
+ dnl
+@@ -86,7 +86,7 @@ AC_DEFUN([AX_LIB_MYSQL],
+
+ dnl MYSQL_CFLAGS="`$MYSQL_CONFIG --cflags`"
+ MYSQL_CFLAGS="`$MYSQL_CONFIG --include`"
+- MYSQL_LDFLAGS="`$MYSQL_CONFIG --libs`"
++ MYSQL_LIBS="`$MYSQL_CONFIG --libs`"
+
+ MYSQL_VERSION=`$MYSQL_CONFIG --version`
+
+@@ -97,7 +97,7 @@ dnl not be installed
+ EMBCFLAGS=$CFLAGS
+ EMBLDFLAGS=$LDFLAGS
+ CFLAGS="$MYSQL_CFLAGS $EMBCFLAGS"
+- LDFLAGS="$MYSQL_LDFLAGS $EMBLDFLAGS"
++ LIBS="${MYSQL_LIBS} ${LIBS}"
+
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
+ #include "mysql.h"]],
+@@ -115,7 +115,7 @@ dnl not be installed
+ AC_MSG_RESULT([yes])
+ else
+ MYSQL_CFLAGS=""
+- MYSQL_LDFLAGS=""
++ MYSQL_LIBS=""
+ found_mysql="no"
+ AC_MSG_RESULT([no])
+ fi
+@@ -172,5 +172,5 @@ dnl not be installed
+
+ AC_SUBST([MYSQL_VERSION])
+ AC_SUBST([MYSQL_CFLAGS])
+- AC_SUBST([MYSQL_LDFLAGS])
++ AC_SUBST([MYSQL_LIBS])
+ ])
+diff --git a/m4/pngdriver.m4 b/m4/pngdriver.m4
+index 5934321..de970ae 100644
+--- a/m4/pngdriver.m4
++++ b/m4/pngdriver.m4
+@@ -44,8 +44,8 @@ ALT_HOME=/usr
+ #
+ # Locate png/gd/zlib, if wanted
+ #
+-if test -d "${ALT_HOME}"
+-then
++#if test -d "${ALT_HOME}"
++#then
+
+ #
+ # Keep a copy if it fails
+@@ -69,20 +69,26 @@ then
+ fi
+
+
++PKG_CHECK_MODULES([PNG], [libpng])
++PKG_CHECK_MODULES([ZLIB], [zlib])
++AC_CHECK_PROG(GD_LIBS, [gdlib-config])
++GD_LIBS="`gdlib-config --libs` -lgd"
++GD_CFLAGS="`gdlib-config --cflags`"
++
+
+
+
+ #
+ # Check for zlib in ALT_HOME
+ #
+- AC_CHECK_LIB(z, inflateEnd, CHECK=1, CHECK=0, -L${ALT_HOME}/lib -lz)
++ AC_CHECK_LIB(z, inflateEnd, CHECK=1, CHECK=0, ${ZLIB_LIBS})
+ #
+
+ #
+ # Check for png
+ #
+ if test $CHECK = "1" ; then
+- AC_CHECK_LIB(png, png_destroy_read_struct, CHECK=1, CHECK=0 , -L${ALT_HOME}/lib -lz)
++ AC_CHECK_LIB(png, png_destroy_read_struct, CHECK=1, CHECK=0 , ${ZLIB_LIBS})
+ fi
+
+
+@@ -92,7 +98,7 @@ then
+ # Check for gd
+ #
+ if test $CHECK = "1"; then
+- AC_CHECK_LIB(gd, gdImageCreateFromPng, CHECK=1, CHECK=0 , -L${ALT_HOME}/lib -lgd -lpng -lz -lm)
++ AC_CHECK_LIB(gd, gdImageCreateFromPng, CHECK=1, CHECK=0 , ${PNG_LIBS} ${ZLIB_LIBS} ${GD_LIBS})
+ if test $CHECK = "0"; then
+ echo need to upgrade gd for png driver for plplot
+ fi
+@@ -101,7 +107,7 @@ then
+ # If everything found okay then proceed to include png driver in config.
+ #
+ if test $CHECK = "1" ; then
+- LIBS="$LIBS -lgd -lpng -lz -lm"
++ LIBS="$LIBS ${PNG_LIBS} ${ZLIB_LIBS} ${GD_LIBS}"
+
+ if test $ICCHECK = "1" ; then
+ LIBS="$LIBS -liconv"
+@@ -114,10 +120,11 @@ then
+ AC_DEFINE(PLD_png)
+ AM_CONDITIONAL(AMPNG, true)
+ echo PNG libraries found
+- if test $ALT_HOME = "/usr" ; then
++# if test $ALT_HOME = "/usr" ; then
+ LDFLAGS="$ALT_LDFLAGS"
+ CPPFLAGS="$ALT_CPPFLAGS"
+- fi
++ CFLAGS="${CFLAGS} ${PNG_CFLAGS} ${ZLIB_CFLAGS} ${GD_CFLAGS}"
++# fi
+ else
+ #
+ # If not okay then reset FLAGS.
+@@ -134,10 +141,4 @@ then
+ # echo CPPFLAGS = $CPPFLAGS
+
+
+-else
+- if test $withval != "no"; then
+- echo "Directory $ALT_HOME does not exist"
+- exit 0
+- fi
+-fi
+ ])
+diff --git a/m4/postgresql.m4 b/m4/postgresql.m4
+index e6a804d..ef4d49c 100644
+--- a/m4/postgresql.m4
++++ b/m4/postgresql.m4
+@@ -26,7 +26,7 @@
+ # This macro calls:
+ #
+ # AC_SUBST(POSTGRESQL_CFLAGS)
+-# AC_SUBST(POSTGRESQL_LDFLAGS)
++# AC_SUBST(POSTGRESQL_LIBS)
+ # AC_SUBST(POSTGRESQL_VERSION)
+ #
+ # And sets:
+@@ -65,7 +65,7 @@ AC_DEFUN([AX_LIB_POSTGRESQL],
+ )
+
+ POSTGRESQL_CFLAGS=""
+- POSTGRESQL_LDFLAGS=""
++ POSTGRESQL_LIBS=""
+ POSTGRESQL_POSTGRESQL=""
+
+ dnl
+@@ -82,7 +82,7 @@ AC_DEFUN([AX_LIB_POSTGRESQL],
+ AC_MSG_CHECKING([for PostgreSQL libraries])
+
+ POSTGRESQL_CFLAGS="-I`$PG_CONFIG --includedir`"
+- POSTGRESQL_LDFLAGS="-L`$PG_CONFIG --libdir` -lpq"
++ POSTGRESQL_LIBS="-L`$PG_CONFIG --libdir` `$PG_CONFIG --libs`"
+
+ POSTGRESQL_VERSION=`$PG_CONFIG --version | sed -e 's#PostgreSQL ##'`
+
+@@ -144,5 +144,5 @@ AC_DEFUN([AX_LIB_POSTGRESQL],
+
+ AC_SUBST([POSTGRESQL_VERSION])
+ AC_SUBST([POSTGRESQL_CFLAGS])
+- AC_SUBST([POSTGRESQL_LDFLAGS])
++ AC_SUBST([POSTGRESQL_LIBS])
+ ])
diff --git a/src/Makefile.am b/src/Makefile.am
index c8c5fd7..9652a64 100644
--- a/src/Makefile.am
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-03-20 16:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-10 19:00 [gentoo-commits] proj/sci:master commit in: sci-biology/embassy-domsearch/files/, sci-biology/embassy-domsearch/ Justin Lecher
-- strict thread matches above, loose matches on Subject: below --
2011-03-20 16:28 Justin Lecher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox