Include the -mms-bitfields flag in GTK_EXTRA_CFLAGS on Win32, so that it

2005-03-24  Tor Lillqvist  <tml@novell.com>

	* configure.in (GTK_EXTRA_CFLAGS): Include the -mms-bitfields flag
	in GTK_EXTRA_CFLAGS on Win32, so that it gets included in the
	gtk+-2.0.pc file and automatically used by dependents. MSVC users
	who use pkg-config will have to manually edit it out from
	gtk+-2.0.pc, sorry. Maybe pkg-config should be enhanced to support
	some kind of conditionals in .pc files?

diff --git a/ChangeLog b/ChangeLog
index 0a51172c62644f68685cafd54db208035c727607..32b0cf70f289b0c698871a3a5542c0097111611a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-03-24  Tor Lillqvist  <tml@novell.com>
+
+       * configure.in (GTK_EXTRA_CFLAGS): Include the -mms-bitfields flag
+       in GTK_EXTRA_CFLAGS on Win32, so that it gets included in the
+       gtk+-2.0.pc file and automatically used by dependents. MSVC users
+       who use pkg-config will have to manually edit it out from
+       gtk+-2.0.pc, sorry. Maybe pkg-config should be enhanced to support
+       some kind of conditionals in .pc files?
+
 2005-03-23  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkfilechooserbutton.c (update_combo_box): Remove

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 0a51172c62644f68685cafd54db208035c727607..32b0cf70f289b0c698871a3a5542c0097111611a 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+2005-03-24  Tor Lillqvist  <tml@novell.com>
+
+       * configure.in (GTK_EXTRA_CFLAGS): Include the -mms-bitfields flag
+       in GTK_EXTRA_CFLAGS on Win32, so that it gets included in the
+       gtk+-2.0.pc file and automatically used by dependents. MSVC users
+       who use pkg-config will have to manually edit it out from
+       gtk+-2.0.pc, sorry. Maybe pkg-config should be enhanced to support
+       some kind of conditionals in .pc files?
+
 2005-03-23  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkfilechooserbutton.c (update_combo_box): Remove

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 0a51172c62644f68685cafd54db208035c727607..32b0cf70f289b0c698871a3a5542c0097111611a 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+2005-03-24  Tor Lillqvist  <tml@novell.com>
+
+       * configure.in (GTK_EXTRA_CFLAGS): Include the -mms-bitfields flag
+       in GTK_EXTRA_CFLAGS on Win32, so that it gets included in the
+       gtk+-2.0.pc file and automatically used by dependents. MSVC users
+       who use pkg-config will have to manually edit it out from
+       gtk+-2.0.pc, sorry. Maybe pkg-config should be enhanced to support
+       some kind of conditionals in .pc files?
+
 2005-03-23  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkfilechooserbutton.c (update_combo_box): Remove

diff --git a/configure.in b/configure.in
index d6cca74b8d4c005bc4bc84bf0e6baa5c276bd1fd..31e2ec7f009d3ce58f3d58c18f253a888e1f1518 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1501,6 +1501,10 @@ GTK_EXTRA_CFLAGS=
 GTK_DEP_LIBS="$GDK_EXTRA_LIBS $GTK_DEP_LIBS_FOR_X `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GTK_PACKAGES` $GTK_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS"
 GTK_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GTK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS $GTK_EXTRA_CFLAGS"
 
+if test x"$os_win32" = xyes; then
+  GTK_EXTRA_CFLAGS="$msnative_struct"
+fi
+
 AC_SUBST(GTK_PACKAGES)
 AC_SUBST(GTK_EXTRA_LIBS)
 AC_SUBST(GTK_EXTRA_CFLAGS)