X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=configure.in;h=beefed504c772d5763ba1fe4ce98e07d340ccba9;hb=a10cb1ca9dbc5a38b8afd592cd4563972c135f6f;hp=4a48fb099bf4ee4d163c5fd5a72e7f3f77546cd3;hpb=7f0f1eb021b932f04de74ae41499e18f5d570e7c;p=lilypond.git

diff --git a/configure.in b/configure.in
index 4a48fb099b..beefed504c 100644
--- a/configure.in
+++ b/configure.in
@@ -11,83 +11,117 @@ AC_CONFIG_AUX_DIR([stepmake/bin])
 # AC_CONFIG_AUX_DIR(bin)
 
 
-
-. VERSION 
-
 STEPMAKE_INIT
 
-AC_SUBST(PACKAGE_NAME)
-AC_SUBST(MAJOR_VERSION)
-AC_SUBST(MINOR_VERSION)
-AC_SUBST(PATCH_LEVEL)
-AC_SUBST(MY_PATCH_LEVEL)
-
-
 # List a file that identifies your package.
 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])
+
+reloc_b=no
+AC_ARG_ENABLE(relocation,
+    [  --enable-relocation     compile with dynamic relocation.  Default: off],
+    [reloc_b=$enableval])
+
+AC_SUBST(LINK_GXX_STATICALLY)
+LINK_GXX_STATICALLY=no
+AC_ARG_ENABLE(static-gxx,
+    [  --enable-static-gxx     link libstdc++.a statically. Default: off],
+    [LINK_GXX_STATICALLY=$enableval])
+
 # must come before any header checks
 STEPMAKE_COMPILE
 
-STEPMAKE_PYTHON(REQUIRED,2.1)
+STEPMAKE_KPATHSEA
+
+STEPMAKE_PYTHON(REQUIRED, 2.2)
 STEPMAKE_GCC(REQUIRED, 2.8)
 STEPMAKE_CXX(REQUIRED)
-STEPMAKE_GXX(REQUIRED, 3.0)
+STEPMAKE_GXX(REQUIRED, 3.0.5)
 STEPMAKE_CXXTEMPLATE
 STEPMAKE_LIB(REQUIRED)
+STEPMAKE_DLOPEN
 # Do not use bison 1.50 and 1.75.
-STEPMAKE_BISON(REQUIRED, 1.25)
+# 1.29 is required fr %locations, but I'm not sure it's enough --ns
+STEPMAKE_BISON(OPTIONAL, 1.29)
 STEPMAKE_FLEX(REQUIRED)
 STEPMAKE_FLEXLEXER(REQUIRED)
+STEPMAKE_FLEXLEXER_LOCATION
+AC_LANG_C
 STEPMAKE_LOCALE
 STEPMAKE_GETTEXT
 STEPMAKE_MSGFMT(REQUIRED)
-STEPMAKE_TEXMF
+STEPMAKE_TEXMF(REQUIRED)
 STEPMAKE_TEXMF_DIRS
-STEPMAKE_GUILE_DEVEL(REQUIRED, 1.6)
-STEPMAKE_KPATHSEA
+STEPMAKE_GUILE_DEVEL(REQUIRED, 1.6.5)
 STEPMAKE_MAKEINFO(REQUIRED)
 STEPMAKE_PYTHON_DEVEL(REQUIRED)
 
+STEPMAKE_PATH_PROG(GHOSTSCRIPT, gs, OPTIONAL, 8.15)
 
-AC_CHECK_HEADERS([assert.h sys/stat.h sstream])
-AC_HEADER_STAT
+STEPMAKE_PROGS(MFTRACE, mftrace, REQUIRED, 1.1.9)
+STEPMAKE_PATH_PROG(FONTFORGE, fontforge, REQUIRED, 20050624)
 
+AC_CHECK_HEADERS([assert.h grp.h libio.h pwd.h sys/stat.h wchar.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])
+AC_CHECK_FUNCS([chroot fopencookie funopen gettext isinf mbrtowc memmem snprintf vsnprintf wcrtomb])
+AC_CHECK_HEADERS([utf8/wchar.h], LIBS="$LIBS -lutf8")
+AC_SEARCH_LIBS(mbrtowc, [mingwex msvcp60])
+
+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
+
+if test "$reloc_b" = "yes"; then
+    AC_DEFINE(ARGV0_RELOCATION)
+fi
+
+STEPMAKE_PANGO_FT2(pangoft2, REQUIRED, 1.6.0)
+#STEPMAKE_PANGO(pango, REQUIRED, 1.6.0)
+STEPMAKE_FONTCONFIG(fontconfig, REQUIRED, 2.2.0)
+STEPMAKE_FREETYPE2(freetype2, REQUIRED, 0)
 
+STEPMAKE_WINDOWS
 
 ## Optional tools for building documentation, website, extra fonts.
 
 # guile executable for some scripts
 STEPMAKE_GUILE(OPTIONAL)
+
 # perl for help2man.
 STEPMAKE_PERL(OPTIONAL)
-# mftrace for generating pfa's, pfb's
-STEPMAKE_PROGS(MFTRACE, pktrace mftrace, OPTIONAL, 1.0.17)
-# new makeinfo for multi-page website docs
-STEPMAKE_PROGS(MAKEINFO, makeinfo, OPTIONAL, 4.1)
 
+# New makeinfo for multi-page website docs Simply always require new
+# makeinfo should avoid bug reports; if people want to build lily
+# without the docs, they can find this comment and use an older
+# makeinfo--but hopefully won't report makeinfo problems.
+STEPMAKE_PROGS(MAKEINFO, makeinfo, REQUIRED, 4.7)
 
 if test "$optimise_b" = yes; then
     DEFINES="$DEFINES -DSTRING_UTILS_INLINED"
     AC_DEFINE(STRINGS_UTILS_INLINED)
 fi
 
-
-AC_DEFINE_UNQUOTED(TOPLEVEL_VERSION, "${FULL_VERSION}")
 AC_DEFINE_UNQUOTED(FLOWER_VERSION, "${FULL_FLOWER_VERSION}")
 
 # Gather requirements and generate output.
 STEPMAKE_END
 
-
 test -n "$CONFIGURATION" && mc=" conf=$CONFIGURATION" || mc=""
 
 cat <<EOF
@@ -97,5 +131,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