From: Michael R Sweet <msweet@msweet.org>
Date: Sat, 6 Mar 2021 17:55:33 +0000 (-0500)
Subject: Make sure 32-bit build still includes 64-bit dev libraries for pkg-config to see... 
X-Git-Tag: v2.4b1~224
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=23eabf4472d5cf3a88f350dce36faee25004a36a;p=thirdparty%2Fcups.git

Make sure 32-bit build still includes 64-bit dev libraries for pkg-config to see them.
---

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f04d6cc6b5..1dc4a83c4c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -33,7 +33,7 @@ jobs:
     - name: setup multiarch for i386
       run: sudo dpkg --add-architecture i386
     - name: install prerequisites
-      run: sudo apt-get install -y avahi-daemon libavahi-client-dev:i386 libgnutls28-dev:i386 libpam-dev:i386 libusb-1.0-0-dev:i386 zlib1g-dev:i386 crossbuild-essential-i386
+      run: sudo apt-get install -y avahi-daemon libavahi-client-dev libavahi-client-dev:i386 libgnutls28-dev libgnutls28-dev:i386 libpam-dev libpam-dev:i386 libusb-1.0-0-dev libusb-1.0-0-dev:i386 zlib1g-dev zlib1g-dev:i386 crossbuild-essential-i386
     - name: configure
       env:
         CC: /usr/bin/i686-linux-gnu-gcc
diff --git a/config-scripts/cups-tls.m4 b/config-scripts/cups-tls.m4
index 65358960a3..8d335a264d 100644
--- a/config-scripts/cups-tls.m4
+++ b/config-scripts/cups-tls.m4
@@ -63,10 +63,6 @@ AS_IF([test $with_tls = yes -o $with_tls = gnutls], [
 	    AC_DEFINE([HAVE_GNUTLS], [1], [Do we have the GNU TLS library?])
 	], [
 	    AC_MSG_RESULT([no])
-	    echo "pkg-config --list-all"
-	    $PKGCONFIG --list-all
-	    echo "pkg-config --print-requires gnutls"
-	    $PKGCONFIG --print-requires gnutls
 	])
     ])
     AS_IF([test $have_tls = 0 -a "x$LIBGNUTLSCONFIG" != x], [
diff --git a/configure b/configure
index 76ef959892..54ad2a1178 100755
--- a/configure
+++ b/configure
@@ -9639,10 +9639,6 @@ else $as_nop
 
 	    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-	    echo "pkg-config --list-all"
-	    $PKGCONFIG --list-all
-	    echo "pkg-config --print-requires gnutls"
-	    $PKGCONFIG --print-requires gnutls
 
 fi