Skip to content

Commit

Permalink
Clause to apply bug fix to windows builds only.
Browse files Browse the repository at this point in the history
also fixes static builds in windows
  • Loading branch information
aciddude committed Feb 7, 2017
1 parent bf5573a commit ad4dd88
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions configure.ac
Expand Up @@ -196,10 +196,13 @@ case $host in
# AX_CHECK_LINK_FLAG([[-static]],[LDFLAGS="$LDFLAGS -static"])
AX_CHECK_LINK_FLAG([[-static-libgcc]],[LDFLAGS="$LDFLAGS -static-libgcc"])
AX_CHECK_LINK_FLAG([[-static-libstdc++]],[LDFLAGS="$LDFLAGS -static-libstdc++"])
# -static is interpreted by libtool, where it has a different meaning.
# In libtool-speak, it's -all-static.
AX_CHECK_LINK_FLAG([[-static]],[LDFLAGS="$LDFLAGS -static"; LIBTOOL_LDFLAGS="$LIBTOOL_LDFLAGS -static"])


# the below fixes a bug in windows static builds.
if test x$Q_OS_WIN; then
AX_CHECK_LINK_FLAG([[-static]],[LDFLAGS="$LDFLAGS -static"; LIBTOOL_LDFLAGS="$LIBTOOL_LDFLAGS -static"])
AC_MSG_NOTICE([NOTICE: You're building for Windows])
fi

AC_PATH_PROG([MAKENSIS], [makensis], none)
if test x$MAKENSIS = xnone; then
AC_MSG_WARN("makensis not found. Cannot create installer.")
Expand Down

0 comments on commit ad4dd88

Please sign in to comment.