Index: ChangeLog
===================================================================
RCS file: /cvsroot/xforms/xforms/ChangeLog,v
retrieving revision 1.102
diff -u -p -r1.102 ChangeLog
--- ChangeLog	7 May 2004 08:48:00 -0000	1.102
+++ ChangeLog	12 May 2004 12:47:06 -0000
@@ -1,3 +1,10 @@
+2004-05-12  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+	* gl/Makefile.am (INCLUDES): 
+	* demos/Makefile.am (INCLUDES): 
+	* fd2ps/Makefile.am (INCLUDES): 
+	* fdesign/Makefile.am (INCLUDES): add X_CFLAGS
+
 2004-05-07  Angus Leeming  <angus.leeming@btopenworld.com>
 
 	* lib/private/pvaluator.h (repeat_ms, timeout_id, mouse_pos):
Index: demos/Makefile.am
===================================================================
RCS file: /cvsroot/xforms/xforms/demos/Makefile.am,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile.am
--- demos/Makefile.am	20 Apr 2004 15:25:11 -0000	1.8
+++ demos/Makefile.am	12 May 2004 12:47:06 -0000
@@ -10,7 +10,7 @@ SUBDIRS = fd
 SUFFIXES = .fd .c
 
 # forms.h is a generated file
-INCLUDES = -I../lib -I../lib/include -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/image
+INCLUDES = -I../lib -I../lib/include -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/image $(X_CFLAGS)
 
 if BUILD_GL
 GL = gl glwin
Index: fd2ps/Makefile.am
===================================================================
RCS file: /cvsroot/xforms/xforms/fd2ps/Makefile.am,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile.am
--- fd2ps/Makefile.am	13 Nov 2003 21:46:47 -0000	1.2
+++ fd2ps/Makefile.am	12 May 2004 12:47:06 -0000
@@ -12,7 +12,7 @@ fd2ps.1:
 	cp -p $(srcdir)/fd2ps.man fd2ps.1
 
 # forms.h is a generated file
-INCLUDES = -I../lib -I$(top_srcdir)/lib
+INCLUDES = -I../lib -I$(top_srcdir)/lib $(X_CFLAGS)
 
 bin_PROGRAMS = fd2ps
 
Index: fdesign/Makefile.am
===================================================================
RCS file: /cvsroot/xforms/xforms/fdesign/Makefile.am,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile.am
--- fdesign/Makefile.am	30 Apr 2004 20:43:52 -0000	1.3
+++ fdesign/Makefile.am	12 May 2004 12:47:06 -0000
@@ -12,7 +12,7 @@ fdesign.1:
 	cp -p $(srcdir)/fdesign.man fdesign.1
 
 # forms.h is a generated file
-INCLUDES = -I../lib -I$(top_srcdir)/lib
+INCLUDES = -I../lib -I$(top_srcdir)/lib $(X_CFLAGS)
 
 bin_PROGRAMS = fdesign
 
Index: gl/Makefile.am
===================================================================
RCS file: /cvsroot/xforms/xforms/gl/Makefile.am,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile.am
--- gl/Makefile.am	19 Nov 2003 22:23:19 -0000	1.2
+++ gl/Makefile.am	12 May 2004 12:47:06 -0000
@@ -1,7 +1,7 @@
 include $(top_srcdir)/config/common.am
 
 # forms.h is a generated file
-INCLUDES = -DMAKING_FORMS -I../lib -I$(top_srcdir)/lib
+INCLUDES = -DMAKING_FORMS -I../lib -I$(top_srcdir)/lib $(X_CFLAGS)
 
 include_HEADERS = glcanvas.h