X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=configure.in;h=27e838d06ef39778b41ac565fc81e45f3ed7dfe2;hb=d4e1cf3b24ad546d05a490ad1b07be45ea230e44;hp=e048975f72eb447b1be0e429e9f8cb1bad7c1d44;hpb=4f4c0e121f3d6e6df5b0bad96b07a271d2d8826e;p=lilypond.git

diff --git a/configure.in b/configure.in
index e048975f72..27e838d06e 100644
--- a/configure.in
+++ b/configure.in
@@ -19,10 +19,16 @@ STEPMAKE_INIT
 AC_CONFIG_SRCDIR([lily/main.cc])
 
 # Move to aclocal.m4?
-AC_CONFIG_HEADER([$CONFIGFILE.h:config.hh.in])
+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
 
@@ -36,6 +42,7 @@ STEPMAKE_LIB(REQUIRED)
 STEPMAKE_BISON(REQUIRED, 1.25)
 STEPMAKE_FLEX(REQUIRED)
 STEPMAKE_FLEXLEXER(REQUIRED)
+AC_LANG_C
 STEPMAKE_LOCALE
 STEPMAKE_GETTEXT
 STEPMAKE_MSGFMT(REQUIRED)
@@ -47,14 +54,29 @@ 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([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.
 
 # guile executable for some scripts
@@ -62,10 +84,11 @@ STEPMAKE_GUILE(OPTIONAL)
 # perl for help2man.
 STEPMAKE_PERL(OPTIONAL)
 # mftrace for generating pfa's, pfb's
-STEPMAKE_PROGS(MFTRACE, mftrace, OPTIONAL, 1.0.17)
+STEPMAKE_PROGS(MFTRACE, mftrace, OPTIONAL, 1.0.27)
 
 # new makeinfo for multi-page website docs
-STEPMAKE_PROGS(MAKEINFO, makeinfo, OPTIONAL, 4.6)
+STEPMAKE_PROGS(MAKEINFO, makeinfo, OPTIONAL, 4.7)
+AC_SUBST(MAKEINFO_VERSION)
 
 
 if test "$optimise_b" = yes; then
@@ -90,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