X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=configure.in;h=beefed504c772d5763ba1fe4ce98e07d340ccba9;hb=a8172deda8ce6983c19b8217cd7b1879a8fcb653;hp=e2aa933081f9bbf8db9737994b6116cd0c3c5b08;hpb=4ae3a70d0266a2d296e2d749bfc3d7730ee17cc3;p=lilypond.git

diff --git a/configure.in b/configure.in
index e2aa933081..beefed504c 100644
--- a/configure.in
+++ b/configure.in
@@ -13,8 +13,6 @@ AC_CONFIG_AUX_DIR([stepmake/bin])
 
 STEPMAKE_INIT
 
-
-
 # List a file that identifies your package.
 AC_CONFIG_SRCDIR([lily/main.cc])
 
@@ -29,96 +27,101 @@ 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.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(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])
+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_MSG_CHECKING([for ec-fonts-mftraced])
-ecb10=`kpsewhich ecb10.pfa 2>/dev/null`
-if test -n "$ecb10"; then
-    AC_MSG_RESULT([$ecb10])
-else
-    AC_MSG_RESULT(no)
-    STEPMAKE_ADD_ENTRY(REQUIRED, 'package ec-fonts-mftraced >= 1.0.5')
-    AC_MSG_CHECKING([for old version of ec-fonts-mftraced])
-    ecrm10=`kpsewhich ecrm10.pfa 2>/dev/null`
-    if test -n "$ecrm10"; then
-	AC_MSG_RESULT([$ecrm10])
-	AC_MSG_WARN([old version of ec-fonts-mftraced found, install 1.0.5 or newer])
-    fi
+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
 
-# 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_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_FREETYPE2
-if test "$gui_b" = "yes"; then
-  STEPMAKE_GTK2
-  STEPMAKE_PANGO
-fi
+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, mftrace, OPTIONAL, 1.0.27)
-
-# new makeinfo for multi-page website docs
-STEPMAKE_PROGS(MAKEINFO, makeinfo, OPTIONAL, 4.7)
-AC_SUBST(MAKEINFO_VERSION)
 
+# 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