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 3213cef58144f3e718afcdec79fa4b6822bd4acd..4fa900fe1393031dee53334ee5801834f8a1b867 100644 (file)
--- 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 37d67a3430ad3ebb430e6e85a07775cf792ed244..e9eea58244270b9f4ad5e82c228fbe73b8653053 100644 (file)
--- 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 deb1739f9f8196ba1e947c3b4ec75b273bcebf26..c31419c164d70c6feeebecde100b97770b99c7c9 100644 (file)
--- 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@