[cpl-plugin-uves] 01/03: Fix library name and path for cfitsio

[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-uves.

commit 85f38fa1c3966240ec1e86eaee306183c4a85cb0
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Sat Dec 7 19:07:10 2013 +0100

    Fix library name and path for cfitsio
---
 debian/patches/use-std-paths-for-cpl.patch | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/debian/patches/use-std-paths-for-cpl.patch b/debian/patches/use-std-paths-for-cpl.patch
index 7a65585..f2ba50f 100644
--- a/debian/patches/use-std-paths-for-cpl.patch
+++ b/debian/patches/use-std-paths-for-cpl.patch
@@ -2,7 +2,24 @@ 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=""
+@@ -107,6 +107,7 @@
+                 cpl_cfitsio_libdirs="$cpl_cfitsio_libdirs /usr/local/lib"
+                 cpl_cfitsio_libdirs="$cpl_cfitsio_libdirs /usr/local/lib32"
+                 cpl_cfitsio_libdirs="$cpl_cfitsio_libdirs /usr/lib64"
++                cpl_cfitsio_libdirs="$cpl_cfitsio_libdirs /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)"
+                 cpl_cfitsio_libdirs="$cpl_cfitsio_libdirs /usr/lib"
+                 cpl_cfitsio_libdirs="$cpl_cfitsio_libdirs /usr/lib32"
+ 
+@@ -1314,7 +1315,7 @@
      AC_MSG_CHECKING([for CPL])
  
      cpl_check_cpl_header="cpl.h"
@@ -11,7 +28,7 @@ Description: Use standard path and name for cpl
  
      cpl_incdirs=""
      cpl_libdirs=""
-@@ -1389,6 +1389,7 @@
+@@ -1389,6 +1390,7 @@
                  cpl_libdirs="$cpl_libdirs /usr/local/lib"
                  cpl_libdirs="$cpl_libdirs /usr/local/lib32"
                  cpl_libdirs="$cpl_libdirs /usr/lib64"

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