[cpl-plugin-vimos] 43/45: Add cfitsio and cext library search patches

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole-guest pushed a commit to branch debian
in repository cpl-plugin-vimos.

commit 263c65a4ad4dc48134277d0e6e9695931e497e2b
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Nov 6 11:02:15 2013 +0100

    Add cfitsio and cext library search patches
---
 debian/patches/use-std-paths-for-cpl.patch |   91 +++++++++++++++++++++++++++-
 1 file changed, 89 insertions(+), 2 deletions(-)

diff --git a/debian/patches/use-std-paths-for-cpl.patch b/debian/patches/use-std-paths-for-cpl.patch
index ba47ce7..08ae55b 100644
--- a/debian/patches/use-std-paths-for-cpl.patch
+++ b/debian/patches/use-std-paths-for-cpl.patch
@@ -2,7 +2,94 @@ Author: Ole Streicher <debian at liska.ath.cx>
 Description: Use standard path and name for cpl
 --- a/m4macros/cpl.m4
 +++ b/m4macros/cpl.m4
-@@ -1314,7 +1314,7 @@
+@@ -8,7 +8,7 @@
+         
+     cpl_cfitsio_check_version="$1"
+     cpl_cfitsio_check_header="fitsio.h"
+-    cpl_cfitsio_check_lib="libcfitsio.a"
++    cpl_cfitsio_check_lib="libcfitsio.so"
+ 
+     cpl_cfitsio_incdirs=""
+     cpl_cfitsio_libdirs=""
+@@ -109,6 +109,7 @@
+                 cpl_cfitsio_libdirs="$cpl_cfitsio_libdirs /usr/lib64"
+                 cpl_cfitsio_libdirs="$cpl_cfitsio_libdirs /usr/lib"
+                 cpl_cfitsio_libdirs="$cpl_cfitsio_libdirs /usr/lib32"
++		cpl_cfitsio_libdirs="$cpl_cfitsio_libdirs /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)"
+ 
+                 test -n "$CFITSIODIR" && \
+                     cpl_cfitsio_libdirs="$CFITSIODIR/lib64 $CFITSIODIR/lib \
+@@ -455,7 +456,7 @@
+     AC_MSG_CHECKING([for libcext])
+ 
+     cpl_cext_check_header="cxtypes.h"
+-    cpl_cext_check_lib="libcext.a"
++    cpl_cext_check_lib="libcext.so"
+ 
+     cpl_cext_incdirs=""
+     cpl_cext_libdirs=""
+@@ -556,6 +557,7 @@
+                 	cpl_cext_libdirs="$cpl_cext_libdirs /usr/lib64"
+                 	cpl_cext_libdirs="$cpl_cext_libdirs /usr/lib"
+                 	cpl_cext_libdirs="$cpl_cext_libdirs /usr/lib32"
++			cpl_cext_libdirs="$cpl_cext_libdirs /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)"
+ 
+                 	test -n "$CPLDIR" && \
+                     	cpl_cext_libdirs="$CPLDIR/lib64 \
+@@ -1314,7 +1316,7 @@
+     AC_MSG_CHECKING([for CPL])
+ 
+     cpl_check_cpl_header="cpl.h"
+-    cpl_check_cpl_lib="libcplcore.a"
++    cpl_check_cpl_lib="libcplcore.so"
+ 
+     cpl_incdirs=""
+     cpl_libdirs=""
+@@ -1388,6 +1390,7 @@
+                 cpl_libdirs="$cpl_libdirs /usr/local/lib64"
+                 cpl_libdirs="$cpl_libdirs /usr/local/lib"
+                 cpl_libdirs="$cpl_libdirs /usr/local/lib32"
++		cpl_libdirs="$cpl_libdirs /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)"
+                 cpl_libdirs="$cpl_libdirs /usr/lib64"
+                 cpl_libdirs="$cpl_libdirs /usr/lib"
+                 cpl_libdirs="$cpl_libdirs /usr/lib32"
+--- a/libpil/m4macros/cpl.m4
++++ b/libpil/m4macros/cpl.m4
+@@ -8,7 +8,7 @@
+         
+     cpl_cfitsio_check_version="$1"
+     cpl_cfitsio_check_header="fitsio.h"
+-    cpl_cfitsio_check_lib="libcfitsio.a"
++    cpl_cfitsio_check_lib="libcfitsio.so"
+ 
+     cpl_cfitsio_incdirs=""
+     cpl_cfitsio_libdirs=""
+@@ -109,6 +109,7 @@
+                 cpl_cfitsio_libdirs="$cpl_cfitsio_libdirs /usr/lib64"
+                 cpl_cfitsio_libdirs="$cpl_cfitsio_libdirs /usr/lib"
+                 cpl_cfitsio_libdirs="$cpl_cfitsio_libdirs /usr/lib32"
++		cpl_cfitsio_libdirs="$cpl_cfitsio_libdirs /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)"
+ 
+                 test -n "$CFITSIODIR" && \
+                     cpl_cfitsio_libdirs="$CFITSIODIR/lib64 $CFITSIODIR/lib \
+@@ -455,7 +456,7 @@
+     AC_MSG_CHECKING([for libcext])
+ 
+     cpl_cext_check_header="cxtypes.h"
+-    cpl_cext_check_lib="libcext.a"
++    cpl_cext_check_lib="libcext.so"
+ 
+     cpl_cext_incdirs=""
+     cpl_cext_libdirs=""
+@@ -556,6 +557,7 @@
+                 	cpl_cext_libdirs="$cpl_cext_libdirs /usr/lib64"
+                 	cpl_cext_libdirs="$cpl_cext_libdirs /usr/lib"
+                 	cpl_cext_libdirs="$cpl_cext_libdirs /usr/lib32"
++			cpl_cext_libdirs="$cpl_cext_libdirs /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)"
+ 
+                 	test -n "$CPLDIR" && \
+                     	cpl_cext_libdirs="$CPLDIR/lib64 \
+@@ -1314,7 +1316,7 @@
      AC_MSG_CHECKING([for CPL])
  
      cpl_check_cpl_header="cpl.h"
@@ -11,7 +98,7 @@ Description: Use standard path and name for cpl
  
      cpl_incdirs=""
      cpl_libdirs=""
-@@ -1388,6 +1388,7 @@
+@@ -1388,6 +1390,7 @@
                  cpl_libdirs="$cpl_libdirs /usr/local/lib64"
                  cpl_libdirs="$cpl_libdirs /usr/local/lib"
                  cpl_libdirs="$cpl_libdirs /usr/local/lib32"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cpl-plugin-vimos.git