]> 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)
committerSquid Anubis <squid-anubis@squid-cache.org>
Thu, 27 Apr 2023 19:10:18 +0000 (19:10 +0000)
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 6bb72f0eedcfb60667776d341126fbcd4831bb0e..a7429a86eb943446060a8f8db96ee1293849f67d 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