From: Martin Willi <martin@revosec.ch>
Date: Tue, 3 Jun 2014 09:06:50 +0000 (+0200)
Subject: windows: Compile with -mno-ms-bitfields if option not set explicitly
X-Git-Tag: 5.2.0dr6~24^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3b7b806d27024b71506ba3b803fd5b42dd40b745;p=thirdparty%2Fstrongswan.git

windows: Compile with -mno-ms-bitfields if option not set explicitly

-mms-bitfields is the default in newer MinGWs, but it breaks
__attribute__((packed)).
---

diff --git a/configure.ac b/configure.ac
index 20e40327b9..d069a168d2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -746,6 +746,11 @@ AC_COMPILE_IFELSE(
 		windows=true
 		openssl_lib=eay32
 		AC_SUBST(PTHREADLIB, "")
+		# explicitly disable ms-bitfields, as it breaks __attribute__((packed))
+		case "$CFLAGS" in
+			*ms-bitfields*) ;;
+			*) CFLAGS="$CFLAGS -mno-ms-bitfields" ;;
+		esac
 	],
 	[
 		AC_MSG_RESULT([no])