*** empty log message ***

[lilypond.git] / configure.in

diff --git a/configure.in b/configure.in
index c86e9197783df5614a25617a8261d9a523511546..5da07aee6ef179602fc9d7e2e5d311702edd22af 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -36,6 +36,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,9 +48,11 @@ 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])
@@ -66,6 +69,7 @@ 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