[vlc-commits] configure: Don't make the crypt/bcrypt libs dependent of libssp

[Martin Storsjö]

vlc | branch: master | Martin Storsjö <martin at martin.st> | Thu Apr 26 01:05:12 2018 +0300| [fa6ce2425b6680b7956f76610b67091975822b86] | committer: Martin Storsjö

configure: Don't make the crypt/bcrypt libs dependent of libssp

These should still be added if ssp is disabled.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=fa6ce2425b6680b7956f76610b67091975822b86
---

 configure.ac | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index a3758704ac..bffa7fe1c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1128,10 +1128,6 @@ AS_IF([test "${enable_ssp}" != "no" -a "${enable_optimizations}" != "no"], [
   dnl Win32 requires linking to ssp for stack-protection
   AS_IF([test "${SYS}" = "mingw32"], [
       LDFLAGS="${LDFLAGS} -lssp"
-      dnl library for Crypt/BCrypt APIs
-      AS_IF([test "${vlc_winstore_app}" != 1], 
-            [LDFLAGS="${LDFLAGS} -ladvapi32"],
-            [LDFLAGS="${LDFLAGS} -lbcrypt"])
       AC_CACHE_CHECK([if linker supports stack protectors], [ac_cv_ld_ssp], [
         AC_TRY_LINK([#include <stdio.h>],[char buf[100]; fgets(buf, sizeof(buf), stdin);], [
           ac_cv_ld_ssp="yes"
@@ -1143,6 +1139,13 @@ AS_IF([test "${enable_ssp}" != "no" -a "${enable_optimizations}" != "no"], [
   ])
 ])
 
+AS_IF([test "${SYS}" = "mingw32"], [
+    dnl library for Crypt/BCrypt APIs
+    AS_IF([test "${vlc_winstore_app}" != 1],
+          [LDFLAGS="${LDFLAGS} -ladvapi32"],
+          [LDFLAGS="${LDFLAGS} -lbcrypt"])
+])
+
 VLC_SAVE_FLAGS
 LDFLAGS="${LDFLAGS} -Wl,-Bsymbolic"
 AC_CACHE_CHECK([if linker supports -Bsymbolic], [ac_cv_ld_bsymbolic], [