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,7 +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 \
                                          $CFITSIODIR/lib32 $cpl_cfitsio_libdirs"
@@ -556,6 +556,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 \
@@ -742,6 +743,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 \
@@ -976,6 +978,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 \
@@ -1314,7 +1317,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=""
@@ -1391,6 +1394,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 \