]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Fix default build with libgnutls but absent GnuTLS headers (#1332)
authorFrancesco Chemolli <5175948+kinkie@users.noreply.github.com>
Thu, 27 Apr 2023 16:42:02 +0000 (16:42 +0000)
committerAmos Jeffries <yadij@users.noreply.github.com>
Fri, 28 Apr 2023 10:24:45 +0000 (22:24 +1200)
Ensure that when libgnutls is found but any of the required GnuTLS
headers cannot be used, GnuTLS support is not enabled by default and an
explicit request for GnuTLS support is fatally rejected during
./configure. Otherwise, the build fails later anyway, during "make".

The problem was exposed by a mingw-cross build.

configure.ac

index 2699d85e6d76ddea0f9450df8317f8bc68a365ba..e25587a39043feef2b2f6879213c899a2a3a39f8 100644 (file)
@@ -1093,7 +1093,8 @@ AS_IF([test "x$with_gnutls" != "xno"],[
     ## by testing for a 3.4.0+ function which we use
     AC_CHECK_LIB(gnutls,gnutls_pcert_export_x509,[LIBGNUTLS_LIBS="-lgnutls"])
   ])
-  AC_CHECK_HEADERS(gnutls/gnutls.h gnutls/x509.h gnutls/abstract.h)
+  # if any of the required headers is not found, signal we can't support gnutls
+  AC_CHECK_HEADERS([gnutls/gnutls.h gnutls/x509.h gnutls/abstract.h], [], [LIBGNUTLS_LIBS=""])
 
   SQUID_STATE_ROLLBACK(squid_gnutls_state) #de-pollute LIBS