X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=configure.in;h=cedc9459bc067be56afb268a074f474194adafc7;hb=ea4cf1c4ca54c61220c6ba96a7255535cbd6099a;hp=7acae1843d9ea3d8328c187abb5ed5a2e9a78654;hpb=8438b824fb221159742957c2eeab761effe73be4;p=lilypond.git

diff --git a/configure.in b/configure.in
index 7acae1843d..cedc9459bc 100644
--- a/configure.in
+++ b/configure.in
@@ -9,29 +9,40 @@ AC_INIT
 AC_CONFIG_AUX_DIR([stepmake/bin])
 # For stepmake package:
 # AC_CONFIG_AUX_DIR(bin)
+
+
 STEPMAKE_INIT
 
+
+
 # List a file that identifies your package.
-AC_CONFIG_SRCDIR([make/lilypond.lsm.in])
-# Move to aclocal.m4?
-AC_CONFIG_HEADER([$CONFIGFILE.h:config.hh.in])
+AC_CONFIG_SRCDIR([lily/main.cc])
 
-# For all packages except the StepMake package itself
-AC_CONFIG_SUBDIRS(stepmake)
+# Move to aclocal.m4?
+AC_CONFIG_HEADER([$CONFIGFILE.hh:config.hh.in])
 
 # Uncomment the configuration options your package needs.
 
+
+gui_b=no
+AC_ARG_ENABLE(gui,
+    [  --enable-gui            compile with experimental GNOME output module.  Default: off],
+    [gui_b=$enableval])
+
 # must come before any header checks
 STEPMAKE_COMPILE
 
+STEPMAKE_PYTHON(REQUIRED,2.1)
 STEPMAKE_GCC(REQUIRED, 2.8)
 STEPMAKE_CXX(REQUIRED)
-STEPMAKE_GXX(REQUIRED, 2.95)
+STEPMAKE_GXX(REQUIRED, 3.0.5)
 STEPMAKE_CXXTEMPLATE
 STEPMAKE_LIB(REQUIRED)
+# Do not use bison 1.50 and 1.75.
 STEPMAKE_BISON(REQUIRED, 1.25)
 STEPMAKE_FLEX(REQUIRED)
 STEPMAKE_FLEXLEXER(REQUIRED)
+AC_LANG_C
 STEPMAKE_LOCALE
 STEPMAKE_GETTEXT
 STEPMAKE_MSGFMT(REQUIRED)
@@ -43,13 +54,28 @@ STEPMAKE_MAKEINFO(REQUIRED)
 STEPMAKE_PYTHON_DEVEL(REQUIRED)
 
 
-AC_CHECK_HEADERS([assert.h sys/stat.h sstream])
+AC_CHECK_HEADERS([assert.h sys/stat.h])
+AC_LANG_PUSH(C++)
+AC_CHECK_HEADERS([sstream])
+AC_LANG_POP(C++)
 AC_HEADER_STAT
-
 AC_FUNC_MEMCMP
 AC_FUNC_VPRINTF
-AC_CHECK_FUNCS([memmem snprintf vsnprintf gettext isinf])
+AC_CHECK_FUNCS([gettext isinf memmem snprintf vsnprintf gettext])
+
 
+# This is developer only anyway, help pkgconfig a bit
+export PKG_CONFIG_PATH
+PKG_CONFIG_PATH=/usr/lib/pkgconfig:$PKG_CONFIG_PATH
+PKG_CONFIG_PATH=/opt/gnome/lib/pkgconfig:$PKG_CONFIG_PATH
+PKG_CONFIG_PATH=$HOME/usr/pkg/gnome/lib/pkgconfig:$PKG_CONFIG_PATH
+PKG_CONFIG_PATH=$HOME/usr/pkg/pango/lib/pkgconfig:$PKG_CONFIG_PATH
+
+#STEPMAKE_FREETYPE2
+if test "$gui_b" = "yes"; then
+  STEPMAKE_GTK2
+  STEPMAKE_PANGO
+fi
 
 ## Optional tools for building documentation, website, extra fonts.
 
@@ -58,9 +84,11 @@ STEPMAKE_GUILE(OPTIONAL)
 # perl for help2man.
 STEPMAKE_PERL(OPTIONAL)
 # mftrace for generating pfa's, pfb's
-STEPMAKE_PROGS(MFTRACE, pktrace mftrace, OPTIONAL, 1.0.9)
+STEPMAKE_PROGS(MFTRACE, mftrace, OPTIONAL, 1.0.27)
+
 # new makeinfo for multi-page website docs
-STEPMAKE_PROGS(MAKEINFO, makeinfo, OPTIONAL, 4.1)
+STEPMAKE_PROGS(MAKEINFO, makeinfo, OPTIONAL, 4.6)
+AC_SUBST(MAKEINFO_VERSION)
 
 
 if test "$optimise_b" = yes; then
@@ -85,5 +113,4 @@ Type:
     make$mc install   to install LilyPond
     make$mc help      to see all possible targets
 
-Do not worry if ./Documentation should not build.
 EOF