Author: Ole Streicher <olebole@debian.org>
Description: Use standard path and name for cpl
--- a/m4macros/cpl.m4
+++ b/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=""
@@ -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"
-    cpl_check_cpl_lib="libcplcore.a"
+    cpl_check_cpl_lib="libcplcore.so"
 
     cpl_incdirs=""
     cpl_libdirs=""
@@ -1389,6 +1390,7 @@
                 cpl_libdirs="$cpl_libdirs /usr/local/lib"
                 cpl_libdirs="$cpl_libdirs /usr/local/lib32"
                 cpl_libdirs="$cpl_libdirs /usr/lib64"
+                cpl_libdirs="$cpl_libdirs /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)"
                 cpl_libdirs="$cpl_libdirs /usr/lib"
                 cpl_libdirs="$cpl_libdirs /usr/lib32"