[Gtk2hs-commit] gtk2hs configure.in,1.24,1.25 ChangeLog,1.77,1.78

[<as...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1:/tmp/cvs-serv17906

Modified Files:
	configure.in ChangeLog 
Log Message:
ghc-pkg behaves differently for ghc version 6


Index: configure.in
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/configure.in,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- configure.in	3 Jul 2003 05:19:36 -0000	1.24
+++ configure.in	4 Jul 2003 08:27:00 -0000	1.25
@@ -158,6 +158,10 @@
   AC_MSG_ERROR([ghc-pkg not found. (But ghc exists!?)]);
 fi
 
+dnl Determine how to list local packages with ghc-pkg.
+GHCPKG_LISTLOCAL="-l";
+GTKHS_PROG_CHECK_VERSION($GHC_VERSION, -ge, 6.00.0, [GHCPKG_LISTLOCAL="-L"])
+
 dnl Optimise Haskell by default and give sufficient space.
 if test -z "$HCFLAGS"; then
   HCFLAGS=" -O -H180m "
@@ -436,6 +440,7 @@
 AC_SUBST(MULTIPLE_CHS)
 AC_SUBST(FOUR_WORD_CALLBACK)
 AC_SUBST(NEW_MODULE_SYSTEM)
+AC_SUBST(GHCPKG_LISTLOCAL)
 AC_SUBST(LOCALPKGCONF)
 AC_SUBST(HCFLAGS)
 AC_SUBST(C2HS)

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -d -r1.77 -r1.78
--- ChangeLog	3 Jul 2003 05:26:30 -0000	1.77
+++ ChangeLog	4 Jul 2003 08:27:00 -0000	1.78
@@ -1,3 +1,10 @@
+2003-07-04 Axel Simon <A....@ke...>
+
+	* configure.in mk/config.mk.in mk/library.mk: Turned the
+	--list-packages into a parameter which is determined by
+	configure. The reason is that ghc 6 has a new semantic for
+	ghc-pkg's --list-packages option.
+	
 2003-07-03  Jens Petersen  <pet...@ha...>
 
 	* mogul/Makefile (INSTALLDIR): Set to mogul, so that mogul gets
@@ -52,6 +59,14 @@
 	* gtk/treeList/TreeView.chs: Changed the return type of the
 	onTestCollapseRow and onTestExpandRow signals. Patch submitted by
 	Duncan Coutts <du...@co...>.
+	
+2003-05-19 Axel Simon <A....@ke...>
+
+	* configure.in, mk/config.mk.in: Changed SGML_CATALOG_FILES to
+	XML_CATALOG_FILES.
+
+	* gtk/general/Gtk.hs: removed the hiding clause from Image. Don't
+	know why it was there in the first place.
 	
 2003-05-18  Jens Petersen  <pet...@re...>