X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=stepmake%2Faclocal.m4;h=31ddaed991943d0bc2c2166203e5daefb3a8070a;hb=2a6f7d1f45438eae0b46636d43da07b36db53273;hp=876f4203bf343e077db181f59bcc03d2ecfe1c3a;hpb=f169e9999944ce02479e4f54ade14036393ec854;p=lilypond.git diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4 index 876f4203bf..31ddaed991 100644 --- a/stepmake/aclocal.m4 +++ b/stepmake/aclocal.m4 @@ -24,12 +24,25 @@ AC_DEFUN(STEPMAKE_GET_VERSION, [ ## gcc (GCC) 3.1.1 20020606 (Debian prerelease) ## ## -V: Workaround for python - ## - ## Assume, and hunt for, dotted version multiplet. changequote(<<, >>)dnl - ("$1" --version || "$1" -V) 2>&1 | grep '[0-9]\.[0-9]' | head -n 1 | \ - sed -e 's/.*[^-.0-9]\([0-9][0-9]*\.[0-9][.0-9]*\).*/\1/' + ##set -x + ## Assume and hunt for dotted version multiplet. + ## use eval trickery, because we cannot use multi-level $() instead of `` + ## for compatibility reasons. + ## FIXME: what systems still do not have $() in /bin/sh? + eval _ver=\"\`("$1" --version || "$1" -V) 2>&1 | grep '[0-9]\.[0-9]' \ + | head -n 1 \ + | sed -e 's/.*[^-.0-9]\([0-9][0-9]*\.[0-9][.0-9]*\).*/\1/' \ + -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" + if test -z "$_ver"; then + ## If empty, try date [fontforge] + eval _ver=\"\`("$1" --version || "$1" -V) 2>&1 | grep '[0-9]\{6,8\}' \ + | head -n 1 \ + | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" + fi + echo "$_ver" + ##set +x changequote([, ])dnl ]) @@ -41,7 +54,7 @@ AC_DEFUN(STEPMAKE_NUMERIC_VERSION, [ if ([$]3) {three = [$]3} else {three = 0} } - {printf "%d\n", [$]1*1000000 + [$]2*1000 + three}' + {printf "%.0f\n", [$]1*1000000 + [$]2*1000 + three}' ]) @@ -84,19 +97,27 @@ AC_DEFUN(STEPMAKE_CHECK_SEARCH_RESULT, [ # Check version of program ($1) -# If version is smaller than requested ($3), -# add entry to missing-list ($2, one of 'OPTIONAL', 'REQUIRED'). +# If version ($4: optional argument, supply if version cannot be +# parsed using --version or -V ) is smaller than requested ($3), add +# entry to missing-list ($2, one of 'OPTIONAL', 'REQUIRED'). AC_DEFUN(STEPMAKE_CHECK_VERSION, [ r="`eval echo '$'"$1"`" AC_MSG_CHECKING([$r version]) exe=`STEPMAKE_GET_EXECUTABLE($r)` - ver=`STEPMAKE_GET_VERSION($exe)` + if test -n "$4"; then + ver="$4" + else + ver=`STEPMAKE_GET_VERSION($exe)` + fi num=`STEPMAKE_NUMERIC_VERSION($ver)` req=`STEPMAKE_NUMERIC_VERSION($3)` AC_MSG_RESULT([$ver]) if test "$num" -lt "$req"; then STEPMAKE_ADD_ENTRY($2, ["$r >= $3 (installed: $ver)"]) fi + vervar="`echo $1 | tr '[a-z]' '[A-Z]'`_VERSION" + eval `echo $vervar=$num` +## AC_SUBST(`eval echo $vervar`) ]) # Check version of program ($1) @@ -148,16 +169,11 @@ AC_DEFUN(STEPMAKE_COMPILE, [ CFLAGS=${CFLAGS-""} CXXFLAGS=${CXXFLAGS-$CFLAGS} LDFLAGS=${LDFLAGS-""} - checking_b=yes optimise_b=yes profile_b=no debug_b=yes pipe_b=yes - AC_ARG_ENABLE(checking, - [ --enable-checking set runtime checks (assert calls). Default: on], - [checking_b=$enableval] ) - AC_ARG_ENABLE(debugging, [ --enable-debugging compile with debugging info. Default: on], [debug_b=$enableval]) @@ -174,13 +190,9 @@ AC_DEFUN(STEPMAKE_COMPILE, [ [ --enable-pipe compile with -pipe. Default: on], [pipe_b=$enableval]) - if test "$checking_b" = no; then - # ugh + if test "$optimise_b" = yes; then AC_DEFINE(NDEBUG) DEFINES="$DEFINES -DNDEBUG" - fi - - if test "$optimise_b" = yes; then OPTIMIZE="-O2 -finline-functions" fi @@ -398,7 +410,7 @@ class yy_flex_lexer: public yyFlexLexer fi AC_LANG_POP(C++) ]) - + AC_DEFUN(STEPMAKE_GCC, [ if test "$GCC" = "yes"; then @@ -427,8 +439,8 @@ AC_DEFUN(STEPMAKE_GETTEXT, [ GCC_UNSUPPORTED= STEPMAKE_CHECK_VERSION_UNSUPPORTED(CXX, GCC_UNSUPPORTED, 3.3) if test -n "$GCC_UNSUPPORTED"; then - AC_MSG_WARN([autoconf <= 2.57 with g++ >= 3.3 gettext test broken.]) - AC_MSG_WARN([Trying gcc, cross thumbs.]) + AC_MSG_WARN([autoconf <= 2.59 with g++ >= 3.3 gettext test broken.]) + AC_MSG_WARN([Trying gcc, cross fingers.]) AC_LANG_PUSH(C) fi AC_CHECK_LIB(intl, gettext) @@ -479,8 +491,10 @@ AC_DEFUN([STEPMAKE_GUILE_FLAGS], [ AC_DEFUN(STEPMAKE_GUILE_DEVEL, [ ## First, let's just see if we can find Guile at all. + test -n "$target_alias" && target_guile_config=$target_alias-guile-config + test -n "$host_alias" && host_guile_config=$host_alias-guile-config AC_MSG_CHECKING([for guile-config]) - for guile_config in $GUILE_CONFIG guile-config $target-guile-config $build-guile-config; do + for guile_config in $GUILE_CONFIG $target_guile_config $host_guile_config $build_guile_config guile-config; do AC_MSG_RESULT([$guile_config]) if ! $guile_config --version > /dev/null 2>&1 ; then AC_MSG_WARN([cannot execute $guile_config]) @@ -511,12 +525,31 @@ AC_DEFUN(STEPMAKE_GUILE_DEVEL, [ GUILE_PATCH_LEVEL=`expr $guile_version : '[0-9]*\.[0-9]*\.\([0-9]*\)'` changequote([, ])dnl STEPMAKE_GUILE_FLAGS + save_CPPFLAGS="$CPPFLAGS" + save_LIBS="$LIBS" + CPPFLAGS="$GUILE_CFLAGS $CPPFLAGS" + LIBS="$GUILE_LDFLAGS $LIBS" + AC_CHECK_HEADERS([libguile.h]) + AC_CHECK_LIB(guile, scm_boot_guile) + AC_CHECK_FUNCS(scm_boot_guile,,libguile_b=no) + if test "$libguile_b" = "no"; then + warn='libguile (libguile-dev, guile-devel or guile-dev + package).' + STEPMAKE_ADD_ENTRY(REQUIRED, $warn) + fi + CPPFLAGS="$save_CPPFLAGS" + LIBS="$save_LIBS" AC_DEFINE_UNQUOTED(GUILE_MAJOR_VERSION, $GUILE_MAJOR_VERSION) AC_DEFINE_UNQUOTED(GUILE_MINOR_VERSION, $GUILE_MINOR_VERSION) AC_DEFINE_UNQUOTED(GUILE_PATCH_LEVEL, $GUILE_PATCH_LEVEL) ]) +AC_DEFUN(STEPMAKE_DLOPEN, [ + AC_CHECK_LIB(dl, dlopen) + AC_CHECK_FUNCS(dlopen) +]) + AC_DEFUN(STEPMAKE_GXX, [ if test "$GXX" = "yes"; then STEPMAKE_CHECK_VERSION(CXX, $1, $2) @@ -535,7 +568,7 @@ AC_DEFUN(STEPMAKE_INIT, [ if test x$MY_PATCH_LEVEL != x; then FULL_VERSION=$FULL_VERSION.$MY_PATCH_LEVEL fi - + export MAJOR_VERSION MINOR_VERSION PATCH_LEVEL # urg: don't "fix" this: irix doesn't know about [:lower:] and [:upper:] changequote(<<, >>)dnl PACKAGE=`echo $PACKAGE_NAME | tr '[a-z]' '[A-Z]'` @@ -614,6 +647,9 @@ AC_DEFUN(STEPMAKE_INIT, [ AC_SUBST(package) AC_SUBST(PACKAGE) AC_SUBST(PACKAGE_NAME) + AC_SUBST(MAJOR_VERSION) + AC_SUBST(MINOR_VERSION) + # We don't need the upper case variant, # so stick to macros are uppercase convention. # AC_DEFINE_UNQUOTED(package, ["${package}"]) @@ -738,21 +774,49 @@ AC_DEFUN(STEPMAKE_KPATHSEA, [ [ --with-kpathsea use kpathsea lib. Default: on], [kpathsea_b=$with_kpathsea]) + save_LIBS="$LIBS" if test "$kpathsea_b" != "no"; then - AC_CHECK_HEADERS([kpathsea/kpathsea.h]) + AC_CHECK_HEADERS([kpathsea/kpathsea.h],,kpathsea_b=no) AC_CHECK_LIB(kpathsea, kpse_find_file) AC_CHECK_FUNCS(kpse_find_file,,kpathsea_b=no) if test "$kpathsea_b" = "no"; then warn='kpathsea (libkpathsea-dev, kpathsea-devel or tetex-devel package). - Else, please specify the location of your kpathsea using - --with-kpathsea-include and --with-kpathsea-lib options. You should - install kpathsea; see INSTALL.txt. Rerun ./configure - --without-kpathsea only if kpathsea is not available for your - platform.' + Else, please specify the directories where kpathsea/kpathsea.h and + libkpathsea.a are installed using --with-kpathsea-include and + --with-kpathsea-lib options. You should install kpathsea; see + INSTALL.txt. Rerun ./configure --without-kpathsea only if kpathsea + is not available for your platform.' STEPMAKE_ADD_ENTRY(REQUIRED, $warn) fi fi + + save_CFLAGS="$CFLAGS" + CFLAGS=$(echo "-shared $CFLAGS" | sed -e 's/ -g//') + AC_MSG_CHECKING([for shared libkpathsea]) + AC_TRY_LINK([#include ], + [kpse_var_expand ("\$TEXMF");], + [have_libkpathsea_so=maybe; + shared_size=`wc -c conftest`; + shared_size=`echo $shared_size | sed -e 's/ .*//g'`], + [have_libkpathsea_so=no]) + + if test "$have_libkpathsea_so" = "maybe"; then + if test $shared_size -lt 40000 ; then + have_libkpathsea_so=yes + else + have_libkpathsea_so=no + fi + fi + + AC_MSG_RESULT($have_libkpathsea_so) + if test "$have_libkpathsea_so" = "yes"; then + AC_DEFINE(HAVE_LIBKPATHSEA_SO) + fi + CFLAGS="$save_CFLAGS" + + KPATHSEA_LIBS="$LIBS" + LIBS="$save_LIBS" AC_MSG_CHECKING(whether to use kpathsea) if test "$kpathsea_b" != no; then AC_MSG_RESULT(yes) @@ -763,6 +827,8 @@ AC_DEFUN(STEPMAKE_KPATHSEA, [ fi AC_SUBST(KPATHSEA) + AC_SUBST(KPATHSEA_LIBS) + AC_SUBST(HAVE_LIBKPATHSEA_SO, $have_libkpathsea_so) AC_DEFINE_UNQUOTED(KPATHSEA, $KPATHSEA) ]) @@ -829,31 +895,9 @@ AC_DEFUN(STEPMAKE_LOCALE, [ AC_DEFUN(STEPMAKE_MAKEINFO, [ STEPMAKE_PROGS(MAKEINFO, makeinfo, $1) - if test "$MAKEINFO" = "makeinfo"; then - AC_MSG_CHECKING(whether makeinfo can split html by @node) - mkdir -p out - makeinfo --html --output=out/split < /dev/null 2>&1 + $METAFONT -progname=mf "\mode:=$MFMODE; mode_setup; end." > /dev/null 2>&1 if test -f mfput.tfm; then break; fi @@ -1011,3 +1053,149 @@ AC_DEFUN(STEPMAKE_WARN, [ ]) +dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not) +dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page +dnl also defines GSTUFF_PKG_ERRORS on error +AC_DEFUN(PKG_CHECK_MODULES, [ + succeeded=no + + if test -z "$PKG_CONFIG"; then + AC_PATH_PROG(PKG_CONFIG, pkg-config, no) + fi + + if test "$PKG_CONFIG" = "no" ; then + echo "*** The pkg-config script could not be found. Make sure it is" + echo "*** in your path, or set the PKG_CONFIG environment variable" + echo "*** to the full path to pkg-config." + echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." + else + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + AC_MSG_CHECKING(for $2) + + if $PKG_CONFIG --exists "$2" ; then + AC_MSG_RESULT(yes) + succeeded=yes + + AC_MSG_CHECKING($1_CFLAGS) + $1_CFLAGS=`$PKG_CONFIG --cflags "$2"` + AC_MSG_RESULT($$1_CFLAGS) + + AC_MSG_CHECKING($1_LIBS) + $1_LIBS=`$PKG_CONFIG --libs "$2"` + AC_MSG_RESULT($$1_LIBS) + else + $1_CFLAGS="" + $1_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` + ifelse([$4], ,echo $$1_PKG_ERRORS,) + fi + + AC_SUBST($1_CFLAGS) + AC_SUBST($1_LIBS) + fi + fi + + if test $succeeded = yes; then + ifelse([$3], , :, [$3]) + else + ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4]) + fi +]) + +AC_DEFUN(STEPMAKE_FREETYPE2, [ + PKG_CHECK_MODULES(FREETYPE2, $1 >= $3, have_freetype2=yes, true) + if test "$have_freetype2" = yes; then + AC_DEFINE(HAVE_FREETYPE2) + AC_SUBST(FREETYPE2_CFLAGS) + AC_SUBST(FREETYPE2_LIBS) + else + r="lib$1-dev or $1-devel" + ver="$(pkg-config --modversion $1)" + STEPMAKE_ADD_ENTRY($2, ["$r >= $3 (installed: $ver)"]) + fi +]) + +AC_DEFUN(STEPMAKE_GTK2, [ + PKG_CHECK_MODULES(GTK2, $1 >= $3, have_gtk2=yes, true) + if test "$have_gtk2" = yes ; then + AC_DEFINE(HAVE_GTK2) + AC_SUBST(GTK2_CFLAGS) + AC_SUBST(GTK2_LIBS) + else + r="lib$1-dev or $1-devel" + ver="$(pkg-config --modversion $1)" + STEPMAKE_ADD_ENTRY($2, ["$r >= $3 (installed: $ver)"]) + fi +]) + +AC_DEFUN(STEPMAKE_PANGO, [ + PKG_CHECK_MODULES(PANGO, $1 >= $3, have_pango16=yes, true) + if test "$have_pango16" = yes ; then + AC_DEFINE(HAVE_PANGO16) + PANGO_CFLAGS="$PANGO_CFLAGS $GTK2_CFLAGS" + PANGO_LIBS="$PANGO_LIBS $GTK2_LIBS" + # Do not pollute user-CPPFLAGS with configure-CPPFLAGS + save_CPPFLAGS="$CPPFLAGS" + save_LIBS="$LIBS" + AC_CHECK_HEADERS([pango/pangofc-fontmap.h]) + AC_CHECK_FUNCS([pango_fc_font_map_add_decoder_find_func]) + AC_SUBST(PANGO_CFLAGS) + AC_SUBST(PANGO_LIBS) + CPPFLAGS="$save_CPPFLAGS" + LIBS="$save_LIBS" + else + r="lib$1-dev or $1-devel" + ver="$(pkg-config --modversion $1)" + STEPMAKE_ADD_ENTRY($2, ["$r >= $3 (installed: $ver)"]) + fi +]) + +AC_DEFUN(STEPMAKE_PANGO_FT2, [ + PKG_CHECK_MODULES(PANGO_FT2, $1 >= $3, have_pangoft2=yes, true) + if test "$have_pangoft2" = yes ; then + AC_DEFINE(HAVE_PANGO16) + AC_DEFINE(HAVE_PANGO_FT2) + PANGO_FT2_CFLAGS="$PANGO_FT2_CFLAGS $GTK2_CFLAGS" + PANGO_FT2_LIBS="$PANGO_FT2_LIBS $GTK2_LIBS" + # Do not pollute user-CPPFLAGS with configure-CPPFLAGS + save_CPPFLAGS="$CPPFLAGS" + save_LIBS="$LIBS" + CPPFLAGS="$CPPFLAGS $PANGO_FT2_CFLAGS" + LIBS="$PANGO_FT2_LIBS $LIBS" + AC_CHECK_HEADERS([pango/pangoft2.h]) + AC_CHECK_FUNCS([pango_ft2_font_map_create_context]) + AC_SUBST(PANGO_FT2_CFLAGS) + AC_SUBST(PANGO_FT2_LIBS) + CPPFLAGS="$save_CPPFLAGS" + LIBS="$save_LIBS" + else + r="lib$1-dev or $1-devel" + ver="$(pkg-config --modversion $1)" + STEPMAKE_ADD_ENTRY($2, ["$r >= $3 (installed: $ver)"]) + fi +]) + +AC_DEFUN(STEPMAKE_FONTCONFIG, [ + PKG_CHECK_MODULES(FONTCONFIG, $1 >= $3, have_fontconfig=yes, true) + if test "$have_fontconfig" = yes ; then + AC_DEFINE(HAVE_FONTCONFIG) + FONTCONFIG_CFLAGS="$FONTCONFIG_CFLAGS" + FONTCONFIG_LIBS="$FONTCONFIG_LIBS" + # Do not pollute user-CPPFLAGS with configure-CPPFLAGS + save_CPPFLAGS="$CPPFLAGS" + save_LIBS="$LIBS" + CPPFLAGS="$CPPFLAGS $FONTCONFIG_CFLAGS" + LIBS="$FONTCONFIG_LIBS $LIBS" + AC_SUBST(FONTCONFIG_CFLAGS) + AC_SUBST(FONTCONFIG_LIBS) + CPPFLAGS="$save_CPPFLAGS" + LIBS="$save_LIBS" + else + r="lib$1-dev or $1-devel" + ver="$(pkg-config --modversion $1)" + STEPMAKE_ADD_ENTRY($2, ["$r >= $3 (installed: $ver)"]) + fi +])