From: Tor Lillqvist <tml@novell.com>
Date: Mon, 21 Apr 2008 12:24:49 +0000 (+0000)
Subject: Bug 528752 - Win32 build and SSL not working
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=cca1c88ea1262e7aebee7e38f1ea3f8973d99a74;p=dana%2Fcg-glib.git

Bug 528752 - Win32 build and SSL not working

2008-04-21  Tor Lillqvist  <tml@novell.com>

	Bug 528752 - Win32 build and SSL not working

	This bug report against libsoup points out an issue with the use
	of bitfields in the GIOChannel struct that should really be taken
	care of here in GLib.

	* configure.in: Add Autoconf variable GLIB_EXTRA_CFLAGS which will
	contain the -mms-bitfields flag on Windows.

	* glib-2.0.pc.in: Add it to Cflags.


svn path=/trunk/; revision=6868
---

diff --git a/ChangeLog b/ChangeLog
index 3213cef5..4fa900fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2008-04-21  Tor Lillqvist  <tml@novell.com>
+
+	Bug 528752 - Win32 build and SSL not working
+
+	This bug report against libsoup points out an issue with the use
+	of bitfields in the GIOChannel struct that should really be taken
+	care of here in GLib.
+
+	* configure.in: Add Autoconf variable GLIB_EXTRA_CFLAGS which will
+	contain the -mms-bitfields flag on Windows.
+	
+	* glib-2.0.pc.in: Add it to Cflags.
+
 2008-04-21  Tor Lillqvist  <tml@novell.com>
 
 	* configure.in
diff --git a/configure.in b/configure.in
index 37d67a34..e9eea582 100644
--- a/configure.in
+++ b/configure.in
@@ -321,6 +321,8 @@ if test x"$glib_native_win32" = xyes; then
     fi
   fi
 fi
+GLIB_EXTRA_CFLAGS="${msnative_struct}"
+AC_SUBST(GLIB_EXTRA_CFLAGS)
 
 AC_EXEEXT
 
diff --git a/glib-2.0.pc.in b/glib-2.0.pc.in
index deb1739f..c31419c1 100644
--- a/glib-2.0.pc.in
+++ b/glib-2.0.pc.in
@@ -11,5 +11,4 @@ Name: GLib
 Description: C Utility Library
 Version: @VERSION@
 Libs: -L${libdir} -lglib-2.0 @INTLLIBS@ @ICONV_LIBS@
-Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include 
-
+Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include @GLIB_EXTRA_CFLAGS@