[Gtk2hs-commit] gtk2hs ChangeLog,1.249,1.250 Makefile.am,1.20,1.21 acinclude.m4,1.3,1.4 configure.ac,1.11,1.12

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

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

Modified Files:
	ChangeLog Makefile.am acinclude.m4 configure.ac 
Log Message:
Make installation work. mogul is broken since it's not in configure.


Index: acinclude.m4
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/acinclude.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- acinclude.m4	9 Dec 2004 18:44:58 -0000	1.3
+++ acinclude.m4	12 Dec 2004 14:28:12 -0000	1.4
@@ -108,7 +108,7 @@
 dnl GTKHS_REFORMAT_PACKAGE_LIBS(LIBS, LIBS_CQ, LIBDIR_CQ, LIBEXTRA_CQ)
 dnl 
 dnl for ghc package.conf files, we need to convert from
-dnl   LIBS = -Wl,--export-dynamic -lfoo -lbar -I/usr/lib/foo -I/usr/lib/bar
+dnl   LIBS = -Wl,--export-dynamic -lfoo -lbar -L/usr/lib/foo -L/usr/lib/bar
 dnl to
 dnl   LIBS_CQ = "foo", "bar"
 dnl   LIBDIR_CQ = "/usr/lib/bar","/usr/lib/bar"
@@ -120,8 +120,14 @@
 for FLAG in [$][$1]; do
   case [$]FLAG in
     -l*) [$2]="[$][$2][$]C_LIBS\"[$]{FLAG#-l}\""; C_LIBS=",";;
-    -L*) [$3]="[$][$3][$]C_LDIR\"[$]{FLAG#-I}\""; C_LDIR=",";;
+    -L*) [$3]="[$][$3][$]C_LDIR\"[$]{FLAG#-L}\""; C_LDIR=",";;
     *)   [$4]="[$][$4][$]C_XTRA\"[$]FLAG\""; C_XTRA=",";;
   esac;
 done;
+dnl Fix for ghc-pkg in that it doesn't differ between paths to extra
+dnl libraries and paths to Haskell libraries. We have to append the
+dnl path to where the Haskell libraries are going to be installed in
+dnl case they go into a non-standard directory. If they go into a
+dnl standard directory then we duplicate a path here. Dough.
+[$3]="[$][$3][$]C_LDIR\"[$]libdir\"";
 ])dnl

Index: configure.ac
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/configure.ac,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- configure.ac	9 Dec 2004 18:44:58 -0000	1.11
+++ configure.ac	12 Dec 2004 14:28:12 -0000	1.12
@@ -284,12 +284,6 @@
 GCONF_CFLAGS=`CFLAGS="$GTK_CFLAGS" tools/checkDirs.sh $GCONF_CFLAGS`;
 GCONF_LIBS=`LDFLAGS="$GTK_LIBS" tools/checkDirs.sh $GCONF_LIBS`;
 
-dnl Fix for ghc-pkg in that it doesn't differ between paths to extra
-dnl libraries and paths to Haskell libraries. We have to append the
-dnl path to where the Haskell libraries are going to be installed in
-dnl case they go into a non-standard directory. If they go into a
-dnl standard directory then we duplicate a path here. Dough.
-GTK_LIBS="$GTK_LIBS -L$libdir";
 
 dnl Change the representation of these flags to "flag1","flag2". The
 dnl letters CQ stand for Comma, Quote.
@@ -300,6 +294,8 @@
 AC_SUBST(GTK_LIBDIR_CQ)
 AC_SUBST(GTK_LIBEXTRA_CQ)
 
+dnl Fix another bug in ghc-pkg where it doesn't look into directories
+dnl for dependant packages when building the .o file.
 GTKHS_REFORMAT_PACKAGE_CFLAGS(SOURCEVIEW_CFLAGS, SOURCEVIEW_CFLAGS_CQ)
 GTKHS_REFORMAT_PACKAGE_LIBS(SOURCEVIEW_LIBS, SOURCEVIEW_LIBS_CQ,
 			    SOURCEVIEW_LIBDIR_CQ, SOURCEVIEW_LIBEXTRA_CQ)

Index: Makefile.am
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile.am,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- Makefile.am	12 Dec 2004 12:45:18 -0000	1.20
+++ Makefile.am	12 Dec 2004 14:28:12 -0000	1.21
@@ -420,7 +420,7 @@
 	mogul/TreeList.hs	\
 	mogul/WidgetTable.hs
 
-libHSmogul_a_LIBADD = libHSgtk.a
+libHSmogul_a_DEPENDENCIES = libHSgtk.a
 
 am_libHSmogul_a_OBJECTS = \
 	$(addsuffix .$(OBJEXT),$(basename $(basename $(libHSmogul_a_SOURCES))))
@@ -457,7 +457,7 @@
 	glade/GladeType.chs	\
         glade/Glade.chs
 
-libHSglade_a_LIBADD = libHSgtk.a
+libHSglade_a_DEPENDENCIES = libHSgtk.a
 
 glade/GladeType.chs : $(srcdir)/tools/hierarchyGen/hierarchy.list \
 		      $(srcdir)/tools/hierarchyGen/TypeGenerator
@@ -514,7 +514,7 @@
         gconf/System/Gnome/GConf/GConfClient.chs	\
         gconf/System/Gnome/GConf.hs
 
-libHSgconf_a_LIBADD = libHSgtk.a
+libHSgconf_a_DEPENDENCIES = libHSgtk.a
 
 gconf/System/Gnome/GConf/GConfType.chs :	\
 	$(srcdir)/tools/hierarchyGen/hierarchy.list \
@@ -581,7 +581,7 @@
 	sourceview/SourceTagTable.chs		\
 	sourceview/SourceView.chs
 
-libHSsourceview_a_LIBADD = libHSgtk.a
+libHSsourceview_a_DEPENDENCIES = libHSgtk.a
 
 sourceview/SourceViewType.chs :	\
 	$(srcdir)/tools/hierarchyGen/hierarchy.list \

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -d -r1.249 -r1.250
--- ChangeLog	12 Dec 2004 12:45:18 -0000	1.249
+++ ChangeLog	12 Dec 2004 14:28:11 -0000	1.250
@@ -17,6 +17,11 @@
 
 	* gtk/general/Structs.hsc: Changed the type of pangoScale from Int
 	to Integer.
+
+	* acinclude.m4: Replaced a -I with a -L which fixes installation
+	of packages.
+
+	* sourceview/sourceview.pkg.in: Added forgotten comma.
 	
 2004-12-9  Duncan Coutts <du...@co...>