commit c55556632a4f4f705ce637e9ad9e8dc1c01eeb3d
parent 7ac7182ca07039e4a79b15cf1f534662467267eb
Author: Evgeny Grin (Karlson2k) <k2k@drgrin.dev>
Date: Tue, 31 Mar 2026 00:08:54 +0200
configure: report used LIBS
Related Makefile fix in included in this commit
Diffstat:
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
@@ -2362,7 +2362,7 @@ AS_IF([test "x$USE_THREADS" = "xposix"],
AC_DEFINE([mhd_THREADS_KIND_POSIX],[1],[define to use pthreads])
MHD_LIB_CFLAGS="$MHD_LIB_CFLAGS $PTHREAD_CFLAGS"
MHD_LIBDEPS="$PTHREAD_LIBS $MHD_LIBDEPS"
- MHD_LIBDEPS_PKGCFG="$PTHREAD_LIBS $MHD_LIBDEPS_PKGCFG"],
+ MHD_LIBDEPS_PKGCFG="$MHD_LIBDEPS_PKGCFG $PTHREAD_LIBS"],
[AS_IF([test "x$USE_THREADS" = "xw32"],
[AC_DEFINE([mhd_THREADS_KIND_W32],[1],[define to use W32 threads])])])
AM_CONDITIONAL([USE_POSIX_THREADS], [test "x$USE_THREADS" = "xposix"])
@@ -9411,12 +9411,14 @@ MHD_PREPEND_FLAG_TO_VAR([fin_LDFLAGS],[$LDFLAGS_ac])
fin_lib_CPPFLAGS="$user_CPPFLAGS"
fin_lib_CFLAGS="$user_CFLAGS"
fin_lib_LDFLAGS="$user_LDFLAGS"
+fin_lib_LIBS="${MHD_LIBDEPS}"
MHD_PREPEND_FLAG_TO_VAR([fin_lib_CPPFLAGS],[$MHD_LIB_CPPFLAGS])
MHD_PREPEND_FLAG_TO_VAR([fin_lib_CFLAGS],[$MHD_LIB_CFLAGS])
MHD_PREPEND_FLAG_TO_VAR([fin_lib_LDFLAGS],[$MHD_LIB_LDFLAGS])
MHD_PREPEND_FLAG_TO_VAR([fin_lib_CPPFLAGS],[$CPPFLAGS_ac])
MHD_PREPEND_FLAG_TO_VAR([fin_lib_CFLAGS],[$CFLAGS_ac])
MHD_PREPEND_FLAG_TO_VAR([fin_lib_LDFLAGS],[$LDFLAGS_ac])
+MHD_PREPEND_FLAG_TO_VAR([fin_lib_LIBS],[${MHD_TLS_LIBDEPS}])
AC_MSG_NOTICE([Toolchain settings:
CC=$CC
User/system/default flags:
@@ -9427,10 +9429,12 @@ AC_MSG_NOTICE([Toolchain settings:
CPPFLAGS="$fin_CPPFLAGS"
CFLAGS= "$fin_CFLAGS"
LDFLAGS= "$fin_LDFLAGS"
+ LIBS= "$LIBS"
Final set of the flags for ${PACKAGE_NAME} library:
CPPFLAGS="$fin_lib_CPPFLAGS"
CFLAGS= "$fin_lib_CFLAGS"
LDFLAGS= "$fin_lib_LDFLAGS"
+ LIBS= "$fin_lib_LIBS"
])
AS_UNSET([fin_CPPFLAGS])
AS_UNSET([fin_CFLAGS])
diff --git a/src/mhd2/Makefile.am b/src/mhd2/Makefile.am
@@ -333,7 +333,7 @@ libmicrohttpd2_la_LDFLAGS = \
-export-dynamic -no-undefined \
-version-info @LIB_VER_CURRENT@:@LIB_VER_REVISION@:@LIB_VER_AGE@
libmicrohttpd2_la_LIBADD = \
- $(MHD_LIBDEPS) $(MHD_TLS_LIBDEPS)
+ $(MHD_TLS_LIBDEPS) $(MHD_LIBDEPS)
libmicrohttpd2_la_SHORTNAME = mhd2