X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=configure.in;h=9014e5c6d9c23c846d7d34621d10a58257529a7f;hb=bf79f6426e9c1bed311ab88bec13aee3376f6916;hp=e960c1ade9741bd89d0aa24c2e7eaddf1ff7c2df;hpb=2bc57b3209e89d4beb3b669757c7f24193014a0b;p=lilypond.git

diff --git a/configure.in b/configure.in
index e960c1ade9..9014e5c6d9 100644
--- a/configure.in
+++ b/configure.in
@@ -29,13 +29,14 @@ STEPMAKE_COMPILE
 STEPMAKE_PYTHON(REQUIRED,2.1)
 STEPMAKE_GCC(REQUIRED, 2.8)
 STEPMAKE_CXX(REQUIRED)
-STEPMAKE_GXX(REQUIRED, 3.0)
+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)
@@ -47,14 +48,27 @@ 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
+STEPMAKE_GTK2
+STEPMAKE_PANGO
+
 ## Optional tools for building documentation, website, extra fonts.
 
 # guile executable for some scripts
@@ -62,10 +76,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)
+AC_SUBST(MAKEINFO_VERSION)
 
 
 if test "$optimise_b" = yes; then
@@ -90,5 +105,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