From: Jason Ish <jason.ish@oisf.net>
Date: Mon, 30 Nov 2020 21:37:02 +0000 (-0600)
Subject: configure/mingw: move libs in LDFLAGS to LDADD
X-Git-Tag: suricata-5.0.5~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=976f4a2d38cbf252ac8fc3d9fe67c619b914b8c2;p=thirdparty%2Fsuricata.git

configure/mingw: move libs in LDFLAGS to LDADD

Moving the libs specified in LDFLAGS to LDADD put them into the
correct placement on in the link command.

(cherry picked from commit 10f639e9d1edae14d87feb66059723d87b3efdb8)
---

diff --git a/configure.ac b/configure.ac
index 21be5bcfda..1b586eca4d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -290,12 +290,11 @@
             ;;
         *-*-mingw32*|*-*-msys)
             CFLAGS="${CFLAGS} -DOS_WIN32"
-            LDFLAGS="${LDFLAGS} -lws2_32 -liphlpapi -lwbemuuid -lOle32 -lOleAut32 -lUuid"
             WINDOWS_PATH="yes"
             PCAP_LIB_NAME="wpcap"
             AC_DEFINE([HAVE_NON_POSIX_MKDIR], [1], [mkdir is not POSIX compliant: single arg])
             RUST_SURICATA_LIBNAME="suricata.lib"
-            RUST_LDADD="-luserenv -lshell32 -ladvapi32 -lgcc_eh"
+            RUST_LDADD=" -lws2_32 -liphlpapi -lwbemuuid -lOle32 -lOleAut32 -lUuid -luserenv -lshell32 -ladvapi32 -lgcc_eh"
             ;;
         *-*-cygwin)
             LUA_LIB_NAME="lua"