[ --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],
+ [rpath_b=$enableval])
+
LINK_GXX_STATICALLY=no
AC_ARG_ENABLE(static-gxx,
[ --enable-static-gxx link libstdc++.a statically. Default: off],
# must come before any header checks
STEPMAKE_COMPILE
-# os.path.realpath() requires python 2.2 and unix
-STEPMAKE_PYTHON(REQUIRED, 2.2)
AC_CHECK_PROG(FCMATCH, fc-match, fc-match)
AC_MSG_CHECKING([New Century Schoolbook PFB files])
AC_SUBST(NCSB_SOURCE_FILES)
NCSB_SOURCE_FILES=""
for f in c059013l c059016l c059033l c059036l; do
if test ! -f "$NCSB_DIR/$f.pfb"; then
- AC_MSG_WARN($NCSB_DIR does not contain $f.pfb.)
+ STEPMAKE_WARN($NCSB_DIR does not contain $f.pfb.)
else
NCSB_SOURCE_FILES="$NCSB_DIR/$f.pfb $NCSB_SOURCE_FILES"
fi
else
if test "$FCMATCH" != ""; then
for style in Roman Italic "Bold Italic" Bold; do
- NCSB_FILE=`$FCMATCH --verbose "Century Schoolbook L:style=$style" | grep 'file:'`
+ NCSB_FILE=`$FCMATCH --verbose "Century Schoolbook L:style=$style" | grep 'file:' | grep -v "\.ttf"`
NCSB_FILE=`echo $NCSB_FILE | sed 's/^.*"\(.*\)".*$/\1/g'`
- NCSB_FILE=`$PYTHON "$srcdir/buildscripts/readlink.py" $NCSB_FILE`
+ NCSB_FILE=`$PYTHON "$srcdir/scripts/auxiliar/readlink.py" $NCSB_FILE`
NCSB_SOURCE_FILES="$NCSB_FILE $NCSB_SOURCE_FILES"
done
else
STEPMAKE_PYTHON(REQUIRED, 2.4)
-STEPMAKE_GCC(REQUIRED, 4.0)
+STEPMAKE_GCC(REQUIRED, 3.4)
STEPMAKE_CXX(REQUIRED)
-STEPMAKE_GXX(REQUIRED, 4.0)
+STEPMAKE_GXX(REQUIRED, 3.4)
STEPMAKE_CXXTEMPLATE
STEPMAKE_STL_DATA_METHOD
STEPMAKE_LIB(REQUIRED)
CPPFLAGS="$save_CPPFLAGS"
-STEPMAKE_MAKEINFO(REQUIRED, 4.8)
STEPMAKE_PYTHON_DEVEL(REQUIRED)
STEPMAKE_PATH_PROG(GHOSTSCRIPT, gs, OPTIONAL, 8.15)
-STEPMAKE_PROGS(MFTRACE, mftrace, REQUIRED, 1.1.19)
STEPMAKE_PATH_PROG(FONTFORGE, fontforge, REQUIRED, 20050624)
-AC_CHECK_HEADERS([assert.h grp.h libio.h pwd.h sys/stat.h wchar.h])
+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])
+AC_CHECK_HEADERS([sstream boost/lambda/lambda.hpp])
AC_LANG_POP(C++)
AC_HEADER_STAT
AC_FUNC_MEMCMP
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)
fi
+AC_MSG_RESULT($reloc_b)
+AC_MSG_CHECKING(for rpath linkage)
+if test "$rpath_b" = "yes"; then
+ LDFLAGS="$LDFLAGS -Wl,-rpath -Wl,\\\$\$ORIGIN/../lib"
+elif test "$rpath_b" != "no"; then
+ LDFLAGS="$LDFLAGS -Wl,-rpath -Wl,$rpath_b"
+fi
+AC_MSG_RESULT($rpath_b)
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_FREETYPE2(freetype2, REQUIRED, 0)
+STEPMAKE_FREETYPE2(freetype2, REQUIRED, 2.1.10)
STEPMAKE_WINDOWS
# perl for help2man.
STEPMAKE_PERL(OPTIONAL)
-# 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.8)
+STEPMAKE_PROGS(MAKEINFO, makeinfo, REQUIRED, 4.11)
+STEPMAKE_PROGS(TEXI2HTML, texi2html, OPTIONAL, 1.79)
AC_DEFINE_UNQUOTED(FLOWER_VERSION, "${FULL_FLOWER_VERSION}")
-
# must also have local.make if configure fails.
touch local.make
+if test "$reloc_b$rpath_b" = "yesno"; then
+ STEPMAKE_WARN([Using --enable-relocation without --enable-rpath. LilyPond may have trouble finding libraries.])
+fi
+
# Gather requirements and generate output.
STEPMAKE_END