[Gtk2hs-commit] gtk2hs ChangeLog,1.343,1.344 configure.ac,1.28,1.29 Makefile.am,1.46,1.47

[Duncan C. <dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21710

Modified Files:
	ChangeLog configure.ac Makefile.am 
Log Message:
Makefile.am: use -DWIN32 for the gtk modules when building on win32.
  This is only needed for gtk/Graphics/UI/Gtk.hs but the deps calculation needs
  it too so we have to specify it for the whole gtk pacakge.
#include"gtk/wingtk.h" when compiling Gtk.General.General
Add gtk/wingtk.h to EXTRA_DIST.

gtk/wingtk.h: #include <gtk/gtk.h> before the #undef directives so that it
  will not matter which order ghc puts the #includes when compiling via C.
gtk/gtk.h has include guards so it can safely be included more than once.

configure.ac: remove WIN32 from config.h again. We can pass -DWIN32 to ghc
  instead.
Make the default be to disable the gnome and mozilla packages on win32.

Bump version to 0.9.7.1_rc2


Index: configure.ac
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/configure.ac,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- configure.ac	7 Feb 2005 15:39:48 -0000	1.28
+++ configure.ac	11 Feb 2005 12:52:05 -0000	1.29
@@ -21,7 +21,7 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl ######################################################################
 
-AC_INIT(gtk2hs, 0.9.7.1_rc1)
+AC_INIT(gtk2hs, 0.9.7.1_rc2)
 AM_INIT_AUTOMAKE
 
 dnl * We require autoconf version 2.50
@@ -116,9 +116,6 @@
   CREATE_TYPES=default;
 fi;
 
-if test "$WIN32" = "yes"; then
-  AC_DEFINE(WIN32, [], [Are we building on a Win32 system])
-fi
 AM_CONDITIONAL(WIN32, test "$WIN32" = "yes")
 
 dnl determine a temporary directory for c2hs
@@ -289,9 +286,15 @@
 dnl Check if user wants the various gnome modules. Defaults to yes.
 AC_MSG_CHECKING([whether to build gnome bindings])
 
+if test "$WIN32" = "yes"; then
+  ENABLE_GNOME_DEFAULT=no
+else
+  ENABLE_GNOME_DEFAULT=yes
+fi
+
 AC_ARG_ENABLE(gnome,
               [  --disable-gnome         do not generate bindings for any gnome modules],
-              [ENABLE_GNOME=$enableval],[ENABLE_GNOME=yes])
+              [ENABLE_GNOME=$enableval],[ENABLE_GNOME=$ENABLE_GNOME_DEFAULT])
 
 AC_MSG_RESULT($ENABLE_GNOME)
 AM_CONDITIONAL(ENABLE_GNOME, test x$ENABLE_GNOME = xyes)
@@ -299,9 +302,15 @@
 dnl Check if user wants the Mozilla's browser engine widget. Defaults to yes.
 AC_MSG_CHECKING([whether to build mozembed bindings])
 
+if test "$WIN32" = "yes"; then
+  ENABLE_MOZEMBED_DEFAULT=no
+else
+  ENABLE_MOZEMBED_DEFAULT=yes
+fi
+
 AC_ARG_ENABLE(mozilla,
               [  --disable-mozilla       do not generate bindings for the Mozilla display widget],
-              [ENABLE_MOZEMBED=$enableval],[ENABLE_MOZEMBED=yes])
+              [ENABLE_MOZEMBED=$enableval],[ENABLE_MOZEMBED=$ENABLE_MOZEMBED_DEFAULT])
 
 AC_MSG_RESULT($ENABLE_MOZEMBED)
 AM_CONDITIONAL(ENABLE_MOZEMBED, test x$ENABLE_MOZEMBED = xyes)

Index: Makefile.am
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile.am,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- Makefile.am	7 Feb 2005 00:04:27 -0000	1.46
+++ Makefile.am	11 Feb 2005 12:52:05 -0000	1.47
@@ -12,7 +12,8 @@
 	tools/c2hs/toplevel/c2hs_config.h	\
 	tools/hierarchyGen/hierarchy.list	\
 	tools/hierarchyGen/Hierarchy.chs.template \
-	sourceview/sourceview.h
+	sourceview/sourceview.h			\
+	gtk/wingtk.h
 
 # There are no other files in these dirs and tar excludes empty dirs
 dist-hook:
@@ -439,6 +440,11 @@
 gtk_Graphics_UI_Gtk_Gdk_Region_hs_HCFLAGS	= -fglasgow-exts
 gtk_Graphics_UI_Gtk_Gdk_Drawable_hs_HCFLAGS	= -fglasgow-exts
 
+if WIN32
+libHSgtk_a_HCFLAGS				+= -DWIN32
+gtk_Graphics_UI_Gtk_General_General_hs_HCFLAGS	= '-\#include"gtk/wingtk.h"'
+endif
+
 libHSgtk_a_LIBADD =							\
 	gtk/Graphics/UI/Gtk/Abstract/Container_stub.o			\
 	gtk/Graphics/UI/Gtk/Multiline/TextIter_stub.o			\

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.343
retrieving revision 1.344
diff -u -d -r1.343 -r1.344
--- ChangeLog	10 Feb 2005 02:58:01 -0000	1.343
+++ ChangeLog	11 Feb 2005 12:52:04 -0000	1.344
@@ -1,3 +1,20 @@
+2005-02-11 Duncan Coutts <du...@co...>
+
+	* Makefile.am: use -DWIN32 for the gtk modules when building on win32.
+	This is only needed for gtk/Graphics/UI/Gtk.hs but the deps
+	calculation needs it too so we have to specify it for the whole gtk
+	pacakge. #include"gtk/wingtk.h" when compiling Gtk.General.General and
+	add gtk/wingtk.h to EXTRA_DIST.
+
+	* gtk/wingtk.h: #include <gtk/gtk.h> before the #undef directives so
+	that it will not matter which order ghc puts the #includes when
+	compiling via C. gtk/gtk.h has include guards so it can safely be
+	included more than once.
+
+	* configure.ac: remove WIN32 from config.h again. We can pass -DWIN32
+	to ghc instead. Make the default be to disable the gnome and mozilla
+	packages on win32. Bump version to 0.9.7.1_rc2
+
 2005-02-10 Duncan Coutts <du...@co...>
 
 	* tools/apiGen/CodeGen.hs: make use of the information from scanning