X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=stepmake%2Faclocal.m4;h=e249e98a67f2149c26711bd62652ec57edf7e8e0;hb=adc7c4f282bd67ef79502c1561444efacaa063d8;hp=8f0d8a06054c2480977f857853234a93f81f70eb;hpb=8438b824fb221159742957c2eeab761effe73be4;p=lilypond.git diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4 index 8f0d8a0605..e249e98a67 100644 --- a/stepmake/aclocal.m4 +++ b/stepmake/aclocal.m4 @@ -11,23 +11,37 @@ AC_DEFUN(STEPMAKE_GET_EXECUTABLE, [ ## command -v doesn't work in zsh ## command -v "$1" 2>&1 ## this test should work in ash, bash, pdksh (ksh), zsh - type -p "$1" 2>/dev/null | tail -1 | awk '{print $NF}' + type -p $1 2>/dev/null | tail -n 1 | awk '{print $NF}' ]) # Get version string from executable ($1) AC_DEFUN(STEPMAKE_GET_VERSION, [ - ## "$1" --version 2>&1 | grep -v '^$' | head -1 | awk '{print $NF}' + ## "$1" --version 2>&1 | grep -v '^$' | head -n 1 | awk '{print $NF}' ## ## ARG. ## Workaround for broken Debian gcc version string: ## gcc (GCC) 3.1.1 20020606 (Debian prerelease) ## - ## Assume, and hunt for, dotted version multiplet. - changequote(<<, >>)dnl - "$1" --version 2>&1 | grep '[0-9]\.[0-9]' | head -1 | \ - sed -e 's/.*[^-.0-9]\([0-9][0-9]*\.[0-9][.0-9]*\).*/\1/' - changequote([, ])dnl + ## -V: Workaround for python + + changequote(<<, >>)#dnl + ## 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" + changequote([, ])#dnl ]) # Calculate simplistic numeric version from version string ($1) @@ -38,7 +52,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}' ]) @@ -81,18 +95,42 @@ 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)"]) + 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) +# If version is greater than or equals unsupported ($3), +# add entry to unsupported list ($2, 'UNSUPPORTED') +AC_DEFUN(STEPMAKE_CHECK_VERSION_UNSUPPORTED, [ + r="`eval echo '$'"$1"`" + AC_MSG_CHECKING([$r version]) + exe=`STEPMAKE_GET_EXECUTABLE($r)` + ver=`STEPMAKE_GET_VERSION($exe)` + num=`STEPMAKE_NUMERIC_VERSION($ver)` + sup=`STEPMAKE_NUMERIC_VERSION($3)` + AC_MSG_RESULT([$ver]) + if test "$num" -ge "$sup"; then + STEPMAKE_ADD_ENTRY($2, ["$r < $3 (installed: $ver)"]) fi ]) @@ -129,14 +167,10 @@ AC_DEFUN(STEPMAKE_COMPILE, [ CFLAGS=${CFLAGS-""} CXXFLAGS=${CXXFLAGS-$CFLAGS} LDFLAGS=${LDFLAGS-""} - checking_b=yes optimise_b=yes profile_b=no debug_b=yes - - AC_ARG_ENABLE(checking, - [ --enable-checking set runtime checks (assert calls). Default: on], - [checking_b=$enableval] ) + pipe_b=yes AC_ARG_ENABLE(debugging, [ --enable-debugging compile with debugging info. Default: on], @@ -150,33 +184,45 @@ AC_DEFUN(STEPMAKE_COMPILE, [ [ --enable-profiling compile with gprof support. Default: off], [profile_b=$enableval]) + AC_ARG_ENABLE(pipe, + [ --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 - if test $profile_b = yes; then EXTRA_LIBES="-pg" OPTIMIZE="$OPTIMIZE -pg" fi - if test $debug_b = yes; then + if test $debug_b = yes; then OPTIMIZE="$OPTIMIZE -g" fi - - + AC_PROG_CC STEPMAKE_OPTIONAL_REQUIRED(CC, cc, $1) LD='$(CC)' AC_SUBST(LD) + # If -pipe requested, test if it works and add to CFLAGS. + if test "$pipe_b" = yes; then + save_cflags="$CFLAGS" + CFLAGS="-pipe $CFLAGS"; + AC_CACHE_CHECK([whether compiler understands -pipe], + [stepmake_cflags_pipe], + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[/* -pipe test */]])], + [stepmake_cflags_pipe=yes], + [stepmake_cflags_pipe=no])) + CFLAGS=$save_cflags + if test $stepmake_cflags_pipe = yes; then + OPTIMIZE="$OPTIMIZE -pipe" + fi + fi + CFLAGS="$CFLAGS $OPTIMIZE" CPPFLAGS=${CPPFLAGS-""} @@ -192,6 +238,7 @@ AC_DEFUN(STEPMAKE_COMPILE, [ AC_MSG_RESULT([none]) ;; esac + AC_SUBST(cross_compiling) AC_SUBST(CFLAGS) AC_SUBST(CPPFLAGS) @@ -240,33 +287,42 @@ AC_DEFUN(STEPMAKE_DATADIR, [ presome=${ac_default_prefix} fi - package_datadir=$datadir/$package - local_package_datadir=$package_datadir/$FULL_VERSION build_package_datadir=$ugh_ugh_autoconf250_builddir/share/$package DATADIR=`echo ${datadir} | sed "s!\\\${prefix}!$presome!"` - PACKAGE_DATADIR=`echo ${package_datadir} | sed "s!\\\${prefix}!$presome!"` - LOCAL_PACKAGE_DATADIR=`echo ${local_package_datadir} | sed "s!\\\${prefix}!$presome!"` BUILD_PACKAGE_DATADIR=`echo ${build_package_datadir} | sed "s!\\\${prefix}!$presome!"` AC_SUBST(datadir) - AC_SUBST(package_datadir) - AC_SUBST(local_package_datadir) AC_SUBST(build_package_datadir) AC_DEFINE_UNQUOTED(DATADIR, ["${DATADIR}"]) - AC_DEFINE_UNQUOTED(PACKAGE_DATADIR, ["${PACKAGE_DATADIR}"]) - AC_DEFINE_UNQUOTED(LOCAL_PACKAGE_DATADIR, ["${LOCAL_PACKAGE_DATADIR}"]) AC_DEFINE_UNQUOTED(BUILD_PACKAGE_DATADIR, ["${BUILD_PACKAGE_DATADIR}"]) ]) +## ugh: cut & paste programming from datadir. +AC_DEFUN(STEPMAKE_LIBDIR, [ + + if test "$libdir" = "\${exec_prefix}/lib"; then + libdir='${exec_prefix}/lib' + fi + presome=$exec_prefix + build_package_libdir=$ugh_ugh_autoconf250_builddir/lib/$package + + LIBDIR=`echo ${libdir} | sed "s!\\\${exec_prefix}!$presome!"` + BUILD_PACKAGE_LIBDIR=`echo ${build_package_libdir} | sed "s!\\\${exec_prefix}!$presome!"` + + AC_SUBST(libdir) + AC_SUBST(build_package_libdir) + AC_DEFINE_UNQUOTED(LIBDIR, ["${LIBDIR}"]) + AC_DEFINE_UNQUOTED(BUILD_PACKAGE_LIBDIR, ["${BUILD_PACKAGE_LIBDIR}"]) +]) + AC_DEFUN(STEPMAKE_END, [ AC_SUBST(OPTIONAL) AC_SUBST(REQUIRED) AC_CONFIG_FILES([$CONFIGFILE.make:config.make.in]) -AC_OUTPUT - + AC_OUTPUT if test -n "$OPTIONAL"; then echo @@ -278,13 +334,20 @@ AC_OUTPUT echo "ERROR: Please install required programs: $REQUIRED" fi - if test -n "$OPTIONAL$REQUIRED"; then + if test -n "$UNSUPPORTED"; then + echo + echo "ERROR: Please use older version of programs: $UNSUPPORTED" + fi + + if test -n "$OPTIONAL$REQUIRED$UNSUPPORTED"; then echo echo "See INSTALL.txt for more information on how to build $PACKAGE_NAME" - echo "Remove config.cache before rerunning ./configure" + if test -f config.cache ; then + echo "Remove config.cache before rerunning ./configure" + fi fi - if test -n "$REQUIRED"; then + if test -n "$REQUIRED$UNSUPPORTED"; then rm -f $srcdir/GNUmakefile exit 1 fi @@ -321,9 +384,49 @@ AC_DEFUN(STEPMAKE_FLEXLEXER, [ warn='FlexLexer.h (flex package)' STEPMAKE_ADD_ENTRY($1, $warn) fi + # check for yyFlexLexer.yy_current_buffer, + # in 2.5.4 <= flex < 2.5.29 + AC_LANG_PUSH(C++) + AC_CACHE_CHECK([for yyFlexLexer.yy_current_buffer], + [stepmake_flexlexer_yy_current_buffer], + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ +using namespace std; +#include +class yy_flex_lexer: public yyFlexLexer +{ + public: + yy_flex_lexer () + { + yy_current_buffer = 0; + } +}; +]])], + [stepmake_flexlexer_yy_current_buffer=yes], + [stepmake_flexlexer_yy_current_buffer=no])) + if test $stepmake_flexlexer_yy_current_buffer = yes; then + AC_DEFINE(HAVE_FLEXLEXER_YY_CURRENT_BUFFER, 1, [Define to 1 if yyFlexLexer has yy_current_buffer.]) + fi + AC_LANG_POP(C++) ]) + +AC_DEFUN(STEPMAKE_FLEXLEXER_LOCATION, [ + AC_MSG_CHECKING([FlexLexer.h path]) + + # ugh. + cat < conftest.cc +using namespace std; +#include +EOF + FLEXLEXER_PATH=`$CXX -E conftest.cc | \ + sed 's!# 1 "\(.*\)FlexLexer.h"!@FLEXLEXER@\1@@!g' | grep '@@' | \ + sed 's!.*@FLEXLEXER@\(.*\)@@.*$!\1!g' ` >& /dev/null + rm conftest.cc + AC_SUBST(FLEXLEXER_PATH) + AC_MSG_RESULT($FLEXLEXER_PATH) +]) + AC_DEFUN(STEPMAKE_GCC, [ if test "$GCC" = "yes"; then STEPMAKE_CHECK_VERSION(CC, $1, $2) @@ -333,7 +436,6 @@ AC_DEFUN(STEPMAKE_GCC, [ fi ]) - AC_DEFUN(STEPMAKE_GETTEXT, [ presome=${prefix} if test "$prefix" = "NONE"; then @@ -343,8 +445,24 @@ AC_DEFUN(STEPMAKE_GETTEXT, [ AC_SUBST(localedir) AC_DEFINE_UNQUOTED(LOCALEDIR, ["${LOCALEDIR}"]) + # ouch. autoconf <= 2.57's gettext check fails for + # g++ >= 3.3 (with -std=gnu++98, the default). + # While the check is OK for g++ -std=c++98, + # LilyPond needs GNU g++, so who is to blame here? + # Use a workaround until this is resolved: + # for g++ >= 3.3, select C language. + GCC_UNSUPPORTED= + STEPMAKE_CHECK_VERSION_UNSUPPORTED(CXX, GCC_UNSUPPORTED, 3.3) + if test -n "$GCC_UNSUPPORTED"; then + 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) AC_CHECK_FUNCS(gettext) + if test -n "$GCC_UNSUPPORTED"; then + AC_LANG_POP(C) + fi ]) @@ -388,8 +506,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 $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]) @@ -414,18 +534,37 @@ AC_DEFUN(STEPMAKE_GUILE_DEVEL, [ AC_SUBST(GUILE_CONFIG) guile_version="$ver" - changequote(<<, >>)dnl + changequote(<<, >>)#dnl GUILE_MAJOR_VERSION=`expr $guile_version : '\([0-9]*\)'` GUILE_MINOR_VERSION=`expr $guile_version : '[0-9]*\.\([0-9]*\)'` GUILE_PATCH_LEVEL=`expr $guile_version : '[0-9]*\.[0-9]*\.\([0-9]*\)'` - changequote([, ])dnl + 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) @@ -444,12 +583,12 @@ 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 + changequote(<<, >>)#dnl PACKAGE=`echo $PACKAGE_NAME | tr '[a-z]' '[A-Z]'` package=`echo $PACKAGE_NAME | tr '[A-Z]' '[a-z]'` - changequote([, ])dnl + changequote([, ])#dnl # No versioning on directory names of sub-packages # urg, urg @@ -523,7 +662,15 @@ AC_DEFUN(STEPMAKE_INIT, [ AC_SUBST(package) AC_SUBST(PACKAGE) AC_SUBST(PACKAGE_NAME) - AC_DEFINE_UNQUOTED(PACKAGE, ["${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}"]) + # AC_DEFINE_UNQUOTED(PACKAGE, ["${PACKAGE}"]) + AC_DEFINE_UNQUOTED(PACKAGE, ["${package}"]) + AC_DEFINE_UNQUOTED(PACKAGE_NAME, ["${PACKAGE_NAME}"]) AC_DEFINE_UNQUOTED(TOPLEVEL_VERSION, ["${FULL_VERSION}"]) if test -z "$package_depth"; then @@ -566,8 +713,8 @@ AC_DEFUN(STEPMAKE_INIT, [ AC_PATH_PROG(BASH, bash, $SHELL) fi AC_SUBST(SHELL) - - STEPMAKE_PATH_PROG(PYTHON, python, REQUIRED) + + STEPMAKE_PYTHON(REQUIRED, 1.5) if expr "$MAKE" : '.*\(echo\)' >/dev/null; then $MAKE -v 2> /dev/null | grep GNU > /dev/null @@ -576,39 +723,30 @@ AC_DEFUN(STEPMAKE_INIT, [ # STEPMAKE_WARN($warn) STEPMAKE_ADD_ENTRY(REQUIRED, $warn) fi - fi - - if test "$OSTYPE" = "cygwin" -o "$OSTYPE" = "cygwin32" -o "$OSTYPE" = "Windows_NT"; then - LN=cp # hard link does not work under cygnus-nt - LN_S='cp -r' # symbolic link does not work for native nt - ZIP="zip -r -9" # - program_suffix=.exe - ROOTSEP=':' - DIRSEP='/' - PATHSEP=':' - INSTALL="\$(SHELL) \$(stepdir)/../bin/install-dot-exe.sh -c" - else - ROOTSEP=':' - DIRSEP='/' - PATHSEP=':' - LN=ln - LN_S='ln -s' - ZIP="zip -r -9" - INSTALL="\$(SHELL) \$(stepdir)/../bin/install-sh -c" fi + + ROOTSEP=':' + DIRSEP='/' + PATHSEP=':' + LN=ln + LN_S='ln -s' + ZIP="zip -r -9" + INSTALL="\$(SHELL) \$(stepdir)/../bin/install-sh -c" + AC_SUBST(program_prefix) AC_SUBST(program_suffix) AC_SUBST(ZIP) AC_SUBST(LN) AC_SUBST(LN_S) AC_SUBST(INSTALL) - AC_DEFINE_UNQUOTED(DIRSEP, ["${DIRSEP}"]) - AC_DEFINE_UNQUOTED(PATHSEP, ["${PATHSEP}"]) + AC_DEFINE_UNQUOTED(DIRSEP, ['${DIRSEP}']) + AC_DEFINE_UNQUOTED(PATHSEP, ['${PATHSEP}']) AC_SUBST(DIRSEP) AC_SUBST(PATHSEP) AC_SUBST(ROOTSEP) STEPMAKE_DATADIR + STEPMAKE_LIBDIR ]) @@ -641,20 +779,42 @@ 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 or kpathsea-devel package) - Else, please specify the location of your kpathsea using - --with-kpathea-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) + STEPMAKE_ADD_ENTRY(OPTIONAL, $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$ac_exeext`; + 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) @@ -665,6 +825,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) ]) @@ -731,31 +893,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 ; then + #AC_MSG_WARN([cannot execute $python]) + PYTHON='echo no python' + else + unset pv + STEPMAKE_CHECK_VERSION(python, pv, $2) + if test -z "$pv"; then + PYTHON=$python + break + fi + fi + done + if test -n "$pv"; then + STEPMAKE_ADD_ENTRY($1, $pv) + fi + AC_PATH_PROG(PYTHON, $PYTHON) + AC_SUBST(PYTHON) +]) + AC_DEFUN(STEPMAKE_PYTHON_DEVEL, [ - AC_CHECK_HEADERS([python2.2/Python.h python2.1/Python.h python2.0/Python.h python2/Python.h python/Python.h python1.5/Python.h Python.h],[PYTHON_HEADER=yes]) + unset PYTHON_HEADER PYTHON_INCLUDE + if test -n "$PYTHON"; then + changequote(<<, >>)#dnl + # alternatively, for python >= 2.0 + # 'import sys, distutils.sysconfig; sys.stdout.write (distutils.sysconfig.get_python_inc ())' + PYTHON_INCLUDE=`$PYTHON -c 'import sys; sys.stdout.write ("%s/include/python%s" % (sys.prefix, sys.version[:3]))'` + changequote([, ])#dnl + fi + + ##AC_CHECK_HEADERS([Python.h],[PYTHON_HEADER=yes]) if test -z "$PYTHON_HEADER"; then - warn='python.h (python-devel, python-dev or libpython-dev package)' + #URG -- how to extend include path? + ac_compile="$ac_compile -I$PYTHON_INCLUDE" + ac_cpp="$ac_cpp -I$PYTHON_INCLUDE" + CPPFLAGS="$CPPFLAGS -I$PYTHON_INCLUDE" + AC_CHECK_HEADERS([Python.h],[PYTHON_HEADER=yes]) + fi + + if test -z "$PYTHON_HEADER"; then + warn="$PYTHON_INCLUDE/Python.h (python-devel, python-dev or libpython-dev package)" STEPMAKE_ADD_ENTRY($1, $warn) fi ]) - AC_DEFUN(STEPMAKE_TEXMF_DIRS, [ - AC_ARG_ENABLE(tfm-path, - [ --enable-tfm-path=PATH set path of tex directories where tfm files live, - esp.: cmr10.tfm. Default: use kpsewhich], - [tfm_path=$enableval], - [tfm_path=auto] ) - # ugh STEPMAKE_PROGS(KPSEWHICH, kpsewhich, OPTIONAL) - AC_MSG_CHECKING(for tfm path) - - TFM_FONTS="cmr msam" - - if test "x$tfm_path" = xauto ; then - if test "x$KPSEWHICH" != "xno" ; then - for i in $TFM_FONTS; do - dir=`$KPSEWHICH tfm ${i}10.tfm` - TFM_PATH="$TFM_PATH `dirname $dir`" - done - else - STEPMAKE_WARN(Please specify where cmr10.tfm lives: - ./configure --enable-tfm-path=/usr/local/TeX/lib/tex/fonts) - fi - else - TFM_PATH=$tfm_path - fi - - TFM_PATH=`echo $TFM_PATH | tr ':' ' '` - AC_MSG_RESULT($TFM_PATH) - AC_SUBST(TFM_PATH) ]) - AC_DEFUN(STEPMAKE_TEXMF, [ - # urg, never know what names these teTeX guys will think up - - STEPMAKE_PROGS(METAFONT, mf mfont, $1) - STEPMAKE_PROGS(INIMETAFONT, inimf inimfont, $1) + STEPMAKE_PROGS(METAFONT, mf-nowin mf mfw mfont, $1) + # STEPMAKE_PROGS(INIMETAFONT, inimf inimfont "$METAFONT -ini", $1) AC_MSG_CHECKING(for working metafont mode) modelist='ljfour lj4 lj3 lj2 ljet laserjet' for MFMODE in $modelist; do - $METAFONT "\mode:=$MFMODE; mode_setup; end." > /dev/null 2>&1 + $METAFONT -progname=mf "\mode:=$MFMODE; mode_setup; end." > /dev/null 2>&1 if test -f mfput.tfm; then break; fi @@ -872,3 +1022,194 @@ 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 + # UGR + #r="lib$1-dev or $1-devel" + r="libfreetype6-dev or freetype?-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 + # UGR + # r="lib$1-dev or $1-devel" + r="libgtk2.0-dev or gtk2-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 + # UGR + #r="lib$1-dev or $1-devel" + r="libpango1.0-dev or pango1.0-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 + # UGR + #r="lib$1-dev or $1-devel"e + r="libpango1.0-dev or pango?-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 +]) + +AC_DEFUN(STEPMAKE_WINDOWS, [ + AC_CYGWIN + AC_MINGW32 + + if test "$CYGWIN" == "yes"; then + LN_S='cp -r' # Cygwin symbolic links do not work for native apps. + program_suffix=.exe + INSTALL="\$(SHELL) \$(stepdir)/../bin/install-dot-exe.sh -c" + elif test "$MINGW32" == "yes"; then + LN='cp -r' + LN_S='cp -r' + program_suffix=.exe + INSTALL="\$(SHELL) \$(stepdir)/../bin/install-dot-exe.sh -c" + PATHSEP=';' + fi + + AC_SUBST(LN) + AC_SUBST(LN_S) + AC_SUBST(INSTALL) + AC_DEFINE_UNQUOTED(DIRSEP, ['${DIRSEP}']) + AC_DEFINE_UNQUOTED(PATHSEP, ['${PATHSEP}']) + AC_SUBST(DIRSEP) + AC_SUBST(PATHSEP) + AC_SUBST(program_suffix) + + AC_MSG_CHECKING([for some flavor of Windows]) + if test "$CYGWIN$MINGW32" == "nono"; then + PLATFORM_WINDOWS=no + else + PLATFORM_WINDOWS=yes + fi + AC_MSG_RESULT([$PLATFORM_WINDOWS]) + AC_SUBST(PLATFORM_WINDOWS) + STEPMAKE_PROGS(WINDRES, $target-windres windres, x) + AC_SUBST(WINDRES) +])