Author: Ole Streicher <olebole@debian.org>
Description: Use standard path and name for cpl
--- a/m4macros/cpl.m4
+++ b/m4macros/cpl.m4
@@ -1250,7 +1250,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=""
@@ -1325,6 +1325,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"
 
--- a/hdrl/m4macros/cpl.m4
+++ b/hdrl/m4macros/cpl.m4
@@ -1250,7 +1250,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=""
@@ -1325,6 +1325,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"