libmicrohttpd2

commit c327ce593eef5ed9a9cb7f3b1fb5427ed6a395d8
parent e6ee8f53b19a9c9dc4b325d0a3673cc460224f6a
Author: Evgeny Grin (Karlson2k) <k2k@drgrin.dev>
Date:   Tue,  9 Dec 2025 10:47:27 +0100

Partial revert "get configure.ac to work", revert "-fix linker issue"

Fixed duplicated flags for TLS-enabled builds

This partialy reverts commit f17b51ab9ea757c59f209a042bac818d9a0b6287.
This reverts commit ecd930163de47ed56c021f62d275f3100c46da90.

Diffstat:
M
src/mhd2/Makefile.am
 | 
51
++++++---------------------------------------------

1 file changed, 6 insertions(+), 45 deletions(-)
diff --git a/src/mhd2/Makefile.am b/src/mhd2/Makefile.am
@@ -18,9 +18,6 @@ AM_TESTS_ENVIRONMENT = $(TESTS_ENVIRONMENT_ac)
 lib_LTLIBRARIES = \
   libmicrohttpd2.la
 
-crypt_LDFLAGS = $(MHD_TLS_LIB_LDFLAGS)
-crypt_LIBDEPS = $(MHD_TLS_LIBDEPS)
-
 noinst_DATA =
 MOSTLYCLEANFILES =
 
@@ -163,36 +160,16 @@ if MHD_MD5_EXTR
     md5_ext.h \
     mhd_md5.h
 
-if MHD_SUPPORT_MBEDTLS
-# mhd_rng.c always links against mbedcrypto if it is at
-# all supported, not only for hashing (which we deal with below)
-  crypt_LDFLAGS += $(MBEDTLS_LDFLAGS)
-  crypt_LIBDEPS += $(MBEDTLS_LIBS) -lmbedcrypto
-endif
-
-
 if MHD_SUPPORT_OPENSSL
     md5_OPTSOURCES += \
       md5_ext_openssl.c
-    crypt_LDFLAGS += \
-      $(OPENSSL_LDFLAGS)
-    crypt_LIBDEPS += \
-      $(OPENSSL_LIBS)
 else
 if MHD_SUPPORT_GNUTLS
       md5_OPTSOURCES += \
         md5_ext_gnutls.c
-      crypt_LDFLAGS += \
-        $(GNUTLS_LDFLAGS)
-      crypt_LIBDEPS += \
-        $(GNUTLS_LIBS)
 else
       md5_OPTSOURCES += \
         md5_ext_mbedtls.c
-      crypt_LDFLAGS += \
-        $(MBEDTLS_LDFLAGS)
-      crypt_LIBDEPS += \
-        -lmbedcrypto
 endif
 endif
 else
@@ -209,18 +186,10 @@ if MHD_SHA256_EXTR
 if MHD_SUPPORT_OPENSSL
     sha256_OPTSOURCES += \
       sha256_ext_openssl.c
-    crypt_LDFLAGS += \
-      $(OPENSSL_LDFLAGS)
-    crypt_LIBDEPS += \
-      $(OPENSSL_LIBS)
 else
 if MHD_SUPPORT_GNUTLS
       sha256_OPTSOURCES += \
         sha256_ext_gnutls.c
-      crypt_LDFLAGS += \
-        $(GNUTLS_LDFLAGS)
-      crypt_LIBDEPS += \
-        $(GNUTLS_LIBS)
 else
       sha256_OPTSOURCES += \
         sha256_ext_mbedtls.c
@@ -239,19 +208,11 @@ if MHD_SHA512_256_EXTR
     mhd_sha512_256.h
 
 if MHD_SUPPORT_OPENSSL
-  sha256_OPTSOURCES += \
-    sha512_256_ext_openssl.c
-  crypt_LDFLAGS += \
-    $(OPENSSL_LDFLAGS)
-  crypt_LIBDEPS += \
-    $(OPENSSL_LIBS)
+    sha256_OPTSOURCES += \
+      sha512_256_ext_openssl.c
 else
-  sha256_OPTSOURCES += \
-    sha512_256_ext_mbedtls.c
-  crypt_LDFLAGS += \
-    $(MBEDTLS_LDFLAGS)
-  crypt_LIBDEPS += \
-    -lmbedcrypto
+    sha256_OPTSOURCES += \
+      sha512_256_ext_mbedtls.c
 endif
 else
   sha512_256_OPTSOURCES = \
@@ -350,12 +311,12 @@ libmicrohttpd2_la_CPPFLAGS = \
 libmicrohttpd2_la_CFLAGS = \
   $(AM_CFLAGS) $(MHD_LIB_CFLAGS)
 libmicrohttpd2_la_LDFLAGS = \
-  $(AM_LDFLAGS) $(MHD_LIB_LDFLAGS) $(crypt_LDFLAGS) \
+  $(AM_LDFLAGS) $(MHD_LIB_LDFLAGS) $(MHD_TLS_LIB_LDFLAGS) \
   $(W32_MHD_LIB_LDFLAGS) \
   -export-dynamic -no-undefined \
   -version-info @LIB_VER_CURRENT@:@LIB_VER_REVISION@:@LIB_VER_AGE@
 libmicrohttpd2_la_LIBADD = \
-  $(MHD_LIBDEPS) $(MHD_TLS_LIBDEPS) $(crypt_LIBDEPS)
+  $(MHD_LIBDEPS) $(MHD_TLS_LIBDEPS)
 libmicrohttpd2_la_SHORTNAME = mhd2