* GNUmakefile.in: Use it.
* stepmake/aclocal.m4: Use AC_ARG_ENABLE for kpatsea.
+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
# -*-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
CXX = @CXX@
DEFINES = @DEFS@ @DEFINES@
DEFS = @DEFS@
+DOCUMENTATION = @DOCUMENTATION@
DOTEXE = @DOTEXE@
FIND = @FIND@
FLEX = @FLEX@
# 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,
[ --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
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
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])
##'
])
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