merchant

commit d2b54123ab407a45e0a97c818211a6f0259abfb5
parent e3644e3555f59d4146246b43713e7cf3a63843c7
Author: Christian Grothoff <grothoff@gnunet.org>
Date:   Sun, 12 Oct 2025 22:00:56 +0200

improve multi-arch support

Diffstat:
M
configure.ac
 | 
24
++++++++++++++++--------

1 file changed, 16 insertions(+), 8 deletions(-)
diff --git a/configure.ac b/configure.ac
@@ -45,6 +45,14 @@ DX_RTF_FEATURE(OFF),
 DX_CHI_FEATURE(OFF),
 DX_XML_FEATURE(OFF))
 
+
+AC_CHECK_PROG([DPKG_ARCH], [dpkg-architecture], [yes], [no])
+if test "x$DPKG_ARCH" = "xyes"; then
+  MULTIARCH=`dpkg-architecture -qDEB_HOST_MULTIARCH`
+else
+  MULTIARCH=""
+fi
+
 AC_MSG_CHECKING([whether to compile documentation ONLY])
 AC_ARG_ENABLE([only-doc],
   [AS_HELP_STRING([--enable-only-doc], [only compile Taler documentation])],
@@ -102,7 +110,7 @@ AC_ARG_WITH([microhttpd],
 AS_CASE([$with_microhttpd],
         [yes], [],
         [no], [AC_MSG_ERROR([--with-microhttpd is required])],
-        [LDFLAGS="-L$with_microhttpd/lib $LDFLAGS"
+        [LDFLAGS="-L$with_microhttpd/lib/$MULTIARCH -L$with_microhttpd/lib/ $LDFLAGS"
          CPPFLAGS="-I$with_microhttpd/include $CPPFLAGS"])
 MHD_VERSION_AT_LEAST([0.9.71])
 
@@ -159,7 +167,7 @@ AC_ARG_WITH(qrencode,
       [
         CPPFLAGS="-I$with_qrencode/include $CPPFLAGS"
         QR_CFLAGS="-I$with_qrencode/include"
-        QR_LIBS="-L$with_qrencode/lib -lqrencode"
+        QR_LIBS="-L$with_qrencode/lib/$MULTIARCH -L$with_qrencode/lib/ -lqrencode"
         AC_CHECK_HEADERS(qrencode.h,qrencode=1)
       ])
    ],
@@ -205,7 +213,7 @@ AC_ARG_WITH(gnunet,
 AS_CASE([$with_gnunet],
         [yes], [],
         [no], [AC_MSG_ERROR([--with-gnunet is required])],
-        [LDFLAGS="-L$with_gnunet/lib $LDFLAGS"
+        [LDFLAGS="-L$with_gnunet/lib/$MULTIARCH -L$with_gnunet/lib/ $LDFLAGS"
          CPPFLAGS="-I$with_gnunet/include $CPPFLAGS"])
 AC_CHECK_HEADERS([gnunet/gnunet_util_lib.h],
  [AC_CHECK_LIB([gnunetutil], [GNUNET_SCHEDULER_run], libgnunetutil=1)])
@@ -249,7 +257,7 @@ AC_ARG_WITH(exchange,
 AS_CASE([$with_exchange],
         [yes], [],
         [no], [AC_MSG_ERROR([--with-exchange is required])],
-        [LDFLAGS="-L$with_exchange/lib $LDFLAGS"
+        [LDFLAGS="-L$with_exchange/lib/$MULTIARCH -L$with_exchange/lib/ $LDFLAGS"
          CPPFLAGS="-I$with_exchange/include $CPPFLAGS $POSTGRESQL_CPPFLAGS"])
 
 AC_CHECK_HEADERS([taler/taler_util.h],
@@ -273,7 +281,7 @@ AC_ARG_WITH(exchange,
 AS_CASE([$with_exchange],
         [yes], [],
         [no], [AC_MSG_ERROR([--with-exchange is required])],
-        [LDFLAGS="-L$with_exchange/lib $LDFLAGS"
+        [LDFLAGS="-L$with_exchange/lib/$MULTIARCH -L$with_exchange/lib/ $LDFLAGS"
          CPPFLAGS="-I$with_exchange/include $CPPFLAGS $POSTGRESQL_CPPFLAGS"])
 
 AC_CHECK_HEADERS([taler/taler_exchange_service.h],
@@ -298,7 +306,7 @@ AC_ARG_WITH(donau,
 AS_CASE([$with_donau],
         [yes], [],
         [no], [],
-        [LDFLAGS="-L$with_donau/lib $LDFLAGS"
+        [LDFLAGS="-L$with_donau/lib/$MULTIARCH -L$with_donau/lib/ $LDFLAGS"
          CPPFLAGS="-I$with_donau/include $CPPFLAGS $POSTGRESQL_CPPFLAGS"])
 
 AC_CHECK_HEADERS([donau/donau_service.h],
@@ -317,7 +325,7 @@ AC_ARG_WITH(exchange,
 AS_CASE([$with_exchange],
         [yes], [],
         [no], [AC_MSG_ERROR([--with-exchange is required])],
-        [LDFLAGS="-L$with_exchange/lib $LDFLAGS"
+        [LDFLAGS="-L$with_exchange/lib/$MULTIARCH -L$with_exchange/lib/ $LDFLAGS"
          CPPFLAGS="-I$with_exchange/include $CPPFLAGS $POSTGRESQL_CPPFLAGS"])
 
 AC_CHECK_HEADERS([taler/taler_mhd_lib.h],
@@ -381,7 +389,7 @@ AC_ARG_WITH([twister],
 AS_CASE([$with_twister],
         [yes], [],
         [no], [AC_MSG_WARN([no twister-testing will be compiled])],
-        [LDFLAGS="-L$with_twister/lib $LDFLAGS"
+        [LDFLAGS="-L$with_twister/lib/$MULTIARCH -L$with_twister/lib/ $LDFLAGS"
          CPPFLAGS="-I$with_twister/include $CPPFLAGS"])
 AC_CHECK_LIB(talertwistertesting,TALER_TWISTER_run_twister,
   [AC_CHECK_HEADER([taler/taler_twister_testing_lib.h],[twistertesting=1])])