From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1PvYOX-00078V-4m for garchives@archives.gentoo.org; Fri, 04 Mar 2011 17:02:27 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E8DD11C086; Fri, 4 Mar 2011 17:02:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A733D1C086 for ; Fri, 4 Mar 2011 17:02:17 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E194A1B41A6 for ; Fri, 4 Mar 2011 17:02:16 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2264) id 93A7720054; Fri, 4 Mar 2011 17:02:13 +0000 (UTC) From: "Justin Lecher (jlec)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, jlec@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in sci-chemistry/ccp4-apps/files: 6.1.3-rename-rapper-ng.patch 6.1.3-rename-rapper.patch 6.1.3-setup.patch 6.1.3-clipper-mmdbold-ggc-4.3.patch 6.1.3-rename-truncate.patch 6.1.3-fix-setup-bash-incompatibility.patch X-VCS-Repository: gentoo-x86 X-VCS-Files: 6.1.3-rename-rapper-ng.patch 6.1.3-rename-rapper.patch 6.1.3-setup.patch 6.1.3-clipper-mmdbold-ggc-4.3.patch 6.1.3-rename-truncate.patch 6.1.3-fix-setup-bash-incompatibility.patch X-VCS-Directories: sci-chemistry/ccp4-apps/files X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher Content-Type: text/plain; charset=utf8 Message-Id: <20110304170215.93A7720054@flycatcher.gentoo.org> Date: Fri, 4 Mar 2011 17:02:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 8adb1c79846ad47c8122c54ffbf4483b jlec 11/03/04 17:02:13 Added: 6.1.3-rename-rapper-ng.patch Removed: 6.1.3-rename-rapper.patch 6.1.3-setup.patch 6.1.3-clipper-mmdbold-ggc-4.3.patch 6.1.3-rename-truncate.patch 6.1.3-fix-setup-bash-incompatibility.patch Log: Streamline configure =20 (Portage version: 2.2.0_alpha26/cvs/Linux x86_64) Revision Changes Path 1.1 sci-chemistry/ccp4-apps/files/6.1.3-rename-rapper-ng= .patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/ccp4= -apps/files/6.1.3-rename-rapper-ng.patch?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/ccp4= -apps/files/6.1.3-rename-rapper-ng.patch?rev=3D1.1&content-type=3Dtext/pl= ain Index: 6.1.3-rename-rapper-ng.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D diff --git a/src/Makefile.in b/src/Makefile.in index 70781f3..b2dcc25 100755 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -760,7 +760,7 @@ chainsawobjs =3D chainsaw.o pdbcur : $(pdbcurobjs) @$(SETFLAGS) ; rm -f pdbcur; eval $(CXX) $${mmdb_app_FLAGS-"$(CXXFLAGS)= "} -o pdbcur $(pdbcurobjs) $(LDCXXFLAGS) ncont : $(ncontobjs) - @$(SETFLAGS) ; rm -f ncont; eval $(CXX) $${mmdb_app_FLAGS-"$(CXXFLAGS)"= } -o ncont $(ncontobjs) $(LDCXXFLAGS) + @$(SETFLAGS) ; rm -f ncont; eval $(CXX) $${mmdb_app_FLAGS-"$(CXXFLAGS)"= } -o ncont $(ncontobjs) $(LDCXXFLAGS) -lmmdb coord_format : $(coord_formatobjs) @$(SETFLAGS) xxx=3D1 ; \ rm -f coord_format; \ diff --git a/src/rapper/LOOP/Makefile.am b/src/rapper/LOOP/Makefile.am index 85f212e..2608c6d 100755 --- a/src/rapper/LOOP/Makefile.am +++ b/src/rapper/LOOP/Makefile.am @@ -15,12 +15,12 @@ params.cpp typed_value.cpp misc.cpp residue.cpp atom.= cpp psa.cpp edm_sidechains. hash_table.cpp surface.cpp parse.cpp band.cpp edensity.cpp read_map.cpp = iterator.cpp \ residue_range.cpp pop_search_frags.cpp saxs.cpp lib_choral.cpp pdf.cpp W= eightedDistribMean.cpp =20 -rapper_LDADD =3D ../gc7.0/libgc.la ../libxml2/libxml2.la +rapper_LDADD =3D @GC_LIBS@ @LIBXML_LIBS@ =20 pkgdatadir =3D $(datadir)/rapper dist_pkgdata_DATA =3D params.xml =20 -INCLUDES =3D -I. -I../gc7.0/include -I../libxml2/include +INCLUDES =3D -I. @LIBXML_CFLAGS@ @GC_CFLAGS@ #SUBDIRS =3D \ #@PYTHON_USE_TRUE@ python =20 diff --git a/src/rapper/Makefile.am b/src/rapper/Makefile.am index e78b10d..486b931 100755 --- a/src/rapper/Makefile.am +++ b/src/rapper/Makefile.am @@ -1,3 +1,3 @@ -SUBDIRS =3D libxml2 gc7.0 LOOP data +SUBDIRS =3D LOOP data =20 EXTRA_DIST =3D diff --git a/src/rapper/configure.ac b/src/rapper/configure.ac index 5e4ef69..268a579 100755 --- a/src/rapper/configure.ac +++ b/src/rapper/configure.ac @@ -48,6 +48,13 @@ AM_CONDITIONAL(AMDEP, test "x$enable_dependency_tracki= ng" !=3D xno) =20 AC_SUBST(rapper_LDFLAGS) =20 -AC_CONFIG_SUBDIRS([gc7.0 libxml2]) +PKG_CHECK_MODULES([LIBXML],[libxml-2.0]) +AC_SUBST([LIBXML_CFLAGS]) +AC_SUBST([LIBXML_LIBS]) + +PKG_CHECK_MODULES([GC],[bdw-gc]) +AC_SUBST([GC_CFLAGS]) +AC_SUBST([GC_LIBS]) + #AC_OUTPUT(Makefile LOOP/Makefile LOOP/python/Makefile data/Makefile) AC_OUTPUT(Makefile LOOP/Makefile data/Makefile)