[Gtk2hs-commit] gtk2hs ChangeLog,1.341,1.342 configure.ac,1.27,1.28

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

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

Modified Files:
	ChangeLog configure.ac 
Log Message:
More win32 build fixes. It now works ok for me so bump to 0.9.7.1_rc1

mk/common.mk: Add $(EXEEXT) when trying to build c2hsLocal
set HSTOOLFLAGS = -H350m -M400m for the release so more people can build ok.
On windows we require more meory for some reason so set
HSTOOLFLAGS = -H400m -M650m

configure.ac: Add $(EXEEXT) to C2HS name.
Do define WIN32 afterall since ghc does not define it (though gcc does).

Bumb the version to 0.9.7.1_rc1


Index: configure.ac
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/configure.ac,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- configure.ac	7 Feb 2005 00:04:27 -0000	1.27
+++ configure.ac	7 Feb 2005 15:39:48 -0000	1.28
@@ -21,7 +21,7 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl ######################################################################
 
-AC_INIT(gtk2hs, 0.9.8_pre)
+AC_INIT(gtk2hs, 0.9.7.1_rc1)
 AM_INIT_AUTOMAKE
 
 dnl * We require autoconf version 2.50
@@ -116,6 +116,9 @@
   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
@@ -552,7 +555,7 @@
 if test $BUILT_IN_C2HS = yes; then
   AC_MSG_RESULT([built-in])
   dnl Use the local c2hs.
-  C2HS='$(TOP)/tools/c2hs/c2hsLocal';
+  C2HS='$(TOP)/tools/c2hs/c2hsLocal$(EXEEXT)';
 
   dnl These are the settings needed to compile c2hs.
   LEGACY_FFI=no;

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.341
retrieving revision 1.342
diff -u -d -r1.341 -r1.342
--- ChangeLog	7 Feb 2005 00:38:01 -0000	1.341
+++ ChangeLog	7 Feb 2005 15:39:47 -0000	1.342
@@ -14,6 +14,15 @@
 
 	* tools/apiGen/StringUtils.hs: add extra utility function.
 
+	* mk/common.mk: Add $(EXEEXT) when trying to build c2hsLocal. Set
+	HSTOOLFLAGS = -H350m -M400m for the release so more people can build
+	ok. On windows we need more memory for some reaons so set
+	HSTOOLFLAGS = -H400m -M650m 
+
+	* configure.ac: Add $(EXEEXT) to C2HS name. Do define WIN32 afterall
+	since ghc does not define it (though gcc does so it'll give a warning)
+	Bumb the version to 0.9.7.1_rc1
+
 2005-02-06 Duncan Coutts <du...@co...>
 
 	* configure.ac: win32 fixes. Do not define WIN32 on windows since it