Author: Ole Streicher <debian@liska.ath.cx>
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=""
@@ -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"
-    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"