From cca1c88ea1262e7aebee7e38f1ea3f8973d99a74 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 21 Apr 2008 12:24:49 +0000 Subject: [PATCH] Bug 528752 - Win32 build and SSL not working 2008-04-21 Tor Lillqvist 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 --- ChangeLog | 13 +++++++++++++ configure.in | 2 ++ glib-2.0.pc.in | 3 +-- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3213cef..4fa900f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,18 @@ 2008-04-21 Tor Lillqvist + 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 + * 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 --- 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 --- 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@ -- 2.7.4