| 1 |
jlec 11/06/28 17:01:28 |
| 2 |
|
| 3 |
Added: 0.6.2-clipper-config.patch 0.6.2-gl.patch |
| 4 |
0.6.2-mmdb-config.patch |
| 5 |
Log: |
| 6 |
Version Bump |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha41/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 sci-chemistry/coot/files/0.6.2-clipper-config.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/coot/files/0.6.2-clipper-config.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/coot/files/0.6.2-clipper-config.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: 0.6.2-clipper-config.patch |
| 17 |
=================================================================== |
| 18 |
macros/clipper.m4 | 3 +++ |
| 19 |
1 files changed, 3 insertions(+), 0 deletions(-) |
| 20 |
|
| 21 |
diff --git a/macros/clipper.m4 b/macros/clipper.m4 |
| 22 |
index 0bf087a..d0e8b6b 100644 |
| 23 |
--- a/macros/clipper.m4 |
| 24 |
+++ b/macros/clipper.m4 |
| 25 |
@@ -98,6 +98,9 @@ case $ac_cv_build_alias in |
| 26 |
;; |
| 27 |
esac |
| 28 |
|
| 29 |
+CLIPPER_CXXFLAGS=`clipper-config --cflags` |
| 30 |
+CLIPPER_LDOPTS=`clipper-config --libs` |
| 31 |
+ |
| 32 |
AC_MSG_CHECKING([for Clipper]) |
| 33 |
|
| 34 |
LIBS="$save_LIBS $CLIPPER_LDOPTS" |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.1 sci-chemistry/coot/files/0.6.2-gl.patch |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/coot/files/0.6.2-gl.patch?rev=1.1&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/coot/files/0.6.2-gl.patch?rev=1.1&content-type=text/plain |
| 42 |
|
| 43 |
Index: 0.6.2-gl.patch |
| 44 |
=================================================================== |
| 45 |
Index: coot-surface/Makefile.am |
| 46 |
=================================================================== |
| 47 |
--- coot-surface/Makefile.am (revision 3478) |
| 48 |
+++ coot-surface/Makefile.am (working copy) |
| 49 |
@@ -29,4 +29,4 @@ |
| 50 |
|
| 51 |
libcoot_surface_la_LIBADD = \ |
| 52 |
$(top_builddir)/surface/libccp4mg-surface.la \ |
| 53 |
- $(GLUT_LIBS) $(CLIPPER_LIBS) $(MMDB_LIBS) |
| 54 |
+ $(GLUT_LIBS) $(CLIPPER_LIBS) $(MMDB_LIBS) -lGL |
| 55 |
|
| 56 |
|
| 57 |
|
| 58 |
1.1 sci-chemistry/coot/files/0.6.2-mmdb-config.patch |
| 59 |
|
| 60 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/coot/files/0.6.2-mmdb-config.patch?rev=1.1&view=markup |
| 61 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/coot/files/0.6.2-mmdb-config.patch?rev=1.1&content-type=text/plain |
| 62 |
|
| 63 |
Index: 0.6.2-mmdb-config.patch |
| 64 |
=================================================================== |
| 65 |
macros/mmdb.m4 | 4 ++++ |
| 66 |
1 files changed, 4 insertions(+), 0 deletions(-) |
| 67 |
|
| 68 |
diff --git a/macros/mmdb.m4 b/macros/mmdb.m4 |
| 69 |
index b477597..d05cf66 100644 |
| 70 |
--- a/macros/mmdb.m4 |
| 71 |
+++ b/macros/mmdb.m4 |
| 72 |
@@ -86,6 +86,10 @@ else |
| 73 |
ac_MMDB_LDOPTS="-lmmdb -lm" |
| 74 |
fi |
| 75 |
|
| 76 |
+PKG_CHECK_MODULES([MMDB],[mmdb >= 1.2]) |
| 77 |
+ac_MMDB_LDOPTS="${MMDB_LIBS}" |
| 78 |
+ac_MMDB_CXXFLAGS="${MMDB_CFLAGS}" |
| 79 |
+ |
| 80 |
AC_MSG_CHECKING([for MMDB]) |
| 81 |
|
| 82 |
LIBS="$save_LIBS $ac_MMDB_LDOPTS" |
Archives