glib r6867 - branches/glib-2-16

[tml svn gnome org]

Author: tml
Date: Mon Apr 21 12:11:05 2008
New Revision: 6867
URL: http://svn.gnome.org/viewvc/glib?rev=6867&view=rev

Log:
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.



Modified:
   branches/glib-2-16/ChangeLog
   branches/glib-2-16/configure.in
   branches/glib-2-16/glib-2.0.pc.in

Modified: branches/glib-2-16/configure.in
==============================================================================
--- branches/glib-2-16/configure.in	(original)
+++ branches/glib-2-16/configure.in	Mon Apr 21 12:11:05 2008
@@ -347,6 +347,8 @@
     fi
   fi
 fi
+GLIB_EXTRA_CFLAGS="${msnative_struct}"
+AC_SUBST(GLIB_EXTRA_CFLAGS)
 
 AC_EXEEXT
 

Modified: branches/glib-2-16/glib-2.0.pc.in
==============================================================================
--- branches/glib-2-16/glib-2.0.pc.in	(original)
+++ branches/glib-2-16/glib-2.0.pc.in	Mon Apr 21 12:11:05 2008
@@ -11,5 +11,4 @@
 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@