Index: ChangeLog
===================================================================
RCS file: /cvsroot/xforms/xforms/ChangeLog,v
retrieving revision 1.88
diff -u -p -r1.88 ChangeLog
--- ChangeLog	8 Apr 2004 18:37:02 -0000	1.88
+++ ChangeLog	20 Apr 2004 15:08:42 -0000
@@ -1,3 +1,12 @@
+2004-04-19  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+	* demos/Makefile.am (glwin_LDADD, gl_LDADD): fix ordering of
+	libraries
+	(LDFLAGS): rename from AM_LDFLAGS (automake 1.5 did not like that)
+
+	* config/xformsinclude.m4 (XFORMS_PROG_CC): fix description of
+	--enable-debug
+
 2004-04-05  Angus Leeming  <angus.leeming@btopenworld.com>
 
 	* Dummy commit to check all is well with my account.
Index: demos/Makefile.am
===================================================================
RCS file: /cvsroot/xforms/xforms/demos/Makefile.am,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile.am
--- demos/Makefile.am	3 Dec 2003 01:02:25 -0000	1.7
+++ demos/Makefile.am	20 Apr 2004 15:08:42 -0000
@@ -105,7 +105,7 @@ noinst_PROGRAMS = arrowbutton \
 
 # Most of these demos link against libforms only. For them this default is
 # sufficient:
-AM_LDFLAGS = ../lib/libforms.la $(X_LIBS) $(X_PRE_LIBS) $(XPM_LIB) -lX11 $(LIBS) $(X_EXTRA_LIBS)
+LDFLAGS = ../lib/libforms.la $(X_LIBS) $(X_PRE_LIBS) $(XPM_LIB) -lX11 $(LIBS) $(X_EXTRA_LIBS)
 
 arrowbutton_SOURCES = arrowbutton.c
 borderwidth_SOURCES = borderwidth.c
@@ -167,11 +167,11 @@ freedraw_SOURCES = freedraw.c
 freedraw_leak_SOURCES = freedraw_leak.c
 
 gl_SOURCES = gl.c
-gl_LDADD  = ../lib/libforms.la ../gl/libformsGL.la \
+gl_LDADD  = ../gl/libformsGL.la ../lib/libforms.la \
 	$(X_LIBS) $(X_PRE_LIBS) -lGL -lX11 $(LIBS) $(X_EXTRA_LIBS)
 
 glwin_SOURCES = glwin.c
-glwin_LDADD  = ../lib/libforms.la ../gl/libformsGL.la \
+glwin_LDADD  = ../gl/libformsGL.la ../lib/libforms.la \
 	$(X_LIBS) $(X_PRE_LIBS) -lGL -lX11 $(LIBS) $(X_EXTRA_LIBS)
 
 goodies_SOURCES = goodies.c
Index: config/xformsinclude.m4
===================================================================
RCS file: /cvsroot/xforms/xforms/config/xformsinclude.m4,v
retrieving revision 1.7
diff -u -p -r1.7 xformsinclude.m4
--- config/xformsinclude.m4	30 Mar 2004 13:03:51 -0000	1.7
+++ config/xformsinclude.m4	20 Apr 2004 15:08:42 -0000
@@ -175,7 +175,7 @@ AC_ARG_ENABLE(debug,
 
 ### set up optimization
 AC_ARG_ENABLE(optimization,
-  [  --enable-optimization[=value]   enable compiler optimisation],,
+  [  --enable-optimization[=value]   enable compiler optimisation default=-O],,
 	enable_optimization=yes;)
 case $enable_optimization in
   yes) xforms_opt=-O;;