On Thu, 12 Sep 2024 at 17:48:57 +0100, Simon McVittie wrote:
> As a future improvement, it might be worthwhile to restructure the GNUTLS
> patch so that it works more like this (pseudo-diff, hopefully you will
> see what I mean):
>
> --------
> diff...
> ---...
> +++...
> libcurl_la_CPPFLAGS = $(AM_CPPFLAGS) $(libcurl_la_CPPFLAGS_EXTRA)
> libcurl_la_LDFLAGS = $(AM_LDFLAGS) $(libcurl_la_LDFLAGS_EXTRA)
> $(CURL_LDFLAGS_LIB) $(LIBCURL_PC_LIBS_PRIVATE)
> libcurl_la_CFLAGS = $(AM_CFLAGS) $(libcurl_la_CFLAGS_EXTRA)
> +
> +if GNUTLSBUILD
> +libcurl_la_CPPFLAGS = $(libcurl_la_CPPFLAGS)
> +libcurl_la_LDFLAGS = $(libcurl_la_LDFLAGS)
> +libcurl_la_CFLAGS = $(libcurl_la_CFLAGS)
> +endif
> --------
Sorry, that should of course have said:
--------
diff...
---...
+++...
libcurl_la_CPPFLAGS = $(AM_CPPFLAGS) $(libcurl_la_CPPFLAGS_EXTRA)
libcurl_la_LDFLAGS = $(AM_LDFLAGS) $(libcurl_la_LDFLAGS_EXTRA)
$(CURL_LDFLAGS_LIB) $(LIBCURL_PC_LIBS_PRIVATE)
libcurl_la_CFLAGS = $(AM_CFLAGS) $(libcurl_la_CFLAGS_EXTRA)
+
+if GNUTLSBUILD
+libcurl_gnutls_la_CPPFLAGS = $(libcurl_la_CPPFLAGS)
+libcurl_gnutls_la_LDFLAGS = $(libcurl_la_LDFLAGS)
+libcurl_gnutls_la_CFLAGS = $(libcurl_la_CFLAGS)
+endif
--------
smcv
