Fix compiler warnings.

[lilypond.git] / configure.in

diff --git a/configure.in b/configure.in
index f7547d17700abc95dfe531078ea1712d022b2f23..de37814012d5ff287628a84722890d41a045d881 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,8 @@
 dnl configure.in   -*-shell-script-*-
 dnl Process this file with autoconf to produce a configure script.
 
+AC_PREREQ(2.60)
+
 # Bootstrap the init proces.
 AC_INIT
 
@@ -18,40 +20,39 @@ STEPMAKE_INIT
 AC_CONFIG_SRCDIR([lily/main.cc])
 
 # Move to aclocal.m4?
-AC_CONFIG_HEADER([$CONFIGFILE.hh:config.hh.in])
+AC_CONFIG_HEADERS([$CONFIGFILE.hh:config.hh.in])
 
 # Uncomment the configuration options your package needs.
 
 DOCUMENTATION=yes
 AC_ARG_ENABLE(documentation,
-    [  --enable-documentation  build Documentation.  Default: on],
+    [AS_HELP_STRING([--enable-documentation],
+                   [build Documentation.  Default: on])],
     [DOCUMENTATION=$enableval])
 AC_SUBST(DOCUMENTATION)
 
-gui_b=no
-AC_ARG_ENABLE(gui,
-    [  --enable-gui            compile with experimental GNOME output.  Default: off],
-    [gui_b=$enableval])
-
-
 AC_ARG_WITH(ncsb-dir,
-    [  --with-ncsb-dir=DIR     location of Century Schoolbook fonts.],
+    [AS_HELP_STRING([--with-ncsb-dir=DIR],
+                   [location of Century Schoolbook fonts.])],
     [NCSB_DIR=$withval],
     [NCSB_DIR=""])
 
 reloc_b=no
 AC_ARG_ENABLE(relocation,
-    [  --enable-relocation     compile with dynamic relocation.  Default: off],
+    [AS_HELP_STRING([--enable-relocation],
+                   [compile with dynamic relocation.  Default: off])],
     [reloc_b=$enableval])
 
 rpath_b=no
 AC_ARG_ENABLE(rpath,
-    [  --enable-rpath          hardcode runtime library path.  Default: off],
+    [AS_HELP_STRING([--enable-rpath],
+                   [hardcode runtime library path.  Default: off])],
     [rpath_b=$enableval])
 
 LINK_GXX_STATICALLY=no
 AC_ARG_ENABLE(static-gxx,
-    [  --enable-static-gxx     link libstdc++.a statically. Default: off],
+    [AS_HELP_STRING([--enable-static-gxx],
+                   [link libstdc++.a statically.  Default: off])],
     [LINK_GXX_STATICALLY=$enableval])
 AC_SUBST(LINK_GXX_STATICALLY)
 
@@ -87,7 +88,7 @@ else
 fi
 AC_MSG_RESULT($NCSB_SOURCE_FILES)
 
-
+AC_LANG([C++])
 
 STEPMAKE_PYTHON(REQUIRED, 2.4)
 STEPMAKE_GCC(REQUIRED, 3.4)
@@ -104,7 +105,6 @@ STEPMAKE_BISON(OPTIONAL, 1.29)
 STEPMAKE_FLEX(REQUIRED)
 STEPMAKE_FLEXLEXER(REQUIRED)
 STEPMAKE_FLEXLEXER_LOCATION
-AC_LANG_C
 STEPMAKE_LOCALE
 STEPMAKE_GETTEXT
 STEPMAKE_MSGFMT(REQUIRED)
@@ -112,20 +112,24 @@ STEPMAKE_TEXMF(REQUIRED)
 STEPMAKE_TEXMF_DIRS
 STEPMAKE_GUILE_DEVEL(REQUIRED, 1.8.2)
 
+# check for 2 typedefs added in Guile 1.9
+save_CXXFLAGS="$CXXFLAGS"
+CXXFLAGS="$GUILE_CFLAGS $CXXFLAGS"
+AC_CHECK_TYPES([scm_t_hash_fold_fn, scm_t_hash_handle_fn],
+              [AC_DEFINE(HAVE_GUILE_HASH_FUNC)], [],
+              [#include <libguile.h>])
+CXXFLAGS="$save_CXXFLAGS"
 
 ## check rational bugfix.
 save_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="$GUILE_CFLAGS $CPPFLAGS"
 AC_MSG_CHECKING(GUILE rational bugfix)
-AC_TRY_CPP(
-#include <libguile.h>
+AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <libguile.h>
 #ifdef SCM_FRACTION_REDUCED_BIT
 #error
 #endif
-,
-AC_MSG_RESULT(ok),
-REQUIRED="$REQUIRED GUILE-with-rational-bugfix"
-AC_MSG_RESULT(Must have patched GUILE rational support. See INSTALL.txt))
+]])],[AC_MSG_RESULT(ok)],[REQUIRED="$REQUIRED GUILE-with-rational-bugfix"
+AC_MSG_RESULT(Must have patched GUILE rational support. See INSTALL.txt)])
 CPPFLAGS="$save_CPPFLAGS"
 
 
@@ -134,24 +138,21 @@ STEPMAKE_PYTHON_DEVEL(REQUIRED)
 STEPMAKE_PATH_PROG(GHOSTSCRIPT, gs, OPTIONAL, 8.60)
 
 STEPMAKE_PATH_PROG(FONTFORGE, fontforge, REQUIRED, 20050624)
+# For svg woff fonts to work, version 20100501 is required but
+# the build does not break; leave optional until distros ship it.
+STEPMAKE_PATH_PROG(FONTFORGE, fontforge, OPTIONAL, 20100501)
 
 STEPMAKE_PATH_PROG(T1ASM, t1asm, REQUIRED)
 
 AC_CHECK_HEADERS([assert.h grp.h libio.h pwd.h sys/stat.h wchar.h fpu_control.h])
-AC_LANG_PUSH(C++)
-AC_CHECK_HEADERS([sstream boost/lambda/lambda.hpp])
-AC_LANG_POP(C++)
+AC_CHECK_HEADERS([sstream])
 AC_HEADER_STAT
 AC_FUNC_MEMCMP
 AC_FUNC_VPRINTF
-AC_CHECK_FUNCS([chroot fopencookie funopen gettext isinf memmem snprintf vsnprintf wcrtomb])
+AC_CHECK_FUNCS([chroot fopencookie gettext isinf memmem snprintf vsnprintf])
 
 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
-
 AC_MSG_CHECKING(whether to enable dynamic relocation)
 if test "$reloc_b" = "yes"; then
     AC_DEFINE(ARGV0_RELOCATION)
@@ -170,8 +171,7 @@ HOST_ARCH=`$CC -dumpmachine`
 AC_SUBST(HOST_ARCH)
 
 STEPMAKE_PANGO_FT2(pangoft2, REQUIRED, 1.6.0)
-#STEPMAKE_PANGO(pango, REQUIRED, 1.6.0)
-STEPMAKE_FONTCONFIG(fontconfig, REQUIRED, 2.2.0)
+STEPMAKE_FONTCONFIG(fontconfig, REQUIRED, 2.4.0)
 STEPMAKE_FREETYPE2(freetype2, REQUIRED, 2.1.10)
 
 STEPMAKE_WINDOWS
@@ -186,6 +186,14 @@ STEPMAKE_PERL(OPTIONAL)
 
 STEPMAKE_PROGS(MAKEINFO, makeinfo, REQUIRED, 4.11)
 STEPMAKE_PROGS(TEXI2HTML, texi2html, OPTIONAL, 1.82)
+STEPMAKE_PROGS(DBLATEX, dblatex, OPTIONAL)
+STEPMAKE_PROGS(PDFLATEX, pdflatex, OPTIONAL)
+STEPMAKE_PROGS(NETPBM, pngtopnm, OPTIONAL)
+STEPMAKE_PROGS(IMAGEMAGICK, convert, OPTIONAL)
+# this name avoids a conflict with ZIP in stepmake/aclocal.m4
+STEPMAKE_PROGS(ZIPDOC, zip, OPTIONAL)
+STEPMAKE_PROGS(RSYNC, rsync, OPTIONAL)
+
 
 AC_DEFINE_UNQUOTED(FLOWER_VERSION, "${FULL_FLOWER_VERSION}")