Date: Thu, 24 Jan 2002 17:32:28 +0100
From: Sven <luther at dpt-info.u-strasbg.fr>
To: Jacques Garrigue <garrigue at kurims.kyoto-u.ac.jp>
Cc: lablgtk at kaba.or.jp
Subject: lablgtk 1.2.3 and moved gnome headers.
Message-ID: <20020124173228.A10417 at dpt-info.u-strasbg.fr>
References: <20011214121208Y.garrigue at kurims.kyoto-u.ac.jp> <lyg06dykuu.fsf at leia.mandrakesoft.com> <20020107162756T.garrigue at kurims.kyoto-u.ac.jp>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="gKMricLos+KVdGMg"
In-Reply-To: <20020107162756T.garrigue at kurims.kyoto-u.ac.jp>; from garrigue at kurims.kyoto-u.ac.jp on Mon, Jan 07, 2002 at 04:27:56PM +0900


--gKMricLos+KVdGMg
Content-Type: text/plain; charset=us-ascii

Hello, ...

I got a bug report from James Troup about a moved gnome header which stop the
lablgtk builds.

you can look at the full text under :

http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=129622&repeatmerged=yes

and i attach here the patch (untested, but i think James knows what he does).

Friendly,

Sven Luther


--gKMricLos+KVdGMg
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="lablgtk.diff"

--- lablgtk-1.2.3.old/Makefile	Sun Sep  9 14:35:57 2001
+++ lablgtk-1.2.3/Makefile	Thu Jan 17 01:14:51 2002
@@ -22,8 +22,9 @@
 GTKCFLAGS = `$(GLADE_CONFIG) --cflags gnome`
 GLADELIBS = `$(GLADE_CONFIG) --libs gnome`
 else
-GTKCFLAGS = `$(GTK_CONFIG) --cflags`" -I"`gnome-config --includedir`
+GTKCFLAGS = `$(GTK_CONFIG) --cflags`"
 endif
+GNOMECFLAGS = `$(GNOME_CONFIG) --cflags gnome`
 GNOMELIBS = `$(GNOME_CONFIG) --libs gtkxmhtml`
 else
 ifdef USE_GLADE
@@ -60,6 +61,7 @@
 	@echo GTKCFLAGS=$(GTKCFLAGS) >> config.make
 	@echo GTKLIBS=$(GTKLIBS) >> config.make
 	@echo GLLIBS=$(GLLIBS) >> config.make
+	@echo GNOMECFLAGS=$(GNOMECFLAGS) >> config.make
 	@echo GNOMELIBS=$(GNOMELIBS) >> config.make
 	@echo GLADELIBS=$(GLADELIBS) >> config.make
 	@cat config.make
--- lablgtk-1.2.3.old/config.make	Thu Jan 17 01:16:48 2002
+++ lablgtk-1.2.3/config.make	Thu Jan 17 01:16:10 2002
@@ -14,5 +14,6 @@
 GTKCFLAGS=-I/usr/include/gnome-xml -I/usr/include/libglade-1.0 -I/usr/include -DNEED_GNOMESUPPORT_H -I/usr/lib/gnome-libs/include -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/include/orbit-1.0 -I/usr/include/gtk-1.2
 GTKLIBS=-L/usr/lib -L/usr/X11R6/lib -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl -lXi -lXext -lX11 -lm
 GLLIBS=-lGLU -lGL
+GNOMECFLAGS=-I/usr/include/gnome-1.0 -DNEED_GNOMESUPPORT_H -I/usr/lib/gnome-libs/include -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include
 GNOMELIBS=-rdynamic -L/usr/lib -L/usr/X11R6/lib -lgtkxmhtml -lXpm -ljpeg -lpng -lz -lSM -lICE -lgtk -lgdk -lgmodule -lglib -ldl -lXi -lXext -lX11 -lm
 GLADELIBS=-L/usr/lib -lglade-gnome -lglade -L/usr/lib -lxml -lz -rdynamic -L/usr/lib -L/usr/X11R6/lib -rdynamic -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule -ldl -lXi -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb-3 -lglib
--- lablgtk-1.2.3.old/src/Makefile	Thu Jan 17 01:16:48 2002
+++ lablgtk-1.2.3/src/Makefile	Thu Jan 17 01:16:02 2002
@@ -57,6 +57,7 @@
 ifdef USE_GNOME
 MLLIBS += lablgnome.cma
 CLIBS += liblablgnome.a
+CFLAGS += $(GNOMECFLAGS)
 GNOMEMLOBJS = gtkXmHTML.cmo gHtml.cmo
 GNOMECOBJS = ml_gtkxmhtml.o
 endif





--gKMricLos+KVdGMg--