[cpl-plugin-xsh] 01/01: Add hdrl/m4macros/cpl.m4 to use-std-paths-for-cpl.patch

[Ole Streicher]

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

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

commit aaa98e5ea3402d42bffa7b63d680e240a30cf046
Author: Ole Streicher <olebole at debian.org>
Date:   Sun Apr 19 12:04:46 2015 +0200

    Add hdrl/m4macros/cpl.m4 to use-std-paths-for-cpl.patch
---
 debian/patches/use-std-paths-for-cpl.patch | 61 ++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)

diff --git a/debian/patches/use-std-paths-for-cpl.patch b/debian/patches/use-std-paths-for-cpl.patch
index e212670..73b9bb3 100644
--- a/debian/patches/use-std-paths-for-cpl.patch
+++ b/debian/patches/use-std-paths-for-cpl.patch
@@ -61,3 +61,64 @@ Description: Use standard path and name for cpl
  
                  test -n "$CPLDIR" && \
                      cpl_libdirs="$CPLDIR/lib64 $CPLDIR/lib $CPLDIR/lib32 \
+--- a/hdrl/m4macros/cpl.m4
++++ b/hdrl/m4macros/cpl.m4
+@@ -9,7 +9,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=""
+@@ -110,7 +110,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 \
+                                          $CFITSIODIR/lib32 $cpl_cfitsio_libdirs"
+@@ -492,6 +492,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 \
+@@ -678,6 +679,7 @@
+     		cpl_wcs_libdirs="$cpl_wcs_libdirs /usr/lib64"
+     		cpl_wcs_libdirs="$cpl_wcs_libdirs /usr/lib"
+     		cpl_wcs_libdirs="$cpl_wcs_libdirs /usr/lib32"
++		cpl_wcs_libdirs="$cpl_wcs_libdirs /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)"
+     		
+ 	        test -n "$WCSDIR" && \
+     	    	cpl_wcs_libdirs="$WCSDIR/lib64 \
+@@ -912,6 +914,7 @@
+     		cpl_fftw_libdirs="$cpl_fftw_libdirs /usr/lib64"
+     		cpl_fftw_libdirs="$cpl_fftw_libdirs /usr/lib"
+     		cpl_fftw_libdirs="$cpl_fftw_libdirs /usr/lib32"
++		cpl_fftw_libdirs="$cpl_fftw_libdirs /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)"
+     		
+ 	        test -n "$FFTWDIR" && \
+     	    	cpl_fftw_libdirs="$FFTWDIR/lib64 \
+@@ -1250,7 +1253,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=""
+@@ -1327,6 +1330,7 @@
+                 cpl_libdirs="$cpl_libdirs /usr/lib64"
+                 cpl_libdirs="$cpl_libdirs /usr/lib"
+                 cpl_libdirs="$cpl_libdirs /usr/lib32"
++                cpl_libdirs="$cpl_libdirs /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)"
+ 
+                 test -n "$CPLDIR" && \
+                     cpl_libdirs="$CPLDIR/lib64 $CPLDIR/lib $CPLDIR/lib32 \

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