* configure.in (--disable-documentation): New switch.

* GNUmakefile.in: Use it.

* stepmake/aclocal.m4: Use AC_ARG_ENABLE for kpatsea.

5 files changed, 28 insertions, 22 deletions

diff --git a/ChangeLog b/ChangeLog
index 0277a1315b..cde4eafd51 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-11-28  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+	* configure.in (--disable-documentation): New switch.
+
+	* GNUmakefile.in: Use it.
+
+	* stepmake/aclocal.m4: Use AC_ARG_ENABLE for kpatsea.
+
 2005-11-28  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
 	* scripts/lilypond-book.py (do_file): search chunks for
diff --git a/GNUmakefile.in b/GNUmakefile.in
index 83e65c7991..1e90808c4b 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -1,25 +1,19 @@
 # -*-Makefile-*-
-# title	   specific top level makefile for LilyPond  
 
-# subdir level:
-#
 depth = .
-#
 
-# descent order into subdirectories
-# 
 SUBDIRS = buildscripts python scripts \
-	elisp \
 	flower kpath-guile lily \
-	mf ly tex ps scm \
+	mf ly \
+	tex ps scm \
 	po make \
-	cygwin stepmake \
-	Documentation input \
-	vim 
-#
+	elisp vim \
+	input \
+	cygwin stepmake
 
-#include VERSION
-#package=`echo $PACKAGE_NAME | tr '[A-Z]' '[a-z]'`
+ifneq($(strip $(DOCUMENTATION)),no)
+SUBDIRS += Documentation
+endif
 
 SCRIPTS = configure aclocal.m4 autogen.sh lexer-gcc-3.1.sh Doxyfile
 README_FILES = ChangeLog COPYING DEDICATION ROADMAP THANKS HACKING
diff --git a/config.make.in b/config.make.in
index c0d756fb0d..1e972d9d57 100644
--- a/config.make.in
+++ b/config.make.in
@@ -88,6 +88,7 @@ CROSS = @cross_compiling@
 CXX = @CXX@
 DEFINES = @DEFS@ @DEFINES@
 DEFS = @DEFS@
+DOCUMENTATION = @DOCUMENTATION@
 DOTEXE = @DOTEXE@
 FIND = @FIND@
 FLEX = @FLEX@
diff --git a/configure.in b/configure.in
index beefed504c..fa45693908 100644
--- a/configure.in
+++ b/configure.in
@@ -21,6 +21,11 @@ AC_CONFIG_HEADER([$CONFIGFILE.hh:config.hh.in])
 
 # Uncomment the configuration options your package needs.
 
+DOCUMENTATION=yes
+AC_ARG_ENABLE(documentation,
+    [  --enable-documentation  build Documentation.  Default: on],
+    [DOCUMENTATION=$enableval])
+AC_SUBST(DOCUMENTATION)
 
 gui_b=no
 AC_ARG_ENABLE(gui,
@@ -32,11 +37,11 @@ AC_ARG_ENABLE(relocation,
     [  --enable-relocation     compile with dynamic relocation.  Default: off],
     [reloc_b=$enableval])
 
-AC_SUBST(LINK_GXX_STATICALLY)
 LINK_GXX_STATICALLY=no
 AC_ARG_ENABLE(static-gxx,
     [  --enable-static-gxx     link libstdc++.a statically. Default: off],
     [LINK_GXX_STATICALLY=$enableval])
+AC_SUBST(LINK_GXX_STATICALLY)
 
 # must come before any header checks
 STEPMAKE_COMPILE
@@ -83,6 +88,7 @@ AC_CHECK_HEADERS([utf8/wchar.h], LIBS="$LIBS -lutf8")
 AC_SEARCH_LIBS(mbrtowc, [mingwex msvcp60])
 
 STEPMAKE_PROGS(PKG_CONFIG, pkg-config, REQUIRED, 0.9.0)
+
 if test "$gui_b" = "yes"; then
     STEPMAKE_GTK2(gtk+-2.0, REQUIRED, 2.4.0)
 fi
diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index 32810c5318..e6aa2473ce 100644
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -725,7 +725,7 @@ AC_DEFUN(STEPMAKE_INIT, [
     CONFIGSUFFIX=
     AC_ARG_ENABLE(config,
     [  --enable-config=CONF    put settings in config-CONF.make and config-CONF.h;
-                            do \`make conf=CONF' to get output in ./out-CONF],
+                            do `make conf=CONF' to get output in ./out-CONF],
     [CONFIGURATION=$enableval])
 
     ##'
@@ -810,12 +810,9 @@ AC_DEFUN(STEPMAKE_KPATHSEA, [
 	    ])
     
     kpathsea_b=yes
-    #FIXME --with-xxx is meant for specifying a PATH too,
-    # so this should read: --enable-kpathsea,
-    # or --with-kpathsea-include=PATH --with-kpathsea-lib=PATH
-    AC_ARG_WITH(kpathsea,
-    [  --with-kpathsea         use kpathsea lib.  Default: on],
-    [kpathsea_b=$with_kpathsea])
+    AC_ARG_ENABLE(kpathsea,
+    [  --enable-kpathsea         use kpathsea lib.  Default: on],
+    [kpathsea_b=$enableval])
 
     save_LIBS="$LIBS"
     if test "$kpathsea_b" != "no"; then