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 3213cef..4fa900f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
 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
        * */Makefile.am: More work on enabling static building on
        Windows. When building statically: Also define

diff --git a/configure.in b/configure.in
index 37d67a3..e9eea58 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 deb1739..c31419c 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@