structbiol team mailing list archive

[Tim Fenn <fenn@xxxxxxxxxxxx>]

Here are the patches following bzr send.  (can we just bzr push to the
main branch?)

-Tim

On Tue, 14 Dec 2010 15:44:30 -0800
Tim Fenn <fenn@xxxxxxxxxxxx> wrote:

> I pushed a few changes to gpp4, mmdb and ssm to address a few things:
> 
> - gpp4 patched for support for s390x arch
> - added pkgconfig support to mmdb
> - standardized ssm pkgconfig file and use pkgconfig to find mmdb
> 
> I hope these patches are OK, feel free to tweak them as necessary.
> Maybe the versioning can get updated to the CCP4 standard and make
> the new packages available as downloads?
> 
> -Tim
> 



-- 
---------------------------------------------------------

        Tim Fenn
        fenn@xxxxxxxxxxxx
        Stanford University, School of Medicine
        James H. Clark Center
        318 Campus Drive, Room E300
        Stanford, CA  94305-5432
        Phone:  (650) 736-1714
        FAX:  (650) 736-1961

---------------------------------------------------------

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: fenn@xxxxxxxxxxxxxxxxxxxx-20101214234110-\
#   a5zqpf1mh0w7vthq
# target_branch: bzr+ssh://bazaar.launchpad.net/%2Bbranch/ssm/
# testament_sha1: 206b820a523e85b2627f64a0173771f630df5d8e
# timestamp: 2010-12-14 17:26:01 -0800
# base_revision_id: mok0@xxxxxxxxxx-20100810113916-0ah3iugs41ko847p
# 
# Begin patch
=== modified file 'configure.ac'
--- configure.ac	2008-12-03 16:31:17 +0000
+++ configure.ac	2010-12-14 23:41:10 +0000
@@ -27,8 +27,10 @@
 AC_STRUCT_TM
 
 dnl Check for MMDB.
-AM_PATH_MMDB([echo Found mmdb], [echo Error locating necessary mmdb; exit 1])
-
+# AM_PATH_MMDB([echo Found mmdb], [echo Error locating necessary mmdb; exit 1])
+PKG_CHECK_MODULES(MMDB, mmdb >= 1.09)
+AC_SUBST(MMDB_CFLAGS)
+AC_SUBST(MMDB_LIBS)
 
 # Checks for library functions.
 AC_FUNC_STRTOD

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2007-09-02 20:02:13 +0000
+++ src/Makefile.am	2010-12-14 23:41:10 +0000
@@ -5,7 +5,8 @@
 
 lib_LTLIBRARIES = libssm.la
 
-INCLUDES = $(MMDB_CXXFLAGS)
+AM_CPPFLAGS = @MMDB_CFLAGS@
+AM_LDFLAGS = @MMDB_LIBS@
 
 libssm_h_sources = ss_csia.h ss_graph.h ssm_align.h ssm_superpose.h ss_vxedge.h
 

=== modified file 'ssm.pc.in'
--- ssm.pc.in	2007-09-02 20:02:13 +0000
+++ ssm.pc.in	2010-12-14 23:41:10 +0000
@@ -1,7 +1,7 @@
-prefix=@SSM_PREFIX@
-exec_prefix=@SSM_PREFIX@
-libdir=@SSM_PREFIX@/lib
-includedir=@SSM_PREFIX@/include
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
 
 Name: ssm
 Description: Macromolecular superposition library

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZv0LDAAApbfgAAQWGf//3/u
3gq/7//wUAU2ztd0Bx6uXmex61oElJTwEaniZGTKeKGhoNAADamnqDQJJCZDQaJkNUeSABoAAAAa
BIkETE00JqNHqNpNHqHqDQNA0Gj1ACKiEaYEaGjVPR6p4p6jymmjQAAAASpMUyaaDTQ0BoAAAABo
DQbjipbOb6aafY0z3w36hM3ze7hCbYpL3ytsLbCMKOjZGJWXX6l1GIxsG/t1h+Z158ZTpo12RRET
IwdBw8Iew88ZVSb3B6q7Xt98HnW26Va60otrQh+ye1rM1vZcPUcz6FZXsrQ2xJcFkB06dzQyC8cz
6pltLllU5lGL9EcbqHk67xMvP84HGbpDkMlTAhyUtbWdTa9Vc+ZkJpkgxsV6RjHmJJdM5EkwO40K
BLQbSEpeDLjVJ4UUEi5EncHxZSU6PNa7DNml2iZwkg6Ic5BNypKtMI6LUv2adi3ERJTujKNsRHIm
7TPCO244naGGEy01IbEfkjmZYkpnRvEV4ueMrHSJZWEcGYyZ9VSmIzto1zjVJDuBcOBVPNLBHWso
Rtklg8rJutmZ6vFkQMyy+qOI5zHUkQtV19z75GAhhzNIfhhYRheOXRy65wYYlmMc1hmMrNmRcQEd
SeIqJwMjkjFb3SMghTDHgalqU99HRbjJxgQvkVV71ebF5delIRPOq99yuSZK+xJpj7iGZXj0ax2G
L8iWsMRgqOJeRHlMbSjVZZGVldTD5DzXGdKqUVETNxY+C74i4xyalj5FAhlZucckyzMMpTtak7qR
wgrGlrXRTvX3mBzktFS6ptg0a3B2ywdlMVa6OeVdLskFZCrJDsdAytFba+XV5w9sHlyWD0EER401
D37h7upZuFPQVhzMyRtXSHaWR2AyvHrMppjbZ2EQsIfqGGIT2Icib9/Bccly3PQpwPiuscaVEEx1
gdEP9HFuL1zUyNZS/ZhiTP4a/TDbJFpzGfOQbNmno33DjwkpUlTCaXSpYSkDaceSxFlICwxmbFyE
DJnzn7tL1SeEnnFCM8DJ2CbVGw+MaoVDzEh5L03UEMBqSGUwwK2kmnMdA+OERIcfvupkqR4r2S6U
D6knV5dHWOkJAMhDARhZRnPNk1ll8dKz6xSVDxURI8Enow200pG/HiaCi8r7DTiVJQlLHNNpMhOu
veGBHYX7gqshDIuxzSqYfV13sRzWlOc8BA70xweTpa8nCDGlfFyaywq/iQ0WkZQkWWynDOxq4ivW
cI5zBjrI9jRQCeDBMRLVVZLdLQx8U/N3wJOb9TFIYhEJuHNMYPFRLcnjB4ek6QZO/23iNQ5IgrVq
tAcEATisjJDrLl7GRz6xJWOAE8TYJUtUTDmQr7visJsQ2IES7wtOOoYze2/RLcOx8VYcR6bcXQky
zt+2R7WPSLueRgNj1DQNEQ6wbtuaOO7LYalyNjSymLyBRbynLiZCK4BdQVrCu5qaISHRUmYsUpjG
VSHfuUIwTIxdnYd291XWjpCcdMUld40CWzlT71qyZnoyZHbUA9EWK/GIkT3c+XN128RoIwWmG1wJ
VtCYePFxZFLG0KEKrc4V2zuyM+HrrXBId7PUs0ymfOjVgtImrA8LtDhwfIkXkSd0tykVtp4xg3jQ
DIpGnWPDkJNqvpJMw0BLBKYPkLhKnLHqYVGV41amra57FLHSPau8TzVr0EuO01LotWSIUOdgtbqY
XzL45YhYZLROS/8XckU4UJCb9Cww

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: fenn@xxxxxxxxxxxxxxxxxxxx-20101214233342-\
#   3bcn3ne32wzxlp86
# target_branch: bzr+ssh://bazaar.launchpad.net/%2Bbranch/mmdb/
# testament_sha1: 4c9e6fad8a47d29dbad675cc37a28c358a2902a6
# timestamp: 2010-12-14 17:25:08 -0800
# base_revision_id: mok0@xxxxxxxxxx-20101203162334-h5ed22tiix5nkoz5
# 
# Begin patch
=== modified file 'Makefile.am'
--- Makefile.am	2010-12-03 16:23:34 +0000
+++ Makefile.am	2010-12-14 23:33:42 +0000
@@ -3,6 +3,9 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = mmdb.pc
+
 SUBDIRS=src examples
 EXTRA_DIST = docs autogen.sh
 

=== modified file 'configure.ac'
--- configure.ac	2010-12-02 11:55:00 +0000
+++ configure.ac	2010-12-14 23:33:42 +0000
@@ -16,5 +16,5 @@
 
 AM_PROG_LIBTOOL
 
-AC_OUTPUT(Makefile src/Makefile examples/Makefile)
+AC_OUTPUT(mmdb.pc Makefile src/Makefile examples/Makefile)
 

=== added file 'mmdb.pc.in'
--- mmdb.pc.in	1970-01-01 00:00:00 +0000
+++ mmdb.pc.in	2010-12-14 23:33:42 +0000
@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: mmdb
+Description: Macromolecular coordinate library
+Version: @VERSION@
+Requires:
+Conflicts:
+Libs: -L${libdir} -lmmdb
+Cflags: -I${includedir}

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWccQWqkAAqbfgAAQVGP/934n
3wC////6UAVZ52ajatOZXZttuxhCSUJqbTRpqbRPETI02QCDaQxGgyaCSRTRsmhqMVP0p+g1R6jx
RoAA0aA0CRIJU/Rk1NkmU/U0m0jQA0aNAZNBoHNMTARpgRhGAAAAJhGAkoI1NMBT9NKeiZHoiZGm
R6CNAYjR7P9nllmabIPtMNdY2SFWzbs6c26Xd8CX5lyLkv5K6XStIiXXZdZzYXmzctpqGNtrs+iO
GNLZxc6O6cE6RF9C99H732lfM/6B98vq6EsFBimYE2LRbbJayX5u4nKeZR8mWicwS39na33ePFrl
jE2rzOZRJJMPQRNmIlApWYTOgeAjLR9841bAsRmkb3jHRFiRFPnuslSnnWdIK3mwlNSS7dmsBOQg
ipuNCUgnCCaXGuEpSRNdCImPQaHBWqz8t6Bh0UAXK+4z8WBxSnaqoCDKyEJWBwT0PBeem60xSOUs
+e5pOaVIyLsL3VW7ERrwAU0ZTgFTNSNoboBTDQbfRHGQWXF9mmy0LJ6IscK4smKxxtTgnEe8JENA
eqRPoSIFlNIiYAeIxGCUihPW8vbJxTjERQceyf1UhGqcKFWjSahwPEOaPBPeW07EXVvs5y/SZ4Ba
bTcWEcnNa5hzVGBB9GmGMayt0Kb9MbnEjUHeqHAIqb/6E1yri1PjeOV06USzShLYYsscgylBwIms
4OcNu2IvK1K4tT7GxLSgthTRAYePI4oehm/faSvB6Mb4UZKVdRngYc+yH40GQ4k3ruxwJDwhrnMn
/049Q540ZB5Gqoabw0Vcx0huNt87NAXVxPdh4XZJtEBSEOxzCoq2PPqBnq0q0beF6ZDDbzj4fNeu
fbSHptSOoMUdOH31QMYxvs65He59+fkz1q4zSfj26xFae5c7bc4OL9PKSVjEmF5GVxbXhX8jJ0DV
WNZtKhj1hKnirn3QQFvKLY+HA3QrTeV7TA4kQQ2IH6TWkaG+PalE6fLLuT+QyOB4DzvICG3jzxMg
rqaSSPBEugBlDFjUOMy4YXHKeRcRwOeJgGiOeSJnFEIxIvUhP5tkyWLF2+2CdIwdTwRK1X7SNE9Y
0IdgZQS5QLYElO7aFsp7WMYxlgagpekem4JMIMmGXHPElsLhFHfqdqr1n0NBh1TKe2bJ0VYJy8Zn
ylaeEJFjSPDDKpX2wOG8TwT0R0tZ5OF0F1BxTI2PzzU76Ja/CjEOizza4Uq1FEhgL82MzOGKcNGo
1Ayb7YBmlW5MRFYJocJkJxAgZBvBrAZ1pbjrHPXXsO0L0/kBVoJpblr4EQiZzR/HXPj2pNT0DJLQ
DoOJJiXUiun46Ol8TvTD2OyqywXLAqmMIs0wcQQV3UbO9DMzMXAPiGwW0MwpRS0Kr7AUzFXBgxwy
y3xrU9MuOsRO5aVWjR5eeS2gaQ33j4zLvBa7NLQ7YB28TRMavEQiSQ7VOjQdAiaBrki34BiskgmY
iKGp0oxFtC0TpwO1yXUx6KVmKhItYqRycG8KshEZMTEc6HhPlNyD/VdlRI3T5tqx6Iqxan8gxq7E
0Hi7joaCrXGrQoQQlbcErcqlFzwjRQzSSKnKo4BQQ7LXU6CzNgkoHBgctQRa2KRAySIC89Do22rk
5lzFME9I9TPrgLPRTDaFRhUKS5psdTkYMii8RYht6GsXGHLFFJkpJFS954ROnsETCbBQnhzEVvSg
F4YQB/gI9ic/4u5IpwoSGOILVSA=

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: fenn@xxxxxxxxxxxxxxxxxxxx-20101214231215-\
#   gnw8osf28hx9nva6
# target_branch: bzr+ssh://bazaar.launchpad.net/%2Bbranch/gpp4/
# testament_sha1: e0a906c99cf444e77c326fb36d788171116a3978
# timestamp: 2010-12-14 17:24:33 -0800
# base_revision_id: mok0@xxxxxxxxxx-20101127231233-sre1unwogd7jlewy
# 
# Begin patch
=== modified file 'src/ccp4_sysdep.h'
--- src/ccp4_sysdep.h	2009-09-08 12:02:03 +0000
+++ src/ccp4_sysdep.h	2010-12-14 23:12:15 +0000
@@ -266,6 +266,11 @@
 #  define NATIVEFT DFNTF_BEIEEE
 #endif
 
+#if defined (__s390__) || defined (__s390x__)
+#  define NATIVEIT DFNTI_MBO
+#  define NATIVEFT DFNTF_BEIEEE
+#endif
+
 #ifdef __alpha
 #  ifdef VMS
 #    if __IEEE_FLOAT == 1

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWe/6D8EAAXzfgAAQWGP/93cj
hQC//9/0UAN+nPTxOaecJhJRJ6JpiaMptGm0hDJ6Q0Ymho0yDKBG0IYo1NHpqAAAA0aaASSNCTE0
0p4p+IhNqNlB6QyAfpIDKU9IeiD1GjIaGg0MQDCbSBhJIlDbSnqafkp+qekabKMnqDTNQ0AB3xte
26uwiaa7p2DPaAGx032woe+RrKbNeVmY3YnvRCwja17qWxeZ7nSws7XquXWmn8Z3sGsLNdMeNtll
w1gnhQuOdl1RIW8w6CtdbhFbpjrcqAhjCtL9TkseC+/J3yExgoe/3BgyCQiUY1s/FOX8FgyIBRVK
i7wlApOESxEDudBvqzNuk38SieVsRXILFXHG/bp2HwGML4KYFpBvK7cUtLDYz4HkFt4g3FIAN1oF
ZSVUkYjpqsBRt3QCyENFbuvRJ5K5BS2Cwg5TbEk3ot0XnTRrGBorRSN7iYwvrH3BlrmPwa8xXYYF
FcJhBZTBj6C6QK12QCB63OiEUEUWiykwyM0KMffSRQDg1PhaBA5CdlGnfqxWC83C8OhjnLTRxfHB
oP6Di2QAWdLlrrm45CAmkQyslDnBldfEJctuMktWpiIEoJqM5MJ0bLmeHrNHtvWPn4OlcGZVWyY+
Gf1uGk2fXubMfzYZaKjqUaq3qNAmPDt1fw14Xo8fKsc7VAD9MBYSG0Xb2ll3h2XFqxTtYlwrjRyO
qTW2bTfvOGWo3Xhw6ZK4IVcGL03b8zMMRCbpTiYpXTZc2ZnwFGA4F5NdfFMJEuP8dAZWVbS8ZgRM
9ATWLZk/jR7j5y7lRQ+o1xNg8NU2l7GzSBswzklqUD7Z2Z9gX6JtTJ+rT+gAylyYowqyaHvrIgrU
KgvIsIhc8Wy1xMTmTx+jYM7+rG6MMwZ3MkxvmpYIkJ+k0piYP+BVKrMc5XDYmonfJOMq5VvEvoHh
XjOL5B1Bc68L1bzA3IGATCcA2L6LYFvjOsMlLVUXSiDsPk6ZJt0nC1gdopZOhRZWB0FFdBRWGnNX
BtRQOcifAGEc4L2CvuVdanr2MyZyb6tU7V6p1pg8lyyUnSgoIpjpKt9FrhduUpdliUFOpqnn0VlB
Nk1MQapceXJuBSSqMEoIpVlzNM4wHgOriX0RtgZApB7KTBIUAbyBrohtVNIGelBYF7hamWRULboW
Im1q8sC0KVZKR3XN/i7kinChId/0H4I=