anastasis-gtk

commit 410bc3a1dbdccd5e551acb222981a4eb4185852d
parent 0c17cf992250fe23cc1ac72433cd23f82f442a38
Author: Christian Grothoff <grothoff@gnunet.org>
Date:   Sun, 12 Oct 2025 19:38:44 +0200

improve multiarch support

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

1 file changed, 15 insertions(+), 7 deletions(-)
diff --git a/configure.ac b/configure.ac
@@ -44,6 +44,14 @@ AC_CANONICAL_HOST
 AC_DISABLE_STATIC
 LT_INIT
 
+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_SYS_LARGEFILE
 AC_FUNC_FSEEKO
 AC_TYPE_UID_T
@@ -177,7 +185,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],
@@ -212,7 +220,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)
       ])
    ],
@@ -243,7 +251,7 @@ AC_ARG_WITH(haru,
       [
         CPPFLAGS="-I$with_haru/include $CPPFLAGS"
         HPDF_CFLAGS="-I$with_haru/include"
-        HPDF_LIBS="-L$with_haru/lib -lhpdf"
+        HPDF_LIBS="-L$with_haru/lib/$MULTIARCH -L$with_haru/lib/ -lhpdf"
         AC_CHECK_HEADERS(hpdf.h,[haru=1])
       ])
    ],
@@ -274,11 +282,11 @@ AC_ARG_WITH(anastasis,
           AC_CHECK_LIB([anastasisrest], [ANASTASIS_get_config],
             [anastasis=1]))
       ],[
-        LDFLAGS="-L$with_anastasis/lib $LDFLAGS"
+        LDFLAGS="-L$with_anastasis/lib/$MULTIARCH -L$with_anastasis/lib/ $LDFLAGS"
         CPPFLAGS="-I$with_anastasis/include $CPPFLAGS"
         AC_CHECK_HEADERS([anastasis/anastasis_service.h],
           AC_CHECK_LIB([anastasisrest], [ANASTASIS_get_config],
-            EXT_LIB_PATH="-L$with_anastasis/lib $EXT_LIB_PATH"
+            EXT_LIB_PATH="-L$with_anastasis/lib/$MULTIARCH -L$with_anastasis/lib/ $EXT_LIB_PATH"
             [anastasis=1]))
       ])
    ],
@@ -305,7 +313,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"])
 AC_CHECK_LIB(microhttpd,MHD_start_daemon,
   [AC_CHECK_HEADER([microhttpd.h],[microhttpd=1])])
@@ -350,7 +358,7 @@ AC_ARG_WITH(glade,
 AS_IF([test "x$glade" = "x0" -a ! "x$lookin" = "x"],
 [
   AC_MSG_CHECKING([for Glade3 in $lookin])
-  GLADE_LIBS="-L${lookin}/lib"
+  GLADE_LIBS="-L${lookin}/lib/$MULTIARCH -L${lookin}/lib"
   GLADE_CFLAGS="-I${lookin}/include/libgladeui-2.0"
   GLADE_CPPFLAGS="-I${lookin}/include/libgladeui-2.0"
   LIBS="$GLADE_LIBS $LIBS"