Index: ChangeLog
===================================================================
RCS file: /cvsroot/xforms/xforms/ChangeLog,v
retrieving revision 1.46
diff -u -p -r1.46 ChangeLog
--- ChangeLog	9 Sep 2003 09:38:46 -0000	1.46
+++ ChangeLog	9 Sep 2003 10:44:08 -0000
@@ -1,3 +1,9 @@
+2003-09-09  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+	* Makefile.am: only build demos/ directory if required
+
+	* configure.ac: add --enable-demos option
+
 2003-09-09  Angus Leeming  <angus.leeming@btopenworld.com>
 
 	* lib/forms.c (fl_keyboard): pass it the event to allow it to
Index: Makefile.am
===================================================================
RCS file: /cvsroot/xforms/xforms/Makefile.am,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile.am
--- Makefile.am	30 May 2003 09:35:44 -0000	1.2
+++ Makefile.am	9 Sep 2003 10:44:08 -0000
@@ -8,13 +8,16 @@ MAINTAINERCLEANFILES += \
 	$(srcdir)/acinclude.m4 \
 	$(srcdir)/config.h.in
 
-SUBDIRS = config lib image gl fd2ps fdesign
+if BUILD_DEMOS
+DEMOS = demos
+else
+DEMOS = 
+endif
+
+SUBDIRS = config lib image gl fd2ps fdesign $(DEMOS)
 
-# Putting 'demos' in EXTRA_DIST rather than SUBDIRS prevents its contents
-# from being built from the top level directory.
-# (cd demos && make) works fine.
 EXTRA_DIST = ChangeLog COPYING.LIB Copyright README README.OS2 \
-	autogen.sh xforms.spec.in xforms.spec demos
+	autogen.sh xforms.spec.in xforms.spec
 
 # Hack so that the targets that use tar will also work with automake 1.4
 AMTAR ?= $(TAR)
Index: configure.ac
===================================================================
RCS file: /cvsroot/xforms/xforms/configure.ac,v
retrieving revision 1.4
diff -u -p -r1.4 configure.ac
--- configure.ac	8 Sep 2003 23:48:36 -0000	1.4
+++ configure.ac	9 Sep 2003 10:44:08 -0000
@@ -25,6 +25,15 @@ for file in config/install-sh config/mki
   chmod 755 ${srcdir}/${file}
 done
 
+AC_ARG_ENABLE(demos,
+    [AC_HELP_STRING([--enable-demos], [Build demo programs (default is NO)])],
+    [case "${enableval}" in
+	yes) demos=true ;;
+	no)  demos=false ;;
+	*) AC_MSG_ERROR(bad value ${enableval} for --enable-demos) ;;
+     esac],[demos=false])
+AM_CONDITIONAL(BUILD_DEMOS, test x$demos = xtrue)
+
 ### Check for programs
 XFORMS_PROG_CC
 AC_PROG_CPP