From c7c4201c368868cfe9d00bff7e9eeb4675a8906a Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Thu, 16 May 2002 12:17:10 +0000 Subject: [PATCH] * stepmake/bin/install-sh: Include latest from libtool. * stepmake/configure: * configure: Regenerate. * config.make.in: Remove dead variables. Add OPTIONAL/REQUIRED lists. (USER_CFLAGS): Bugfix, include CPPFLAGS. * configure.in: Use new OPTIONAL/REQUIRED mechanism. * stepmake/aclocal.m4: Add mechanism for checking OPTIONAL or REQUIRED programs and version. Try to continue configuring, list missing programs at the end, but don't generate a GNUmakefile if REQUIRED programs are missing. Cleanups, junk obsolete stuff. Fix Cygwin detection, drop '32' suffix. Hoping this is not too fancy for some older systems. * config.make.in USER_CFLAGS: Include CPPFLAGS too. --- ChangeLog | 21 + aclocal.m4 | 1041 ++++++++---------------- config.make.in | 60 +- configure | 1653 +++++++++++++++++++++++++-------------- configure.in | 50 +- scripts/ly2dvi.py | 103 ++- scripts/update-lily.py | 54 +- stepmake/aclocal.m4 | 1039 ++++++++---------------- stepmake/bin/install-sh | 24 +- stepmake/configure | 349 ++++++--- stepmake/configure.in | 30 +- 11 files changed, 2113 insertions(+), 2311 deletions(-) diff --git a/ChangeLog b/ChangeLog index e20c398ff8..756685b4ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,24 @@ +2002-05-16 Jan Nieuwenhuizen + + * stepmake/bin/install-sh: Include latest from libtool. + + * stepmake/configure: + * configure: Regenerate. + + * config.make.in: Remove dead variables. Add OPTIONAL/REQUIRED lists. + (USER_CFLAGS): Bugfix, include CPPFLAGS. + + * configure.in: Use new OPTIONAL/REQUIRED mechanism. + + * stepmake/aclocal.m4: Add mechanism for checking OPTIONAL or + REQUIRED programs and version. Try to continue configuring, list + missing programs at the end, but don't generate a GNUmakefile if + REQUIRED programs are missing. Cleanups, junk obsolete stuff. + Fix Cygwin detection, drop '32' suffix. Hoping this is not too + fancy for some older systems. + + * config.make.in USER_CFLAGS: Include CPPFLAGS too. + 2002-05-16 Han-Wen * lily/piano-pedal-engraver.cc (create_bracket_grobs): fix broken diff --git a/aclocal.m4 b/aclocal.m4 index 3f659588d8..e0e2576c5a 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,10 +1,76 @@ -dnl WARNING WARNING WARNING WARNING -dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4 dnl aclocal.m4 -*-shell-script-*- dnl StepMake subroutines for configure.in -AC_DEFUN(AC_STEPMAKE_BIBTEX2HTML, [ - AC_CHECK_PROGS(BIBTEX2HTML, bibtex2html bib2html, error) + +### mostly interal macros + +# Get full path of executable ($1) +AC_DEFUN(STEPMAKE_GET_EXECUTABLE, [ + type -p "$1" 2>&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}' +]) + +# Calculate numeric version from version string ($1) +AC_DEFUN(STEPMAKE_NUMERIC_VERSION, [ + echo "$1" | awk -F. ' + { + if ([$]3) {last = [$]3} + else {last =0} + } + {printf "%s%s%s\n",[$]1*100, [$]2*10,last}' +]) + + +# Add item ($2) to list ($1, one of 'OPTIONAL', 'REQUIRED') +AC_DEFUN(STEPMAKE_ADD_ENTRY, [ + eval "$1"=\"`eval echo \"'$'$1\" \"$2\"`\" +]) + +# Check if tested program ($2) was found ($1). +# If not, add etry to missing-list ($3, one of 'OPTIONAL', 'REQUIRED'). +# We could abort here if a 'REQUIRED' program is not found +AC_DEFUN(STEPMAKE_OPTIONAL_REQUIRED, [ + #if test "`eval echo '$'"$1"`" = "no"; then + STEPMAKE_CHECK_SEARCH_RESULT($1) + if test $? -ne 0; then + STEPMAKE_ADD_ENTRY($3, $2) + if test "$3" = "REQUIRED"; then + command="echo ERROR: $2 not found" + # abort configure process here? + else + command="- echo $2 not found" + fi + eval "$1"='$command' + false + else + true + fi +]) + + +# Return if tested proram ($1) was found (true) or not (false). +AC_DEFUN(STEPMAKE_CHECK_SEARCH_RESULT, [ + r="`eval echo '$'"$1"`" + if test -n "$r" -a "$r" != "error" -a "$r" != "no" && ! expr '`eval echo '$'"$1"`' : '.*\(echo\)' > /dev/null; then + ##STEPMAKE_WARN(cannot find $2. $3) + false + else + true + fi +]) + + + +### Macros to build configure.in + + +AC_DEFUN(STEPMAKE_BIBTEX2HTML, [ + STEPMAKE_PROGS(BIBTEX2HTML, bibtex2html bib2html, $1) if test "$BIBTEX2HTML" = "bib2html"; then BIBTEX2HTML_FLAGS='$< $(@)' else @@ -15,11 +81,34 @@ AC_DEFUN(AC_STEPMAKE_BIBTEX2HTML, [ ]) -AC_DEFUN(AC_STEPMAKE_COMPILE, [ +AC_DEFUN(STEPMAKE_BISON, [ + # ugh, automake: we want (and check for) bison + AC_PROG_YACC + + STEPMAKE_PROGS(BISON, bison, $1) + + # urg. should test functionality rather than version. + if test "$BISON" = "bison" -a -n "$2"; then +# if test $? -eq 0 -a -n "$2"; then + AC_MSG_CHECKING("bison version") + exe=`STEPMAKE_GET_EXECUTABLE(bison)` + ver=`STEPMAKE_GET_VERSION($exe)` + num=`STEPMAKE_NUMERIC_VERSION($ver)` + req=`STEPMAKE_NUMERIC_VERSION($2)` + AC_MSG_RESULT("$ver") + if test "$num" -lt "$req"; then + STEPMAKE_ADD_ENTRY($1, "bison $2 (installed: $ver)") + fi + fi +]) + + + +AC_DEFUN(STEPMAKE_COMPILE, [ # -O is necessary to get inlining - CFLAGS=${CFLAGS:-""} - CXXFLAGS=${CXXFLAGS:-$CFLAGS} - LDFLAGS=${LDFLAGS:-""} + CFLAGS=${CFLAGS-""} + CXXFLAGS=${CXXFLAGS-$CFLAGS} + LDFLAGS=${LDFLAGS-""} checking_b=yes optimise_b=yes profile_b=no @@ -64,11 +153,12 @@ AC_DEFUN(AC_STEPMAKE_COMPILE, [ AC_PROG_CC + STEPMAKE_OPTIONAL_REQUIRED(CC, cc, $1) LD='$(CC)' AC_SUBST(LD) CFLAGS="$CFLAGS $OPTIMIZE" - CPPFLAGS=${CPPFLAGS:-""} + CPPFLAGS=${CPPFLAGS-""} AC_MSG_CHECKING([for IEEE-conformance compiler flags]) save_cflags="$CFLAGS" @@ -92,12 +182,13 @@ AC_DEFUN(AC_STEPMAKE_COMPILE, [ AC_SUBST(EXTRA_LIBES) ]) -AC_DEFUN(AC_STEPMAKE_CXX, [ +AC_DEFUN(STEPMAKE_CXX, [ AC_LANG_CPLUSPLUS AC_PROG_CXX + STEPMAKE_OPTIONAL_REQUIRED(CXX, c++, $1) AC_CHECK_HEADER(FlexLexer.h, true, - AC_STEPMAKE_WARN(can"\'"t find flex header. Please install Flex headers correctly)) + STEPMAKE_WARN(cannot find flex header. Please install Flex headers correctly)) CPPFLAGS="$CPPFLAGS $DEFINES" CXXFLAGS="$CXXFLAGS $OPTIMIZE" @@ -109,7 +200,8 @@ AC_DEFUN(AC_STEPMAKE_CXX, [ AC_SUBST(LD) ]) -AC_DEFUN(AC_STEPMAKE_CXXTEMPLATE, [ + +AC_DEFUN(STEPMAKE_CXXTEMPLATE, [ AC_CACHE_CHECK([whether explicit instantiation is needed], lily_cv_need_explicit_instantiation, AC_TRY_LINK([ @@ -123,7 +215,8 @@ AC_DEFUN(AC_STEPMAKE_CXXTEMPLATE, [ fi ]) -AC_DEFUN(AC_STEPMAKE_DATADIR, [ + +AC_DEFUN(STEPMAKE_DATADIR, [ if test "$datadir" = "\${prefix}/share"; then datadir='${prefix}/share/'$package fi @@ -146,9 +239,35 @@ AC_DEFUN(AC_STEPMAKE_DATADIR, [ AC_DEFINE_UNQUOTED(DIR_DATADIR, "${DIR_DATADIR}") ]) -AC_DEFUN(AC_STEPMAKE_END, [ + +AC_DEFUN(STEPMAKE_END, [ + AC_SUBST(OPTIONAL) + AC_SUBST(REQUIRED) + AC_OUTPUT($CONFIGFILE.make:config.make.in) + + if test -n "$OPTIONAL"; then + echo + echo "WARNING: Please consider installing optional programs: $OPTIONAL" + fi + + if test -n "$REQUIRED"; then + echo + echo "ERROR: Please install required programs: $REQUIRED" + fi + + if test -n "$OPTIONAL$REQUIRED"; then + echo + echo "See INSTALL.txt for more information on how to build $PACKAGE_NAME" + echo "Remove config.cache before rerunning ./configure" + fi + + if test -n "$REQUIRED"; then + rm -f $srcdir/GNUmakefile + exit 1 + fi + # regular in-place build # test for srcdir_build = yes ? if test "$builddir" = "."; then @@ -162,24 +281,75 @@ AC_DEFUN(AC_STEPMAKE_END, [ fi ]) -AC_DEFUN(AC_STEPMAKE_GXX, [ - AC_MSG_CHECKING("g++ version") - cxx_version=`$CXX --version` - AC_MSG_RESULT("$cxx_version") - changequote(<<, >>)dnl - # urg, egcs: how to check for egcs >= 1.1? - if expr "$cxx_version" : '.*2\.[89]' > /dev/null || - expr "$cxx_version" : '.*egcs' > /dev/null || - expr "$cxx_version" : '3\.0' > /dev/null - changequote([, ])dnl - then - true - else - AC_STEPMAKE_WARN(can\'t find g++ 2.8, 2.9, 3.0 or egcs 1.1) + +AC_DEFUN(STEPMAKE_FLEX, [ + # ugh, automake: we want (and check for) flex + # AC_PROG_LEX + # urg: automake 1.3: hope this doesn't break 1.2 ac_cv_pro_lex_root hack... + + # AC_DECL_YYTEXT + # ugh, ugh + ac_cv_prog_lex_root=lex.yy + STEPMAKE_PROGS(FLEX, flex, $1) +]) + + + +AC_DEFUN(STEPMAKE_GETTEXT, [ + DIR_LOCALEDIR=${localedir} + presome=${prefix} + if test "$prefix" = "NONE"; then + presome=${ac_default_prefix} fi + DIR_LOCALEDIR=`echo ${DIR_LOCALEDIR} | sed "s!\\\${prefix}!$presome!"` + AC_SUBST(localedir) + AC_SUBST(DIR_LOCALEDIR) + AC_DEFINE_UNQUOTED(DIR_LOCALEDIR, "${DIR_LOCALEDIR}") + + AC_CHECK_LIB(intl, gettext) + AC_CHECK_FUNCS(gettext) ]) -AC_DEFUN(AC_STEPMAKE_GUILE, [ + +AC_DEFUN(STEPMAKE_GUILE, [ + STEPMAKE_PATH_PROG(GUILE, guile, $1) +]) + + +# STEPMAKE_GUILE_FLAGS --- set flags for compiling and linking with Guile +# +# This macro runs the guile-config script, installed with Guile, +# to find out where Guile's header files and libraries are +# installed. It sets two variables, marked for substitution, as +# by AC_SUBST. +# +# GUILE_CFLAGS --- flags to pass to a C or C++ compiler to build +# code that uses Guile header files. This is almost +# always just a -I flag. +# +# GUILE_LDFLAGS --- flags to pass to the linker to link a +# program against Guile. This includes -lguile for +# the Guile library itself, any libraries that Guile +# itself requires (like -lqthreads), and so on. It may +# also include a -L flag to tell the compiler where to +# find the libraries. + +AC_DEFUN([STEPMAKE_GUILE_FLAGS], [ + exe=`STEPMAKE_GET_EXECUTABLE($guile_config)` + if test -x $exe; then + AC_MSG_CHECKING("guile compile flags") + GUILE_CFLAGS="`$guile_config compile`" + AC_MSG_RESULT($GUILE_CFLAGS) + AC_MSG_CHECKING("guile link flags") + GUILE_LDFLAGS="`$guile_config link`" + AC_MSG_RESULT($GUILE_LDFLAGS) + fi + AC_SUBST(GUILE_CFLAGS) + AC_SUBST(GUILE_LDFLAGS) +]) + + +AC_DEFUN(STEPMAKE_GUILE_DEVEL, [ ## First, let's just see if we can find Guile at all. AC_MSG_CHECKING("for guile-config") for guile_config in guile-config $target-guile-config $build-guile-config; do @@ -187,40 +357,67 @@ AC_DEFUN(AC_STEPMAKE_GUILE, [ if ! $guile_config --version > /dev/null 2>&1 ; then AC_MSG_WARN("cannot execute $guile_config") AC_MSG_CHECKING("if we are cross compiling") - guile_config=error + GUILE_CONFIG='echo no guile-config' else + GUILE_CONFIG=$guile_config break fi done - if test "$guile_config" = "error"; then - AC_MSG_ERROR("cannot find guile-config; is Guile installed?") - exit 1 - fi - AC_MSG_CHECKING("Guile version") - need_guile_version="1.3.4" - need_guile_version_numeric=100304 - guile_version=`$guile_config --version 2>&1 | awk '{print $NF}'` - guile_version_numeric=`echo $guile_version | awk -F. ' -{if ([$]3) {last = [$]3} -else {last =0}} -{printf "%s%s%s\n",[$]1*100, [$]2*10,last}'` - AC_MSG_RESULT("$guile_version") - if test $guile_version_numeric -lt $need_guile_version_numeric - then - AC_STEPMAKE_WARN("Guile version "$need_guile_version" or newer is needed") + STEPMAKE_OPTIONAL_REQUIRED(GUILE_CONFIG, $guile_config, $1) + #if expr "$GUILE_CONFIG" : '.*\(echo\)' >/dev/null; then + if test $? -ne 0; then + STEPMAKE_ADD_ENTRY($1, 'guile-config (guile-devel, guile-dev or libguile-dev package)') + fi + + STEPMAKE_CHECK_SEARCH_RESULT(GUILE_CONFIG) + # urg. should test functionality rather than version. + if test $? -eq 0 -a -n "$2"; then + AC_MSG_CHECKING("guile-config version") + exe=`STEPMAKE_GET_EXECUTABLE($guile_config)` + ver=`STEPMAKE_GET_VERSION($exe)` + set -- + num=`STEPMAKE_NUMERIC_VERSION($ver)` + req=`STEPMAKE_NUMERIC_VERSION($2)` + AC_MSG_RESULT("$ver") + if test "$num" -lt "$req"; then + STEPMAKE_ADD_ENTRY($1, "guile-config $2 (installed: $ver)") + fi fi + + AC_SUBST(GUILE_CONFIG) + + guile_version="$ver" changequote(<<, >>)dnl GUILE_MAJOR_VERSION=`expr $guile_version : '\([0-9]*\)'` GUILE_MINOR_VERSION=`expr $guile_version : '[0-9]*\.\([0-9]*\)'` changequote([, ])dnl - GUILE_FLAGS - AC_PATH_PROG(GUILE, guile, error) - AC_SUBST(GUILE) + STEPMAKE_GUILE_FLAGS AC_DEFINE_UNQUOTED(GUILE_MAJOR_VERSION, $GUILE_MAJOR_VERSION) AC_DEFINE_UNQUOTED(GUILE_MINOR_VERSION, $GUILE_MINOR_VERSION) ]) -AC_DEFUN(AC_STEPMAKE_INIT, [ + +AC_DEFUN(STEPMAKE_GXX, [ + AC_MSG_CHECKING("g++ version") + cxx_version=`$CXX --version` + AC_MSG_RESULT("$cxx_version") + changequote(<<, >>)dnl + # urg, egcs: how to check for egcs >= 1.1? + if expr "$cxx_version" : '.*2\.[89]' > /dev/null || + expr "$cxx_version" : '.*egcs' > /dev/null || + expr "$cxx_version" : '3\.[0-9]' > /dev/null + changequote([, ])dnl + then + true + else + STEPMAKE_WARN(cannot find g++ 2.8, 2.9, 3.x or egcs 1.1) + STEPMAKE_ADD_ENTRY($1, 'g++ >= 2.95 (gcc package)') + fi +]) + + + +AC_DEFUN(STEPMAKE_INIT, [ . $srcdir/VERSION FULL_VERSION=$MAJOR_VERSION.$MINOR_VERSION.$PATCH_LEVEL @@ -286,7 +483,7 @@ AC_DEFUN(AC_STEPMAKE_INIT, [ AC_MSG_RESULT($builddir) if expr "$srcdir" : '/' > /dev/null 2>&1; then absolute_srcdir=yes - AC_STEPMAKE_WARN(Absolute --srcdir specified: $srcdir) + STEPMAKE_WARN(Absolute --srcdir specified: $srcdir) fi AC_MSG_CHECKING(for stepmake) @@ -341,25 +538,21 @@ AC_DEFUN(AC_STEPMAKE_INIT, [ do \`make conf=CONF' to get output in ./out-CONF], [CONFIGURATION=$enableval]) + ##' + test -n "$CONFIGURATION" && CONFIGSUFFIX="-$CONFIGURATION" CONFIGFILE=config$CONFIGSUFFIX AC_SUBST(CONFIGSUFFIX) AC_CANONICAL_HOST - AC_CHECK_PROGS(MAKE, gmake make, error) - AC_CHECK_PROGS(FIND, find, error) + STEPMAKE_PROGS(MAKE, gmake make, REQUIRED) + STEPMAKE_PROGS(FIND, find, REQUIRED) -dnl system supplied INSTALL is unsafe; use our own install. -dnl AC_PROG_INSTALL -dnl if test "$INSTALL" = "bin/install-sh"; then -dnl export INSTALL="\$\(depth\)/bin/install-sh" -dnl fi - - AC_CHECK_PROGS(TAR, tar, error) + STEPMAKE_PROGS(TAR, tar, REQUIRED) if test "x`uname`" = "xHP-UX"; then AC_PATH_PROG(BASH, bash, /bin/sh) - AC_STEPMAKE_WARN(avoiding buggy /bin/sh) + STEPMAKE_WARN(avoiding buggy /bin/sh) AC_PATH_PROG(SHELL, bash, /bin/ksh) else AC_PATH_PROG(BASH, bash, /bin/sh) @@ -367,49 +560,22 @@ dnl fi AC_SUBST(SHELL) fi + STEPMAKE_PATH_PROG(PYTHON, python, REQUIRED) - AC_PATH_PROG(PYTHON, ${PYTHON:-python}, -echo no python) - AC_SUBST(PYTHON) - - if test $MAKE != "error" ; then - $MAKE -v 2> /dev/null | grep GNU > /dev/null - if test "$?" = 1 - then - AC_STEPMAKE_WARN(Please install *GNU* make) - fi + if expr "$MAKE" : '.*\(echo\)' >/dev/null; then + $MAKE -v 2> /dev/null | grep GNU > /dev/null + if test "$?" = 1; then + warn='make (Please install *GNU* make)' + STEPMAKE_WARN($warn) + STEPMAKE_ADD_ENTRY(REQUIRED, $warn) + fi fi - AC_CHECK_SEARCH_RESULT($PYTHON, python, You should install Python) - - if test "x$OSTYPE" = "xcygwin32" || test "x$OSTYPE" = "xWindows_NT"; then + if test "$OSTYPE" = "cygwin" -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 - # urg - # ROOTSEP=':' - # DIRSEP='\\' - # PATHSEP=';' - # - # cygwin fixes all these things. - # it seems these were used because of dos-style TEXINPUTS and - # MFINPUTS needed for miktex. - # but this breaks parsing of all other cygwin/unix style paths. - # - # if your (mik)tex breaks, make a: - # /usr/local/bin/tex: - # #!/bin/sh - # TEXINPUTS=`cygpath -pw $TEXINPUTS` /texmf/miktex/bin/tex $* - # - # and - # - # /usr/local/bin/mf: - # #!/bin/sh - # MFINPUTS=`cygpath -pw $MFINPUTS` /texmf/miktex/bin/mf $* - # - # this way, you may have buildscripts/out/lilypond-profile - # 'automatically' sourced from /usr/etc/profile.d/ too. - # ROOTSEP=':' DIRSEP='/' PATHSEP=':' @@ -434,10 +600,11 @@ dnl fi AC_SUBST(PATHSEP) AC_SUBST(DIRSEP) - AC_STEPMAKE_DATADIR + STEPMAKE_DATADIR ]) -AC_DEFUN(AC_STEPMAKE_KPATHSEA, [ + +AC_DEFUN(STEPMAKE_KPATHSEA, [ kpathsea_b=yes #FIXME --with-xxx is meant for specifying a PATH too, @@ -465,44 +632,15 @@ AC_DEFUN(AC_STEPMAKE_KPATHSEA, [ AC_DEFINE_UNQUOTED(KPATHSEA, $KPATHSEA) ]) -AC_DEFUN(AC_STEPMAKE_LEXYACC, [ - # ugh, automake: we want (and check for) bison - AC_PROG_YACC - # ugh, automake: we want (and check for) flex - # AC_PROG_LEX - # urg: automake 1.3: hope this doesn't break 1.2 ac_cv_pro_lex_root hack... - - # AC_DECL_YYTEXT - # ugh, ugh - ac_cv_prog_lex_root=lex.yy - - AC_CHECK_PROGS(BISON, bison, error) - AC_CHECK_PROGS(FLEX, flex, error) - AC_CHECK_SEARCH_RESULT($BISON, bison, Please install Bison, 1.25 or newer) - AC_CHECK_SEARCH_RESULT($FLEX, flex, Please install Flex, 2.5 or newer) - -## Urg. We should fix this configure test. -- so clumsy - if test $BISON != "error"; then - bison_version=`$BISON --version | head -1 | sed 's/^.* 1\.//g'` - if test $bison_version -lt 25; then - AC_STEPMAKE_WARN(The bison installed might be too old (1.$bison_version). You might have to install 1.25) - fi - fi - - AC_SUBST(BISON) - AC_SUBST(FLEX) -]) - -AC_DEFUN(AC_STEPMAKE_LIB, [ - AC_CHECK_PROGS(AR, ar, error) +AC_DEFUN(STEPMAKE_LIB, [ + STEPMAKE_PROGS(AR, ar, $1) AC_PROG_RANLIB - - AC_SUBST(AR) - AC_SUBST(RANLIB) + STEPMAKE_OPTIONAL_REQUIRED(RANLIB, ranlib, $1) ]) -AC_DEFUN(AC_STEPMAKE_LIBTOOL, [ + +AC_DEFUN(STEPMAKE_LIBTOOL, [ # libtool.info ... # **Never** try to set library version numbers so that they correspond # to the release number of your package. This is an abuse that only @@ -518,7 +656,8 @@ AC_DEFUN(AC_STEPMAKE_LIBTOOL, [ AC_SUBST(AGE) ]) -AC_DEFUN(AC_STEPMAKE_LOCALE, [ + +AC_DEFUN(STEPMAKE_LOCALE, [ lang=English ALL_LINGUAS="en nl" @@ -548,29 +687,15 @@ AC_DEFUN(AC_STEPMAKE_LOCALE, [ AC_MSG_RESULT($lang) if test "$lang" = "unknown" ; then - AC_STEPMAKE_WARN($language not supported; available are: $ALL_LINGUAS) + STEPMAKE_WARN($language not supported; available are: $ALL_LINGUAS) fi ]) -AC_DEFUN(AC_STEPMAKE_GETTEXT, [ - DIR_LOCALEDIR=${localedir} - presome=${prefix} - if test "$prefix" = "NONE"; then - presome=${ac_default_prefix} - fi - DIR_LOCALEDIR=`echo ${DIR_LOCALEDIR} | sed "s!\\\${prefix}!$presome!"` - AC_SUBST(localedir) - AC_SUBST(DIR_LOCALEDIR) - AC_DEFINE_UNQUOTED(DIR_LOCALEDIR, "${DIR_LOCALEDIR}") - - AC_CHECK_LIB(intl, gettext) - AC_CHECK_FUNCS(gettext) -]) -AC_DEFUN(AC_STEPMAKE_MAKEINFO, [ - AC_CHECK_PROGS(MAKEINFO, makeinfo, error) - if test "$MAKEINFO" != "error"; then +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; then + if test $? -ne 0; then + AC_PATH_PROG($1, $2) fi - - if test "x$TEXDIR" = xauto ; then - AC_TEX_SUBDIR(TEXDIR) +]) + + +# Check for program in set of names ($2), set result to ($1) . +# If missing, add entry to missing-list ($3, one of 'OPTIONAL', 'REQUIRED') +AC_DEFUN(STEPMAKE_PROGS, [ + AC_CHECK_PROGS($1, $2, no) + STEPMAKE_OPTIONAL_REQUIRED($1, $2, $3) +]) + + +AC_DEFUN(STEPMAKE_PERL, [ + STEPMAKE_PATH_PROG(PERL, perl, $1) +]) + + +AC_DEFUN(STEPMAKE_PYTHON_DEVEL, [ + AC_HAVE_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) + if test $? -ne 0; then + STEPMAKE_ADD_ENTRY($1, 'python.h (python-devel, python-dev or libpython-dev package)') fi - AC_SUBST(TEXPREFIX) - AC_SUBST(TEXDIR) - AC_SUBST(MFDIR) ]) -AC_DEFUN(AC_STEPMAKE_TEXMF_DIRS, [ + +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] ) - AC_CHECK_PROGS(KPSEWHICH, kpsewhich, no) + # ugh + STEPMAKE_PROGS(KPSEWHICH, kpsewhich, OPTIONAL) AC_MSG_CHECKING(for tfm path) TFM_FONTS="cmr msam" @@ -673,7 +788,7 @@ AC_DEFUN(AC_STEPMAKE_TEXMF_DIRS, [ TFM_PATH="$TFM_PATH `dirname $dir`" done else - AC_STEPMAKE_WARN(Please specify where cmr10.tfm lives: + STEPMAKE_WARN(Please specify where cmr10.tfm lives: ./configure --enable-tfm-path=/usr/local/TeX/lib/tex/fonts) fi else @@ -685,20 +800,12 @@ AC_DEFUN(AC_STEPMAKE_TEXMF_DIRS, [ AC_SUBST(TFM_PATH) ]) -AC_DEFUN(AC_STEPMAKE_TEXMF, [ - # urg, never know what names these teTeX guys will think up - AC_CHECK_PROGS(METAFONT, mf, no) - if test "x$METAFONT" = "xno"; then - AC_CHECK_PROGS(MFONT, mfont, -echo no mf or mfont) - METAFONT=$MFONT - fi +AC_DEFUN(STEPMAKE_TEXMF, [ + # urg, never know what names these teTeX guys will think up - AC_CHECK_PROGS(INIMETAFONT, inimf, no) - if test "x$INIMETAFONT" = "xno"; then - AC_CHECK_PROGS(INIMFONT, inimfont, -echo no inimf or inimfont) - INIMETAFONT=$INIMFONT - fi + STEPMAKE_PROGS(METAFONT, mf mfont, $1) + STEPMAKE_PROGS(INIMETAFONT, inimf inimfont, $1) AC_MSG_CHECKING(for working metafont mode) modelist='ljfour lj4 lj3 lj2 ljet laserjet' @@ -712,505 +819,13 @@ AC_DEFUN(AC_STEPMAKE_TEXMF, [ rm -f mfput.* - AC_SUBST(METAFONT) AC_SUBST(MFMODE) - AC_SUBST(INIMETAFONT) ]) -AC_DEFUN(AC_STEPMAKE_WARN, [ + +AC_DEFUN(STEPMAKE_WARN, [ AC_MSG_WARN($1) warn_b=yes ]) -AC_DEFUN(AC_STEPMAKE_YODL, [ - if test "x$YODL" = "x"; then - AC_CHECK_PROGS(STRIPROFF, striproff, -echo no striproff) - AC_CHECK_PROGS(YODL, yodl, -echo no yodl) - AC_CHECK_PROGS(YODL2HTML, yodl2html, -echo no yodl) - AC_CHECK_PROGS(YODL2LATEX, yodl2latex, ) - AC_CHECK_PROGS(YODL2MAN, yodl2man, -echo no yodl) - AC_CHECK_PROGS(YODL2MSLESS, yodl2msless, -echo no yodl) - AC_CHECK_PROGS(YODL2TEXINFO, yodl2texinfo, -echo no yodl) - AC_CHECK_PROGS(YODL2TXT, yodl2txt, -echo no yodl) - YODL2LESS_DIR='$(bindir)/' - else - AC_SUBST(STRIPROFF) - AC_SUBST(YODL) - AC_SUBST(YODL2HTML) - AC_SUBST(YODL2LATEX) - AC_SUBST(YODL2LESS_DIR) - AC_SUBST(YODL2MAN) - AC_SUBST(YODL2MSLESS) - AC_SUBST(YODL2TEXINFO) - AC_SUBST(YODL2TXT) - export STRIPROFF YODL YODL2HTML YODL2LATEX YODL2MAN YODL2MSLESS YODL2TEXINFO YODL2TXT - fi - if test "x$YODL" = "-echo no yodl"; then - AC_STEPMAKE_WARN(Did not find YODL (Yodl is Yet Oneother Document Language, see http://www.cs.uu.nl/~hanwen/yodl)) - fi -]) - -dnl should cache result. -dnl should look in $prefix first. -dnl should probably assume TDS - -AC_DEFUN(AC_TEX_PREFIX, [ - - - AC_MSG_CHECKING(TeX/MF root dir directory) - - find_root_prefix="$prefix" - - - test "x$find_root_prefix" = xNONE && find_root_prefix="$ac_default_prefix" - find_texpostfix=""; - for postfix in "/lib/tex/" "/lib/texmf" "/lib" "/tex" "/texmf"; do - find_texprefix="$find_root_prefix$postfix" - if test -d $find_texprefix; then - find_texpostfix=$postfix - break; - fi - done - - if test "x$find_texpostfix" = x; then - find_texpostfix='/lib/texmf/tex' - AC_STEPMAKE_WARN(Cannot determine the TeX-directory. Please use --enable-tex-prefix) - fi - - find_texprefix="$find_root_prefix/$find_texpostfix" - - # only assign if variablename not empty - if test x != "x[$]$1"; then - $1='${prefix}'/"$find_texpostfix" - fi - AC_MSG_RESULT($find_texprefix) - -]) - - -# find a directory inside a prefix, -# $1 the prefix (expanded version) -# $2 variable to assign -# $3 the directory name -# $4 description -AC_DEFUN(AC_FIND_DIR_IN_PREFIX, [ - - AC_MSG_CHECKING($4 directory) - find_dirdir=`(cd $1; - $FIND ./ -type d -a -name $3 -print |sort|head -1|sed 's#^\./##')` - - - if test "x$find_dirdir" = x; then - find_dirdir="/$3"; - AC_STEPMAKE_WARN(Cannot determine $4 subdirectory. Please set from command-line) - true - fi - $2=$find_dirdir - AC_MSG_RESULT($1/$find_dirdir) -]) -# ugh. this is hopeless -AC_DEFUN(AC_KPSE_TEX_DIR, [ - kpse_paths=`(kpsepath -n latex tex; kpsepath -n tex tex) | sed 's/:/ /g' | tr ' ' '\012' |sort | uniq -d` - kpse_syspaths=`echo $kpse_paths | grep '!'| sed 's/!//g'` - echo $kpse_paths - if test -w "$kpse_syspaths"; - then - dir=`echo $kpse_syspaths | head -1` - else - dir=`echo $kpse_paths | grep -v '!'| head -1` - fi - if test "$prefix" = "NONE"; then - local_prefix=$ac_default_prefix - local_prefix_quote='${prefix}' - - else - local_prefix=$prefix - local_prefix_quote=$prefix - fi - echo $local_prefix_quote = $local_prefix - echo $dir - echo $dir | sed 's!'$local_prefix'!\$local_prefix_quote!g' -]) - -AC_DEFUN(AC_TEX_SUBDIR, [ -dnl AC_REQUIRE([AC_TEX_PREFIX]) - AC_FIND_DIR_IN_PREFIX($find_texprefix, $1, tex,TeX input) - $1="$TEXPREFIX/$$1" -]) - -AC_DEFUN(AC_MF_SUBDIR, [ -dnl AC_REQUIRE([AC_TEX_PREFIX]) - AC_FIND_DIR_IN_PREFIX($find_texprefix, $1, source, MF input) - $1="$TEXPREFIX/$$1" -]) - -AC_DEFUN(AC_CHECK_SEARCH_RESULT, [ - result="`echo \"$1\" | grep echo`" - if test "x$1" = "xerror" -o "x$result" != "x"; then - AC_STEPMAKE_WARN(can\'t find $2. $3) - fi -]) - -dnl GUILE_FLAGS --- set flags for compiling and linking with Guile -dnl -dnl This macro runs the `guile-config' script, installed with Guile, -dnl to find out where Guile's header files and libraries are -dnl installed. It sets two variables, marked for substitution, as -dnl by AC_SUBST. -dnl -dnl GUILE_CFLAGS --- flags to pass to a C or C++ compiler to build -dnl code that uses Guile header files. This is almost -dnl always just a -I flag. -dnl -dnl GUILE_LDFLAGS --- flags to pass to the linker to link a -dnl program against Guile. This includes `-lguile' for -dnl the Guile library itself, any libraries that Guile -dnl itself requires (like -lqthreads), and so on. It may -dnl also include a -L flag to tell the compiler where to -dnl find the libraries. - -AC_DEFUN([GUILE_FLAGS],[ -## The GUILE_FLAGS macro. - AC_MSG_CHECKING(for Guile) - if ! $guile_config link > /dev/null ; then - AC_MSG_RESULT("cannot execute $guile_config") - AC_MSG_ERROR("cannot find guile-config; is Guile installed?") - exit 1 - fi - GUILE_CFLAGS="`$guile_config compile`" - GUILE_LDFLAGS="`$guile_config link`" - AC_SUBST(GUILE_CFLAGS) - AC_SUBST(GUILE_LDFLAGS) - AC_MSG_RESULT(yes) -]) - - -# Configure paths for GTK+ -# Owen Taylor 97-11-3 - -dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) -dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS -dnl -AC_DEFUN(AM_PATH_GTK, -[dnl -dnl Get the cflags and libraries from the gtk-config script -dnl - AC_PATH_PROG(GTK_CONFIG, gtk-config, no) - min_gtk_version=ifelse([$1], ,1.1.1,$1) - AC_MSG_CHECKING(for GTK - version >= $min_gtk_version) - no_gtk="" - if test "$GTK_CONFIG" != "no" ; then - GTK_CFLAGS=`$GTK_CONFIG --cflags` - GTK_LIBS=`$GTK_CONFIG --libs` - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - ac_save_CXXFLAGS="$CXXFLAGS" - CFLAGS="$CFLAGS $GTK_CFLAGS" - CXXFLAGS="$CXXFLAGS $GTK_CFLAGS" - LIBS="$LIBS $GTK_LIBS" -dnl -dnl Now check if the installed GTK is sufficiently new. (Also sanity -dnl checks the results of gtk-config to some extent) -dnl - AC_TRY_RUN([ -#include -#include - -int -main () -{ - int major, minor, micro; - - if (sscanf("$min_gtk_version", "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_gtk_version"); - exit(1); - } - - return !((gtk_major_version > major) || - ((gtk_major_version == major) && (gtk_minor_version > minor)) || - ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))); -} -],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - CXXFLAGS="$ac_save_CXXFLAGS" - LIBS="$ac_save_LIBS" - else - no_gtk=yes - fi - if test "x$no_gtk" = x ; then - AC_MSG_RESULT(yes) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) - GTK_CFLAGS="" - GTK_LIBS="" - ifelse([$3], , :, [$3]) - fi - CXXFLAGS="$CXXFLAGS $GTK_CFLAGS" - AC_SUBST(CXXFLAGS) - AC_SUBST(GTK_CFLAGS) - AC_SUBST(GTK_LIBS) -]) - - -# Configure paths for GTK-- -# Erik Andersen 30 May 1998 -# Modified by Tero Pulkkinen (added the compiler checks... I hope they work..) - -dnl Test for GTK__, and define GTK___CFLAGS and GTK___LIBS -dnl to be used as follows: -dnl AM_PATH_GTKMM([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) -dnl - -dnl Get the cflags and libraries from the gtkmm-config script -dnl -AC_ARG_WITH(gtkmm-prefix,[ --with-gtkmm-prefix=PREFIX - Prefix where GTK-- is installed (optional)], - gtkmm_config_prefix="$withval", gtkmm_config_prefix="") -AC_ARG_WITH(gtkmm-exec-prefix,[ --with-gtkmm-exec-prefix=PREFIX - Exec prefix where GTK-- is installed (optional)], - gtkmm_config_exec_prefix="$withval", gtkmm_config_exec_prefix="") -AC_ARG_ENABLE(gtkmmtest, [ --disable-gtkmmtest Do not try to compile and run a test GTK-- program], - , enable_gtkmmtest=yes) - - if test x$gtkmm_config_exec_prefix != x ; then - gtkmm_config_args="$gtkmm_config_args --exec-prefix=$gtkmm_config_exec_prefix" - if test x${GTKMM_CONFIG+set} != xset ; then - GTKMM_CONFIG=$gtkmm_config_exec_prefix/bin/gtkmm-config - fi - fi - if test x$gtkmm_config_prefix != x ; then - gtkmm_config_args="$gtkmm_config_args --prefix=$gtkmm_config_prefix" - if test x${GTKMM_CONFIG+set} != xset ; then - GTKMM_CONFIG=$gtkmm_config_prefix/bin/gtkmm-config - fi - fi - - -AC_DEFUN(AM_PATH_GTKMM, -[dnl - -dnl -dnl Check if the installed GTK-- is sufficiently new. -dnl - AC_PATH_PROG(GTKMM_CONFIG, gtkmm-config, no) - min_gtkmm_version=ifelse([$1], ,0.9.14,$1) - - AC_MSG_CHECKING(for GTK-- - version >= $min_gtkmm_version) - no_gtkmm="" - if test "$GTKMM_CONFIG" = "no" ; then - no_gtkmm=yes - else - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - - GTK___CFLAGS=`$GTKMM_CONFIG $gtkmm_config_args --cflags` - GTK___LIBS=`$GTKMM_CONFIG $gtkmm_config_args --libs` - gtkmm_config_major_version=`$GTKMM_CONFIG $gtkmm_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - gtkmm_config_minor_version=`$GTKMM_CONFIG $gtkmm_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - gtkmm_config_micro_version=`$GTKMM_CONFIG $gtkmm_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if test "x$enable_gtkmmtest" = "xyes" ; then - ac_save_CXXFLAGS="$CXXFLAGS" - ac_save_LIBS="$LIBS" - CXXFLAGS="$CXXFLAGS $GTK___CFLAGS" - LIBS="$LIBS $GTK___LIBS" -dnl -dnl Now check if the installed GTK-- is sufficiently new. (Also sanity -dnl checks the results of gtkmm-config to some extent -dnl - rm -f conf.gtkmmtest - AC_TRY_RUN([ -#include -#include -#include - -int -main () -{ - int major, minor, micro; - char *tmp_version; - - system ("touch conf.gtkmmtest"); - - /* HP/UX 0 (%@#!) writes to sscanf strings */ - tmp_version = g_strdup("$min_gtkmm_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_gtkmm_version"); - exit(1); - } - - if ((gtkmm_major_version != $gtkmm_config_major_version) || - (gtkmm_minor_version != $gtkmm_config_minor_version) || - (gtkmm_micro_version != $gtkmm_config_micro_version)) - { - printf("\n*** 'gtkmm-config --version' returned %d.%d.%d, but GTK-- (%d.%d.%d)\n", - $gtkmm_config_major_version, $gtkmm_config_minor_version, $gtkmm_config_micro_version, - gtkmm_major_version, gtkmm_minor_version, gtkmm_micro_version); - printf ("*** was found! If gtkmm-config was correct, then it is best\n"); - printf ("*** to remove the old version of GTK--. You may also be able to fix the error\n"); - printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); - printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); - printf("*** required on your system.\n"); - printf("*** If gtkmm-config was wrong, set the environment variable GTKMM_CONFIG\n"); - printf("*** to point to the correct copy of gtkmm-config, and remove the file config.cache\n"); - printf("*** before re-running configure\n"); - } -/* GTK-- does not have the GTKMM_*_VERSION constants */ -/* - else if ((gtkmm_major_version != GTKMM_MAJOR_VERSION) || - (gtkmm_minor_version != GTKMM_MINOR_VERSION) || - (gtkmm_micro_version != GTKMM_MICRO_VERSION)) - { - printf("*** GTK-- header files (version %d.%d.%d) do not match\n", - GTKMM_MAJOR_VERSION, GTKMM_MINOR_VERSION, GTKMM_MICRO_VERSION); - printf("*** library (version %d.%d.%d)\n", - gtkmm_major_version, gtkmm_minor_version, gtkmm_micro_version); - } -*/ - else - { - if ((gtkmm_major_version > major) || - ((gtkmm_major_version == major) && (gtkmm_minor_version > minor)) || - ((gtkmm_major_version == major) && (gtkmm_minor_version == minor) && (gtkmm_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** An old version of GTK-- (%d.%d.%d) was found.\n", - gtkmm_major_version, gtkmm_minor_version, gtkmm_micro_version); - printf("*** You need a version of GTK-- newer than %d.%d.%d. The latest version of\n", - major, minor, micro); - printf("*** GTK-- is always available from ftp://ftp.gtk.org.\n"); - printf("***\n"); - printf("*** If you have already installed a sufficiently new version, this error\n"); - printf("*** probably means that the wrong copy of the gtkmm-config shell script is\n"); - printf("*** being found. The easiest way to fix this is to remove the old version\n"); - printf("*** of GTK--, but you can also set the GTKMM_CONFIG environment to point to the\n"); - printf("*** correct copy of gtkmm-config. (In this case, you will have to\n"); - printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); - printf("*** so that the correct libraries are found at run-time))\n"); - } - } - return 1; -} -],, no_gtkmm=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CXXFLAGS="$ac_save_CXXFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_gtkmm" = x ; then - AC_MSG_RESULT(yes) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) - if test "$GTKMM_CONFIG" = "no" ; then - echo "*** The gtkmm-config script installed by GTK-- could not be found" - echo "*** If GTK-- was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the GTK_CONFIG environment variable to the" - echo "*** full path to gtk-config." - echo "*** The gtkmm-config script was not available in GTK-- versions" - echo "*** prior to 0.9.12. Perhaps you need to update your installed" - echo "*** version to 0.9.12 or newer" - else - if test -f conf.gtkmmtest ; then - : - else - echo "*** Could not run GTK-- test program, checking why..." - CXXFLAGS="$CFLAGS $GTKMM_CXXFLAGS" - LIBS="$LIBS $GTK___LIBS" - AC_TRY_LINK([ -#include -#include -], [ return ((gtkmm_major_version) || (gtkmm_minor_version) || (gtkmm_micro_version)); ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding GTK-- or finding the wrong" - echo "*** version of GTK--. If it is not finding GTK--, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means GTK-- was incorrectly installed" - echo "*** or that you have moved GTK-- since it was installed. In the latter case, you" - echo "*** may want to edit the gtkmm-config script: $GTKMM_CONFIG" ]) - CXXFLAGS="$ac_save_CXXFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - GTK___CFLAGS="" - GTK__LIBS="" - ifelse([$3], , :, [$3]) - AC_LANG_RESTORE - fi - AC_SUBST(GTK___CFLAGS) - AC_SUBST(GTK___LIBS) - rm -f conf.gtkmmtest -]) - -# Configure paths for GTK--DRAW -# Derek Quinn Wyatt 98-08-21 (adapted from Jan Nieuwenhuizen's code) - -dnl AM_PATH_GTK__DRAW([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) -dnl Test for GTK--DRAW, and define GTK___CFLAGS and GTK___LIBS -dnl -AC_DEFUN(AM_PATH_GTK__DRAW, -[dnl -dnl Get the cflags and libraries from the gtk__-config script -dnl - AC_PATH_PROG(GTKMM_CONFIG, gtkmm-config, no) - min_gtk___version=ifelse([$1], ,0.0.5,$1) - AC_MSG_CHECKING(for GTK--DRAW - version >= $min_gtk___version) - no_gtk__="" - if test "$GTKMM_CONFIG" != "no" ; then - GTK___CFLAGS=`$GTKMM_CONFIG --cflags` - GTK___LIBS=`$GTKMM_CONFIG --libs` - GTK___DLIBS="$GTK___LIBS -lgtkmmdraw" - GTK___LIBS="$GTK___DLIBS" - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - ac_save_CXXFLAGS="$CXXFLAGS" - CFLAGS="$CFLAGS $GTK___CFLAGS" - CXXFLAGS="$CXXFLAGS $GTK___CFLAGS" - LIBS="$LIBS $GTK___LIBS" -dnl -dnl Now check if the installed GTK__ is sufficiently new. (Also sanity -dnl checks the results of gtk__-config to some extent) -dnl - AC_TRY_RUN([ -#include -#include - -int -main () -{ - // urg - return 0; -} -],, no_gtk__=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - CXXFLAGS="$ac_save_CXXFLAGS" - LIBS="$ac_save_LIBS" - else - no_gtk__=yes - fi - if test "x$no_gtk__" = x ; then - AC_MSG_RESULT(yes) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) - GTK___CFLAGS="" - GTK___LIBS="" - ifelse([$3], , :, [$3]) - fi - CXXFLAGS="$CXXFLAGS $GTK___CFLAGS" - AC_SUBST(CXXFLAGS) - AC_SUBST(GTK___CFLAGS) - AC_SUBST(GTK___LIBS) -]) diff --git a/config.make.in b/config.make.in index 43a87ceab8..391d6782ff 100644 --- a/config.make.in +++ b/config.make.in @@ -1,51 +1,51 @@ # -*-Makefile-*- +MISSING_OPTIONAL = @OPTIONAL@ +MISSING_REQUIRED = @REQUIRED@ + # @configure_input@ package-depth = @package_depth@ -USER_CFLAGS = @CFLAGS@ +USER_CFLAGS = @CFLAGS@ @CPPFLAGS@ @GUILE_CFLAGS@ USER_CXXFLAGS = @CXXFLAGS@ @CPPFLAGS@ @GUILE_CFLAGS@ USER_LDFLAGS = @LDFLAGS@ @GUILE_LDFLAGS@ +EXTRA_LIBES = @EXTRA_LIBES@ @LIBS@ -CC = @CC@ -CROSS = @cross_compiling@ -CXX = @CXX@ - -LD = @LD@ PACKAGE = @PACKAGE@ package = @package@ PACKAGE_NAME = @PACKAGE_NAME@ -stepmake = @stepmake@ -CONFIGSUFFIX = @CONFIGSUFFIX@ -MAKEINFO = @MAKEINFO@ -SPLITTING_MAKEINFO = @SPLITTING_MAKEINFO@ -ICFLAGS = @ICFLAGS@ -ILDFLAGS = @ILDFLAGS@ -builddir = @builddir@ -libdir = @libdir@ + prefix = @prefix@ -srcdir = @srcdir@ -TEXPREFIX = @TEXPREFIX@ -TEXDIR = @TEXDIR@ -KPATHSEA = @KPATHSEA@ -MFDIR = @MFDIR@ -mandir = @mandir@ -infodir = @infodir@ exec_prefix = @exec_prefix@ + +builddir = @builddir@ bindir = @bindir@ -includedir = @includedir@ datadir = @datadir@ +includedir = @includedir@ +infodir = @infodir@ +libdir = @libdir@ localedir = @localedir@ -sharedstatedir = @sharedstatedir@ +mandir = @mandir@ program_prefix = @program_prefix@ program_suffix = @program_suffix@ -EXTRA_LIBES = @EXTRA_LIBES@ @LIBS@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +stepmake = @stepmake@ + +CC = @CC@ +CROSS = @cross_compiling@ +CXX = @CXX@ +LD = @LD@ +CONFIGSUFFIX = @CONFIGSUFFIX@ +MAKEINFO = @MAKEINFO@ +SPLITTING_MAKEINFO = @SPLITTING_MAKEINFO@ +ICFLAGS = @ICFLAGS@ +ILDFLAGS = @ILDFLAGS@ TFM_PATH = @TFM_PATH@ RANLIB = @RANLIB@ DEFS = @DEFS@ DEFINES = @DEFS@ @DEFINES@ -COMPILEINFO = @COMPILEINFO@ DOTEXE = @DOTEXE@ INSTALL = @INSTALL@ BASH = @BASH@ @@ -55,24 +55,22 @@ BISON = @BISON@ FIND = @FIND@ FLEX = @FLEX@ GUILE = @GUILE@ +GUILE_CONFIG = @GUILE_CONFIG@ +GUILE_CONFIG = @GUILE_CONFIG@ +GUILE_CFLAGS = @GUILE_CFLAGS@ +GUILE_LDFLAGS = @GUILE_LDFLAGS@ INIMETAFONT = @INIMETAFONT@ -INIMETAPOST = @INIMETAPOST@ -INIMETAPOST_FLAGS = @INIMETAPOST_FLAGS@ LN = @LN@ LN_S = @LN_S@ METAFONT = @METAFONT@ MFMODE = @MFMODE@ -METAPOST = @METAPOST@ -MFPLAIN_MP = @MFPLAIN_MP@ MSGFMT = @MSGFMT@ ROOTSEP = @ROOTSEP@ PATHSEP = @PATHSEP@ PERL = @PERL@ PYTHON = @PYTHON@ SHELL = @SHELL@ -STRIPROFF = @STRIPROFF@ TAR= @TAR@ TBL = @TBL@ TROFF = @TROFF@ ZIP = @ZIP@ - diff --git a/configure b/configure index e809c0a72a..4f29504dff 100755 --- a/configure +++ b/configure @@ -1,58 +1,5 @@ #! /bin/sh -ac_help="$ac_help - --with-gtkmm-prefix=PREFIX - Prefix where GTK-- is installed (optional)" -# Check whether --with-gtkmm-prefix or --without-gtkmm-prefix was given. -if test "${with_gtkmm_prefix+set}" = set; then - withval="$with_gtkmm_prefix" - gtkmm_config_prefix="$withval" -else - gtkmm_config_prefix="" -fi - -ac_help="$ac_help - --with-gtkmm-exec-prefix=PREFIX - Exec prefix where GTK-- is installed (optional)" -# Check whether --with-gtkmm-exec-prefix or --without-gtkmm-exec-prefix was given. -if test "${with_gtkmm_exec_prefix+set}" = set; then - withval="$with_gtkmm_exec_prefix" - gtkmm_config_exec_prefix="$withval" -else - gtkmm_config_exec_prefix="" -fi - -ac_help="$ac_help - --disable-gtkmmtest Do not try to compile and run a test GTK-- program" -# Check whether --enable-gtkmmtest or --disable-gtkmmtest was given. -if test "${enable_gtkmmtest+set}" = set; then - enableval="$enable_gtkmmtest" - : -else - enable_gtkmmtest=yes -fi - - - if test x$gtkmm_config_exec_prefix != x ; then - gtkmm_config_args="$gtkmm_config_args --exec-prefix=$gtkmm_config_exec_prefix" - if test x${GTKMM_CONFIG+set} != xset ; then - GTKMM_CONFIG=$gtkmm_config_exec_prefix/bin/gtkmm-config - fi - fi - if test x$gtkmm_config_prefix != x ; then - gtkmm_config_args="$gtkmm_config_args --prefix=$gtkmm_config_prefix" - if test x${GTKMM_CONFIG+set} != xset ; then - GTKMM_CONFIG=$gtkmm_config_prefix/bin/gtkmm-config - fi - fi - - - - -# Configure paths for GTK--DRAW -# Derek Quinn Wyatt 98-08-21 (adapted from Jan Nieuwenhuizen's code) - - # Guess values for system-dependent variables and create Makefiles. # Generated automatically using autoconf version 2.13 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. @@ -628,12 +575,12 @@ fi fi echo $ac_n "checking Package""... $ac_c" 1>&6 -echo "configure:632: checking Package" >&5 +echo "configure:579: checking Package" >&5 if test "x$PACKAGE" = "xSTEPMAKE"; then echo "$ac_t""Stepmake package!" 1>&6 echo $ac_n "checking builddir""... $ac_c" 1>&6 -echo "configure:637: checking builddir" >&5 +echo "configure:584: checking builddir" >&5 if test "$srcdir" = "."; then builddir=. else @@ -670,7 +617,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. echo "$ac_t""$PACKAGE" 1>&6 echo $ac_n "checking builddir""... $ac_c" 1>&6 -echo "configure:674: checking builddir" >&5 +echo "configure:621: checking builddir" >&5 if test "$srcdir" = "."; then builddir=. srcdir_build=no @@ -690,7 +637,7 @@ echo "configure:674: checking builddir" >&5 fi echo $ac_n "checking for stepmake""... $ac_c" 1>&6 -echo "configure:694: checking for stepmake" >&5 +echo "configure:641: checking for stepmake" >&5 # Check for installed stepmake if test -d $stepmake; then echo "$ac_t""$stepmake" 1>&6 @@ -801,6 +748,8 @@ if test "${enable_config+set}" = set; then fi + ##' + test -n "$CONFIGURATION" && CONFIGSUFFIX="-$CONFIGURATION" CONFIGFILE=config$CONFIGSUFFIX @@ -812,7 +761,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:816: checking host system type" >&5 +echo "configure:765: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -832,12 +781,13 @@ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$host" 1>&6 + for ac_prog in gmake make do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:841: checking for $ac_word" >&5 +echo "configure:791: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MAKE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -865,14 +815,43 @@ fi test -n "$MAKE" && break done -test -n "$MAKE" || MAKE="error" +test -n "$MAKE" || MAKE="no" + + + #if test "`eval echo '$'"MAKE"`" = "no"; then + + r="`eval echo '$'"MAKE"`" + if test -n "$r" -a "$r" != "error" -a "$r" != "no" && ! expr '`eval echo '$'"MAKE"`' : '.*\(echo\)' > /dev/null; then + ##STEPMAKE_WARN(cannot find . ) + false + else + true + fi + + if test $? -ne 0; then + + eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \"gmake make\"`\" + + if test "REQUIRED" = "REQUIRED"; then + command="echo ERROR: gmake make not found" + # abort configure process here? + else + command="- echo gmake make not found" + fi + eval "MAKE"='$command' + false + else + true + fi + + for ac_prog in find do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:876: checking for $ac_word" >&5 +echo "configure:855: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_FIND'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -900,16 +879,44 @@ fi test -n "$FIND" && break done -test -n "$FIND" || FIND="error" +test -n "$FIND" || FIND="no" + + + #if test "`eval echo '$'"FIND"`" = "no"; then + + r="`eval echo '$'"FIND"`" + if test -n "$r" -a "$r" != "error" -a "$r" != "no" && ! expr '`eval echo '$'"FIND"`' : '.*\(echo\)' > /dev/null; then + ##STEPMAKE_WARN(cannot find . ) + false + else + true + fi + + if test $? -ne 0; then + + eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \"find\"`\" + + if test "REQUIRED" = "REQUIRED"; then + command="echo ERROR: find not found" + # abort configure process here? + else + command="- echo find not found" + fi + eval "FIND"='$command' + false + else + true + fi + for ac_prog in tar do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:913: checking for $ac_word" >&5 +echo "configure:920: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_TAR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -937,14 +944,42 @@ fi test -n "$TAR" && break done -test -n "$TAR" || TAR="error" +test -n "$TAR" || TAR="no" + + + #if test "`eval echo '$'"TAR"`" = "no"; then + + r="`eval echo '$'"TAR"`" + if test -n "$r" -a "$r" != "error" -a "$r" != "no" && ! expr '`eval echo '$'"TAR"`' : '.*\(echo\)' > /dev/null; then + ##STEPMAKE_WARN(cannot find . ) + false + else + true + fi + + if test $? -ne 0; then + + eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \"tar\"`\" + + if test "REQUIRED" = "REQUIRED"; then + command="echo ERROR: tar not found" + # abort configure process here? + else + command="- echo tar not found" + fi + eval "TAR"='$command' + false + else + true + fi + if test "x`uname`" = "xHP-UX"; then # Extract the first word of "bash", so it can be a program name with args. set dummy bash; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:948: checking for $ac_word" >&5 +echo "configure:983: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_BASH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -984,7 +1019,7 @@ fi # Extract the first word of "bash", so it can be a program name with args. set dummy bash; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:988: checking for $ac_word" >&5 +echo "configure:1023: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_SHELL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1021,7 +1056,7 @@ fi # Extract the first word of "bash", so it can be a program name with args. set dummy bash; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1025: checking for $ac_word" >&5 +echo "configure:1060: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_BASH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1058,11 +1093,75 @@ fi fi + + for ac_prog in python +do +# Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1103: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_PYTHON'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$PYTHON"; then + ac_cv_prog_PYTHON="$PYTHON" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_PYTHON="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +PYTHON="$ac_cv_prog_PYTHON" +if test -n "$PYTHON"; then + echo "$ac_t""$PYTHON" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$PYTHON" && break +done +test -n "$PYTHON" || PYTHON="no" + + + #if test "`eval echo '$'"PYTHON"`" = "no"; then + + r="`eval echo '$'"PYTHON"`" + if test -n "$r" -a "$r" != "error" -a "$r" != "no" && ! expr '`eval echo '$'"PYTHON"`' : '.*\(echo\)' > /dev/null; then + ##STEPMAKE_WARN(cannot find . ) + false + else + true + fi + + if test $? -ne 0; then + + eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \"python\"`\" + + if test "REQUIRED" = "REQUIRED"; then + command="echo ERROR: python not found" + # abort configure process here? + else + command="- echo python not found" + fi + eval "PYTHON"='$command' + false + else + true + fi - # Extract the first word of "${PYTHON:-python}", so it can be a program name with args. -set dummy ${PYTHON:-python}; ac_word=$2 +# if ! expr '`eval echo '$'"PYTHON"`' : '.*\(echo\)' > /dev/null; then + if test $? -ne 0; then + # Extract the first word of "python", so it can be a program name with args. +set dummy python; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1066: checking for $ac_word" >&5 +echo "configure:1165: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1084,7 +1183,6 @@ else fi done IFS="$ac_save_ifs" - test -z "$ac_cv_path_PYTHON" && ac_cv_path_PYTHON="-echo no python" ;; esac fi @@ -1095,58 +1193,28 @@ else echo "$ac_t""no" 1>&6 fi - + fi - if test $MAKE != "error" ; then - $MAKE -v 2> /dev/null | grep GNU > /dev/null - if test "$?" = 1 - then - - echo "configure: warning: Please install *GNU* make" 1>&2 - warn_b=yes - - fi - fi - - result="`echo \"$PYTHON\" | grep echo`" - if test "x$PYTHON" = "xerror" -o "x$result" != "x"; then - - echo "configure: warning: can\'t find python. You should install Python" 1>&2 + if expr "$MAKE" : '.*\(echo\)' >/dev/null; then + $MAKE -v 2> /dev/null | grep GNU > /dev/null + if test "$?" = 1; then + warn='make (Please install *GNU* make)' + + echo "configure: warning: $warn" 1>&2 warn_b=yes - fi + + eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \"$warn\"`\" + fi + fi - if test "x$OSTYPE" = "xcygwin32" || test "x$OSTYPE" = "xWindows_NT"; then + if test "$OSTYPE" = "cygwin" -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 - # urg - # ROOTSEP=':' - # DIRSEP='\\' - # PATHSEP=';' - # - # cygwin fixes all these things. - # it seems these were used because of dos-style TEXINPUTS and - # MFINPUTS needed for miktex. - # but this breaks parsing of all other cygwin/unix style paths. - # - # if your (mik)tex breaks, make a: - # /usr/local/bin/tex: - # #!/bin/sh - # TEXINPUTS=`cygpath -pw $TEXINPUTS` /texmf/miktex/bin/tex - # - # and - # - # /usr/local/bin/mf: - # #!/bin/sh - # MFINPUTS=`cygpath -pw $MFINPUTS` /texmf/miktex/bin/mf - # - # this way, you may have buildscripts/out/lilypond-profile - # 'automatically' sourced from /usr/etc/profile.d/ too. - # ROOTSEP=':' DIRSEP='/' PATHSEP=':' @@ -1206,9 +1274,9 @@ subdirs="stepmake" # Uncomment the configuration options your package needs. # -O is necessary to get inlining - CFLAGS=${CFLAGS:-""} - CXXFLAGS=${CXXFLAGS:-$CFLAGS} - LDFLAGS=${LDFLAGS:-""} + CFLAGS=${CFLAGS-""} + CXXFLAGS=${CXXFLAGS-$CFLAGS} + LDFLAGS=${LDFLAGS-""} checking_b=yes optimise_b=yes profile_b=no @@ -1270,7 +1338,7 @@ EOF # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1274: checking for $ac_word" >&5 +echo "configure:1342: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1300,7 +1368,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1304: checking for $ac_word" >&5 +echo "configure:1372: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1351,7 +1419,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1355: checking for $ac_word" >&5 +echo "configure:1423: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1383,7 +1451,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1387: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1455: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1394,12 +1462,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1398 "configure" +#line 1466 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1425,12 +1493,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1429: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1497: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1434: checking whether we are using GNU C" >&5 +echo "configure:1502: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1439,7 +1507,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1443: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1511: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1458,7 +1526,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1462: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1530: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1489,14 +1557,41 @@ else fi fi + + #if test "`eval echo '$'"CC"`" = "no"; then + + r="`eval echo '$'"CC"`" + if test -n "$r" -a "$r" != "error" -a "$r" != "no" && ! expr '`eval echo '$'"CC"`' : '.*\(echo\)' > /dev/null; then + ##STEPMAKE_WARN(cannot find . ) + false + else + true + fi + + if test $? -ne 0; then + + eval ""=\"`eval echo \"'$'\" \"cc\"`\" + + if test "" = "REQUIRED"; then + command="echo ERROR: cc not found" + # abort configure process here? + else + command="- echo cc not found" + fi + eval "CC"='$command' + false + else + true + fi + LD='$(CC)' CFLAGS="$CFLAGS $OPTIMIZE" - CPPFLAGS=${CPPFLAGS:-""} + CPPFLAGS=${CPPFLAGS-""} echo $ac_n "checking for IEEE-conformance compiler flags""... $ac_c" 1>&6 -echo "configure:1500: checking for IEEE-conformance compiler flags" >&5 +echo "configure:1595: checking for IEEE-conformance compiler flags" >&5 save_cflags="$CFLAGS" case "$host" in alpha*-*-*) @@ -1518,7 +1613,7 @@ echo "configure:1500: checking for IEEE-conformance compiler flags" >&5 # AC_HAVE_HEADERS(limits.h malloc.h string.h unistd.h values.h) echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1522: checking how to run the C preprocessor" >&5 +echo "configure:1617: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1533,13 +1628,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1543: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1638: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1550,13 +1645,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1560: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1655: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1567,13 +1662,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1577: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1672: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1601,17 +1696,17 @@ for ac_hdr in assert.h sys/stat.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1605: checking for $ac_hdr" >&5 +echo "configure:1700: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1615: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1710: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1638,12 +1733,12 @@ fi done echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6 -echo "configure:1642: checking whether stat file-mode macros are broken" >&5 +echo "configure:1737: checking whether stat file-mode macros are broken" >&5 if eval "test \"`echo '$''{'ac_cv_header_stat_broken'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1695,7 +1790,7 @@ fi echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:1699: checking how to run the C++ preprocessor" >&5 +echo "configure:1794: checking how to run the C++ preprocessor" >&5 if test -z "$CXXCPP"; then if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1708,12 +1803,12 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1717: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1812: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1750,7 +1845,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1754: checking for $ac_word" >&5 +echo "configure:1849: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1782,7 +1877,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1786: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:1881: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1793,12 +1888,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 1797 "configure" +#line 1892 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:1802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1824,12 +1919,12 @@ if test $ac_cv_prog_cxx_works = no; then { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1828: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1923: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1833: checking whether we are using GNU C++" >&5 +echo "configure:1928: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1838,7 +1933,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1842: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1937: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -1857,7 +1952,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}" ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:1861: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:1956: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1888,71 +1983,47 @@ else fi fi -for ac_declaration in \ - ''\ - '#include ' \ - 'extern "C" void std::exit (int) throw (); using std::exit;' \ - 'extern "C" void std::exit (int); using std::exit;' \ - 'extern "C" void exit (int) throw ();' \ - 'extern "C" void exit (int);' \ - 'void exit (int);' -do - cat > conftest.$ac_ext < -$ac_declaration -int main() { -exit (42); -; return 0; } -EOF -if { (eval echo configure:1910: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - : -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - continue -fi -rm -f conftest* - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - break -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 -fi -rm -f conftest* -done -if test -n "$ac_declaration"; then - echo '#ifdef __cplusplus' >>confdefs.h - echo $ac_declaration >>confdefs.h - echo '#endif' >>confdefs.h -fi + + #if test "`eval echo '$'"CXX"`" = "no"; then + + r="`eval echo '$'"CXX"`" + if test -n "$r" -a "$r" != "error" -a "$r" != "no" && ! expr '`eval echo '$'"CXX"`' : '.*\(echo\)' > /dev/null; then + ##STEPMAKE_WARN(cannot find . ) + false + else + true + fi + if test $? -ne 0; then + + eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \"c++\"`\" + + if test "REQUIRED" = "REQUIRED"; then + command="echo ERROR: c++ not found" + # abort configure process here? + else + command="- echo c++ not found" + fi + eval "CXX"='$command' + false + else + true + fi ac_safe=`echo "FlexLexer.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for FlexLexer.h""... $ac_c" 1>&6 -echo "configure:1946: checking for FlexLexer.h" >&5 +echo "configure:2017: checking for FlexLexer.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1956: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2027: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1972,7 +2043,7 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then else echo "$ac_t""no" 1>&6 - echo "configure: warning: can"\'"t find flex header. Please install Flex headers correctly" 1>&2 + echo "configure: warning: cannot find flex header. Please install Flex headers correctly" 1>&2 warn_b=yes fi @@ -1989,30 +2060,33 @@ fi echo $ac_n "checking "g++ version"""... $ac_c" 1>&6 -echo "configure:1993: checking "g++ version"" >&5 +echo "configure:2064: checking "g++ version"" >&5 cxx_version=`$CXX --version` echo "$ac_t"""$cxx_version"" 1>&6 # urg, egcs: how to check for egcs >= 1.1? if expr "$cxx_version" : '.*2\.[89]' > /dev/null || expr "$cxx_version" : '.*egcs' > /dev/null || - expr "$cxx_version" : '3\.0' > /dev/null + expr "$cxx_version" : '3\.[0-9]' > /dev/null then true else - - echo "configure: warning: can\'t find g++ 2.8" 1>&2 + + echo "configure: warning: cannot find g++ 2.8" 1>&2 warn_b=yes + + eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \"'g++ >= 2.95 (gcc package)'\"`\" + fi echo $ac_n "checking whether explicit instantiation is needed""... $ac_c" 1>&6 -echo "configure:2011: checking whether explicit instantiation is needed" >&5 +echo "configure:2085: checking whether explicit instantiation is needed" >&5 if eval "test \"`echo '$''{'lily_cv_need_explicit_instantiation'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < struct foo { static int baz; }; @@ -2022,7 +2096,7 @@ int main() { return foo::baz; ; return 0; } EOF -if { (eval echo configure:2026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lily_cv_need_explicit_instantiation=no else @@ -2049,7 +2123,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2053: checking for $ac_word" >&5 +echo "configure:2127: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2079,20 +2153,14 @@ test -n "$YACC" && break done test -n "$YACC" || YACC="yacc" - # ugh, automake: we want (and check for) flex - # AC_PROG_LEX - # urg: automake 1.3: hope this doesn't break 1.2 ac_cv_pro_lex_root hack... - - # AC_DECL_YYTEXT - # ugh, ugh - ac_cv_prog_lex_root=lex.yy - + + for ac_prog in bison do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2096: checking for $ac_word" >&5 +echo "configure:2164: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_BISON'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2120,14 +2188,87 @@ fi test -n "$BISON" && break done -test -n "$BISON" || BISON="error" +test -n "$BISON" || BISON="no" + + + #if test "`eval echo '$'"BISON"`" = "no"; then + + r="`eval echo '$'"BISON"`" + if test -n "$r" -a "$r" != "error" -a "$r" != "no" && ! expr '`eval echo '$'"BISON"`' : '.*\(echo\)' > /dev/null; then + ##STEPMAKE_WARN(cannot find . ) + false + else + true + fi + + if test $? -ne 0; then + + eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \"bison\"`\" + + if test "REQUIRED" = "REQUIRED"; then + command="echo ERROR: bison not found" + # abort configure process here? + else + command="- echo bison not found" + fi + eval "BISON"='$command' + false + else + true + fi + + + + # urg. should test functionality rather than version. + if test "$BISON" = "bison" -a -n "1.25"; then +# if test $? -eq 0 -a -n "1.25"; then + echo $ac_n "checking "bison version"""... $ac_c" 1>&6 +echo "configure:2227: checking "bison version"" >&5 + exe=` + type -p "bison" 2>&1 | awk '{print $NF}' +` + ver=` + "$exe" --version 2>&1 | grep -v '^$' | head -1 | awk '{print $NF}' +` + num=` + echo "$ver" | awk -F. ' + { + if ($3) {last = $3} + else {last =0} + } + {printf "%s%s%s\n",$1*100, $2*10,last}' +` + req=` + echo "1.25" | awk -F. ' + { + if ($3) {last = $3} + else {last =0} + } + {printf "%s%s%s\n",$1*100, $2*10,last}' +` + echo "$ac_t"""$ver"" 1>&6 + if test "$num" -lt "$req"; then + + eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""bison 1.25 (installed: $ver)"\"`\" + fi + fi + + + # ugh, automake: we want (and check for) flex + # AC_PROG_LEX + # urg: automake 1.3: hope this doesn't break 1.2 ac_cv_pro_lex_root hack... + + # AC_DECL_YYTEXT + # ugh, ugh + ac_cv_prog_lex_root=lex.yy + for ac_prog in flex do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2131: checking for $ac_word" >&5 +echo "configure:2272: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_FLEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2155,49 +2296,45 @@ fi test -n "$FLEX" && break done -test -n "$FLEX" || FLEX="error" +test -n "$FLEX" || FLEX="no" - result="`echo \"$BISON\" | grep echo`" - if test "x$BISON" = "xerror" -o "x$result" != "x"; then - - echo "configure: warning: can\'t find bison. Please install Bison" 1>&2 - warn_b=yes - - fi - + #if test "`eval echo '$'"FLEX"`" = "no"; then - result="`echo \"$FLEX\" | grep echo`" - if test "x$FLEX" = "xerror" -o "x$result" != "x"; then - - echo "configure: warning: can\'t find flex. Please install Flex" 1>&2 - warn_b=yes + r="`eval echo '$'"FLEX"`" + if test -n "$r" -a "$r" != "error" -a "$r" != "no" && ! expr '`eval echo '$'"FLEX"`' : '.*\(echo\)' > /dev/null; then + ##STEPMAKE_WARN(cannot find . ) + false + else + true + fi - fi + if test $? -ne 0; then + + eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \"flex\"`\" + if test "REQUIRED" = "REQUIRED"; then + command="echo ERROR: flex not found" + # abort configure process here? + else + command="- echo flex not found" + fi + eval "FLEX"='$command' + false + else + true + fi -## Urg. We should fix this configure test. -- so clumsy - if test $BISON != "error"; then - bison_version=`$BISON --version | head -1 | sed 's/^.* 1\.//g'` - if test $bison_version -lt 25; then - - echo "configure: warning: The bison installed might be too old (1.$bison_version). You might have to install 1.25" 1>&2 - warn_b=yes - fi - fi - - - for ac_prog in ar do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2201: checking for $ac_word" >&5 +echo "configure:2338: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2225,12 +2362,40 @@ fi test -n "$AR" && break done -test -n "$AR" || AR="error" +test -n "$AR" || AR="no" + + + #if test "`eval echo '$'"AR"`" = "no"; then + + r="`eval echo '$'"AR"`" + if test -n "$r" -a "$r" != "error" -a "$r" != "no" && ! expr '`eval echo '$'"AR"`' : '.*\(echo\)' > /dev/null; then + ##STEPMAKE_WARN(cannot find . ) + false + else + true + fi + + if test $? -ne 0; then + + eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \"ar\"`\" + + if test "REQUIRED" = "REQUIRED"; then + command="echo ERROR: ar not found" + # abort configure process here? + else + command="- echo ar not found" + fi + eval "AR"='$command' + false + else + true + fi + # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2234: checking for $ac_word" >&5 +echo "configure:2399: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2257,9 +2422,33 @@ else echo "$ac_t""no" 1>&6 fi - + #if test "`eval echo '$'"RANLIB"`" = "no"; then + r="`eval echo '$'"RANLIB"`" + if test -n "$r" -a "$r" != "error" -a "$r" != "no" && ! expr '`eval echo '$'"RANLIB"`' : '.*\(echo\)' > /dev/null; then + ##STEPMAKE_WARN(cannot find . ) + false + else + true + fi + + if test $? -ne 0; then + + eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \"ranlib\"`\" + + if test "REQUIRED" = "REQUIRED"; then + command="echo ERROR: ranlib not found" + # abort configure process here? + else + command="- echo ranlib not found" + fi + eval "RANLIB"='$command' + false + else + true + fi + lang=English @@ -2285,7 +2474,7 @@ fi echo $ac_n "checking language""... $ac_c" 1>&6 -echo "configure:2289: checking language" >&5 +echo "configure:2478: checking language" >&5 case "$language" in En* | en* | Am* | am* | US* | us*) lang=English;; @@ -2321,7 +2510,7 @@ EOF echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6 -echo "configure:2325: checking for gettext in -lintl" >&5 +echo "configure:2514: checking for gettext in -lintl" >&5 ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2329,7 +2518,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2373,12 +2562,12 @@ fi for ac_func in gettext do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2377: checking for $ac_func" >&5 +echo "configure:2566: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2430,13 +2619,13 @@ done - # AC_CHECK_PROGS(MSGFMT, msgfmt, -echo no msgfmt) + for ac_prog in msgfmt do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2440: checking for $ac_word" >&5 +echo "configure:2629: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2464,38 +2653,47 @@ fi test -n "$MSGFMT" && break done -test -n "$MSGFMT" || MSGFMT="\$(SHELL) \$(step-bindir)/fake-msgfmt.sh " +test -n "$MSGFMT" || MSGFMT="no" - echo $ac_n "checking whether msgfmt accepts -o""... $ac_c" 1>&6 -echo "configure:2471: checking whether msgfmt accepts -o" >&5 - msgfmt_output="`msgfmt -o bla 2>&1 | grep usage`" - if test "$msgfmt_output" = ""; then - echo "$ac_t""yes" 1>&6 + + #if test "`eval echo '$'"MSGFMT"`" = "no"; then + + r="`eval echo '$'"MSGFMT"`" + if test -n "$r" -a "$r" != "error" -a "$r" != "no" && ! expr '`eval echo '$'"MSGFMT"`' : '.*\(echo\)' > /dev/null; then + ##STEPMAKE_WARN(cannot find . ) + false else - # urg - MSGFMT="\$(SHELL) \$(step-bindir)/fake-msgfmt.sh" - echo "$ac_t""no" 1>&6 - - echo "configure: warning: please install msgfmt from GNU gettext" 1>&2 - warn_b=yes - + true fi - if test ! -n "$MSGFMT"; then + + if test $? -ne 0; then - echo "configure: warning: please install msgfmt from GNU gettext" 1>&2 - warn_b=yes + eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \"msgfmt\"`\" + + if test "REQUIRED" = "REQUIRED"; then + command="echo ERROR: msgfmt not found" + # abort configure process here? + else + command="- echo msgfmt not found" + fi + eval "MSGFMT"='$command' + false + else + true + fi + - fi # urg, never know what names these teTeX guys will think up - for ac_prog in mf + + for ac_prog in mf mfont do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2499: checking for $ac_word" >&5 +echo "configure:2697: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_METAFONT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2525,51 +2723,41 @@ test -n "$METAFONT" && break done test -n "$METAFONT" || METAFONT="no" - if test "x$METAFONT" = "xno"; then - for ac_prog in mfont -do -# Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2535: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_MFONT'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$MFONT"; then - ac_cv_prog_MFONT="$MFONT" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_MFONT="$ac_prog" - break + + #if test "`eval echo '$'"METAFONT"`" = "no"; then + + r="`eval echo '$'"METAFONT"`" + if test -n "$r" -a "$r" != "error" -a "$r" != "no" && ! expr '`eval echo '$'"METAFONT"`' : '.*\(echo\)' > /dev/null; then + ##STEPMAKE_WARN(cannot find . ) + false + else + true fi - done - IFS="$ac_save_ifs" -fi -fi -MFONT="$ac_cv_prog_MFONT" -if test -n "$MFONT"; then - echo "$ac_t""$MFONT" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi -test -n "$MFONT" && break -done -test -n "$MFONT" || MFONT="-echo no mf or mfont" + if test $? -ne 0; then + + eval ""=\"`eval echo \"'$'\" \"mf mfont\"`\" - METAFONT=$MFONT + if test "" = "REQUIRED"; then + command="echo ERROR: mf mfont not found" + # abort configure process here? + else + command="- echo mf mfont not found" + fi + eval "METAFONT"='$command' + false + else + true fi - for ac_prog in inimf + + + for ac_prog in inimf inimfont do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2573: checking for $ac_word" >&5 +echo "configure:2761: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_INIMETAFONT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2599,47 +2787,37 @@ test -n "$INIMETAFONT" && break done test -n "$INIMETAFONT" || INIMETAFONT="no" - if test "x$INIMETAFONT" = "xno"; then - for ac_prog in inimfont -do -# Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2609: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_INIMFONT'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$INIMFONT"; then - ac_cv_prog_INIMFONT="$INIMFONT" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_INIMFONT="$ac_prog" - break + + #if test "`eval echo '$'"INIMETAFONT"`" = "no"; then + + r="`eval echo '$'"INIMETAFONT"`" + if test -n "$r" -a "$r" != "error" -a "$r" != "no" && ! expr '`eval echo '$'"INIMETAFONT"`' : '.*\(echo\)' > /dev/null; then + ##STEPMAKE_WARN(cannot find . ) + false + else + true fi - done - IFS="$ac_save_ifs" -fi -fi -INIMFONT="$ac_cv_prog_INIMFONT" -if test -n "$INIMFONT"; then - echo "$ac_t""$INIMFONT" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi -test -n "$INIMFONT" && break -done -test -n "$INIMFONT" || INIMFONT="-echo no inimf or inimfont" + if test $? -ne 0; then + + eval ""=\"`eval echo \"'$'\" \"inimf inimfont\"`\" - INIMETAFONT=$INIMFONT + if test "" = "REQUIRED"; then + command="echo ERROR: inimf inimfont not found" + # abort configure process here? + else + command="- echo inimf inimfont not found" + fi + eval "INIMETAFONT"='$command' + false + else + true fi + + echo $ac_n "checking for working metafont mode""... $ac_c" 1>&6 -echo "configure:2643: checking for working metafont mode" >&5 +echo "configure:2821: checking for working metafont mode" >&5 modelist='ljfour lj4 lj3 lj2 ljet laserjet' for MFMODE in $modelist; do $METAFONT "\mode:=$MFMODE; mode_setup; end." > /dev/null 2>&1 @@ -2652,8 +2830,6 @@ echo "configure:2643: checking for working metafont mode" >&5 rm -f mfput.* - - # Check whether --enable-tfm-path or --disable-tfm-path was given. @@ -2665,12 +2841,14 @@ else fi + # ugh + for ac_prog in kpsewhich do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2674: checking for $ac_word" >&5 +echo "configure:2852: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_KPSEWHICH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2700,8 +2878,36 @@ test -n "$KPSEWHICH" && break done test -n "$KPSEWHICH" || KPSEWHICH="no" + + #if test "`eval echo '$'"KPSEWHICH"`" = "no"; then + + r="`eval echo '$'"KPSEWHICH"`" + if test -n "$r" -a "$r" != "error" -a "$r" != "no" && ! expr '`eval echo '$'"KPSEWHICH"`' : '.*\(echo\)' > /dev/null; then + ##STEPMAKE_WARN(cannot find . ) + false + else + true + fi + + if test $? -ne 0; then + + eval "OPTIONAL"=\"`eval echo \"'$'OPTIONAL\" \"kpsewhich\"`\" + + if test "OPTIONAL" = "REQUIRED"; then + command="echo ERROR: kpsewhich not found" + # abort configure process here? + else + command="- echo kpsewhich not found" + fi + eval "KPSEWHICH"='$command' + false + else + true + fi + + echo $ac_n "checking for tfm path""... $ac_c" 1>&6 -echo "configure:2705: checking for tfm path" >&5 +echo "configure:2911: checking for tfm path" >&5 TFM_FONTS="cmr msam" @@ -2727,62 +2933,75 @@ echo "configure:2705: checking for tfm path" >&5 - ## First, let's just see if we can find Guile at all. - echo $ac_n "checking "for guile-config"""... $ac_c" 1>&6 -echo "configure:2733: checking "for guile-config"" >&5 - for guile_config in guile-config $target-guile-config $build-guile-config; do - echo "$ac_t"""$guile_config"" 1>&6 - if ! $guile_config --version > /dev/null 2>&1 ; then - echo "configure: warning: "cannot execute $guile_config"" 1>&2 - echo $ac_n "checking "if we are cross compiling"""... $ac_c" 1>&6 -echo "configure:2739: checking "if we are cross compiling"" >&5 - guile_config=error + + for ac_prog in guile +do +# Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:2943: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_GUILE'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$GUILE"; then + ac_cv_prog_GUILE="$GUILE" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_GUILE="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +GUILE="$ac_cv_prog_GUILE" +if test -n "$GUILE"; then + echo "$ac_t""$GUILE" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$GUILE" && break +done +test -n "$GUILE" || GUILE="no" + + + #if test "`eval echo '$'"GUILE"`" = "no"; then + + r="`eval echo '$'"GUILE"`" + if test -n "$r" -a "$r" != "error" -a "$r" != "no" && ! expr '`eval echo '$'"GUILE"`' : '.*\(echo\)' > /dev/null; then + ##STEPMAKE_WARN(cannot find . ) + false + else + true + fi + + if test $? -ne 0; then + + eval "OPTIONAL"=\"`eval echo \"'$'OPTIONAL\" \"guile\"`\" + + if test "OPTIONAL" = "REQUIRED"; then + command="echo ERROR: guile not found" + # abort configure process here? else - break + command="- echo guile not found" fi - done - if test "$guile_config" = "error"; then - { echo "configure: error: "cannot find guile-config; is Guile installed?"" 1>&2; exit 1; } - exit 1 - fi - echo $ac_n "checking "Guile version"""... $ac_c" 1>&6 -echo "configure:2750: checking "Guile version"" >&5 - need_guile_version="1.3.4" - need_guile_version_numeric=100304 - guile_version=`$guile_config --version 2>&1 | awk '{print $NF}'` - guile_version_numeric=`echo $guile_version | awk -F. ' -{if ($3) {last = $3} -else {last =0}} -{printf "%s%s%s\n",$1*100, $2*10,last}'` - echo "$ac_t"""$guile_version"" 1>&6 - if test $guile_version_numeric -lt $need_guile_version_numeric - then - - echo "configure: warning: "Guile version "$need_guile_version" or newer is needed"" 1>&2 - warn_b=yes - + eval "GUILE"='$command' + false + else + true fi - GUILE_MAJOR_VERSION=`expr $guile_version : '\([0-9]*\)'` - GUILE_MINOR_VERSION=`expr $guile_version : '[0-9]*\.\([0-9]*\)'` - -## The GUILE_FLAGS macro. - echo $ac_n "checking for Guile""... $ac_c" 1>&6 -echo "configure:2771: checking for Guile" >&5 - if ! $guile_config link > /dev/null ; then - echo "$ac_t"""cannot execute $guile_config"" 1>&6 - { echo "configure: error: "cannot find guile-config; is Guile installed?"" 1>&2; exit 1; } - exit 1 - fi - GUILE_CFLAGS="`$guile_config compile`" - GUILE_LDFLAGS="`$guile_config link`" - - - echo "$ac_t""yes" 1>&6 - # Extract the first word of "guile", so it can be a program name with args. +# if ! expr '`eval echo '$'"GUILE"`' : '.*\(echo\)' > /dev/null; then + if test $? -ne 0; then + # Extract the first word of "guile", so it can be a program name with args. set dummy guile; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2786: checking for $ac_word" >&5 +echo "configure:3005: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GUILE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2804,7 +3023,6 @@ else fi done IFS="$ac_save_ifs" - test -z "$ac_cv_path_GUILE" && ac_cv_path_GUILE="error" ;; esac fi @@ -2815,7 +3033,125 @@ else echo "$ac_t""no" 1>&6 fi + fi + + + + ## First, let's just see if we can find Guile at all. + echo $ac_n "checking "for guile-config"""... $ac_c" 1>&6 +echo "configure:3043: checking "for guile-config"" >&5 + for guile_config in guile-config $target-guile-config $build-guile-config; do + echo "$ac_t"""$guile_config"" 1>&6 + if ! $guile_config --version > /dev/null 2>&1 ; then + echo "configure: warning: "cannot execute $guile_config"" 1>&2 + echo $ac_n "checking "if we are cross compiling"""... $ac_c" 1>&6 +echo "configure:3049: checking "if we are cross compiling"" >&5 + GUILE_CONFIG='echo no guile-config' + else + GUILE_CONFIG=$guile_config + break + fi + done + #if test "`eval echo '$'"GUILE_CONFIG"`" = "no"; then + + r="`eval echo '$'"GUILE_CONFIG"`" + if test -n "$r" -a "$r" != "error" -a "$r" != "no" && ! expr '`eval echo '$'"GUILE_CONFIG"`' : '.*\(echo\)' > /dev/null; then + ##STEPMAKE_WARN(cannot find . ) + false + else + true + fi + + if test $? -ne 0; then + + eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \"$guile_config\"`\" + + if test "REQUIRED" = "REQUIRED"; then + command="echo ERROR: $guile_config not found" + # abort configure process here? + else + command="- echo $guile_config not found" + fi + eval "GUILE_CONFIG"='$command' + false + else + true + fi + + #if expr "$GUILE_CONFIG" : '.*\(echo\)' >/dev/null; then + if test $? -ne 0; then + + eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \"'guile-config (guile-devel, guile-dev or libguile-dev package)'\"`\" + + fi + + + r="`eval echo '$'"GUILE_CONFIG"`" + if test -n "$r" -a "$r" != "error" -a "$r" != "no" && ! expr '`eval echo '$'"GUILE_CONFIG"`' : '.*\(echo\)' > /dev/null; then + ##STEPMAKE_WARN(cannot find . ) + false + else + true + fi + + # urg. should test functionality rather than version. + if test $? -eq 0 -a -n "1.3.4"; then + echo $ac_n "checking "guile-config version"""... $ac_c" 1>&6 +echo "configure:3102: checking "guile-config version"" >&5 + exe=` + type -p "$guile_config" 2>&1 | awk '{print $NF}' +` + ver=` + "$exe" --version 2>&1 | grep -v '^$' | head -1 | awk '{print $NF}' +` + set -- + num=` + echo "$ver" | awk -F. ' + { + if ($3) {last = $3} + else {last =0} + } + {printf "%s%s%s\n",$1*100, $2*10,last}' +` + req=` + echo "1.3.4" | awk -F. ' + { + if ($3) {last = $3} + else {last =0} + } + {printf "%s%s%s\n",$1*100, $2*10,last}' +` + echo "$ac_t"""$ver"" 1>&6 + if test "$num" -lt "$req"; then + + eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""guile-config 1.3.4 (installed: $ver)"\"`\" + + fi + fi + + + + guile_version="$ver" + GUILE_MAJOR_VERSION=`expr $guile_version : '\([0-9]*\)'` + GUILE_MINOR_VERSION=`expr $guile_version : '[0-9]*\.\([0-9]*\)'` + + exe=` + type -p "$guile_config" 2>&1 | awk '{print $NF}' +` + if test -x $exe; then + echo $ac_n "checking "guile compile flags"""... $ac_c" 1>&6 +echo "configure:3145: checking "guile compile flags"" >&5 + GUILE_CFLAGS="`$guile_config compile`" + echo "$ac_t""$GUILE_CFLAGS" 1>&6 + echo $ac_n "checking "guile link flags"""... $ac_c" 1>&6 +echo "configure:3149: checking "guile link flags"" >&5 + GUILE_LDFLAGS="`$guile_config link`" + echo "$ac_t""$GUILE_LDFLAGS" 1>&6 + fi + + + cat >> confdefs.h <&6 -echo "configure:2847: checking for $ac_hdr" >&5 +echo "configure:3183: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2857: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3193: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2880,7 +3216,7 @@ fi done echo $ac_n "checking for kpse_find_file in -lkpathsea""... $ac_c" 1>&6 -echo "configure:2884: checking for kpse_find_file in -lkpathsea" >&5 +echo "configure:3220: checking for kpse_find_file in -lkpathsea" >&5 ac_lib_var=`echo kpathsea'_'kpse_find_file | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2888,7 +3224,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lkpathsea $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2932,12 +3268,12 @@ fi for ac_func in kpse_find_file do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2936: checking for $ac_func" >&5 +echo "configure:3272: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <&6 +{ echo "configure: error: Cannot find kpathsea functions. You should install kpathsea; see INSTALL.txt. Rerun ./configure --without-kpathsea only if kpathsea is not available for your platform." 1>&2; exit 1; } +fi +done + + fi + echo $ac_n "checking whether to use kpathsea""... $ac_c" 1>&6 +echo "configure:3330: checking whether to use kpathsea" >&5 + if test "$kpathsea_b" != no; then + echo "$ac_t""yes" 1>&6 + KPATHSEA=1 + else + echo "$ac_t""no" 1>&6 + KPATHSEA=0 + fi + + + cat >> confdefs.h <&6 +echo "configure:3352: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_MAKEINFO'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$MAKEINFO"; then + ac_cv_prog_MAKEINFO="$MAKEINFO" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_MAKEINFO="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +MAKEINFO="$ac_cv_prog_MAKEINFO" +if test -n "$MAKEINFO"; then + echo "$ac_t""$MAKEINFO" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$MAKEINFO" && break +done +test -n "$MAKEINFO" || MAKEINFO="no" + + + #if test "`eval echo '$'"MAKEINFO"`" = "no"; then + + r="`eval echo '$'"MAKEINFO"`" + if test -n "$r" -a "$r" != "error" -a "$r" != "no" && ! expr '`eval echo '$'"MAKEINFO"`' : '.*\(echo\)' > /dev/null; then + ##STEPMAKE_WARN(cannot find . ) + false + else + true + fi + + if test $? -ne 0; then + + eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \"makeinfo\"`\" + + if test "REQUIRED" = "REQUIRED"; then + command="echo ERROR: makeinfo not found" + # abort configure process here? + else + command="- echo makeinfo not found" + fi + eval "MAKEINFO"='$command' + false + else + true + fi + + + if test "$MAKEINFO" = "makeinfo"; then + echo $ac_n "checking whether makeinfo can split html by @node""... $ac_c" 1>&6 +echo "configure:3412: checking whether makeinfo can split html by @node" >&5 + mkdir -p out + makeinfo --html --output=out/split <&6 + rm -rf out/split + else + echo "$ac_t""no" 1>&6 + + echo "configure: warning: your html documentation will be one large file" 1>&2 + warn_b=yes + + rm -rf out/split + fi + fi + + + + for ac_hdr in python2.2/Python.h python2.1/Python.h python2.0/Python.h python2/Python.h python/Python.h python1.5/Python.h Python.h +do +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:3441: checking for $ac_hdr" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:3451: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" + eval "ac_cv_header_$ac_safe=yes" else + echo "$ac_err" >&5 echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - eval "ac_cv_func_$ac_func=no" + eval "ac_cv_header_$ac_safe=no" fi rm -f conftest* fi - -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` cat >> confdefs.h <&6 -{ echo "configure: error: Cannot find kpathsea functions. You should install kpathsea; see INSTALL.txt. Rerun ./configure --without-kpathsea only if kpathsea is not available for your platform." 1>&2; exit 1; } fi done + if test $? -ne 0; then + + eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \"'python.h (python-devel, python-dev or libpython-dev package)'\"`\" + fi - echo $ac_n "checking whether to use kpathsea""... $ac_c" 1>&6 -echo "configure:2994: checking whether to use kpathsea" >&5 - if test "$kpathsea_b" != no; then - echo "$ac_t""yes" 1>&6 - KPATHSEA=1 - else - echo "$ac_t""no" 1>&6 - KPATHSEA=0 + + +##need perl for help2man. + + + for ac_prog in perl +do +# Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:3492: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_PERL'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$PERL"; then + ac_cv_prog_PERL="$PERL" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_PERL="$ac_prog" + break fi + done + IFS="$ac_save_ifs" +fi +fi +PERL="$ac_cv_prog_PERL" +if test -n "$PERL"; then + echo "$ac_t""$PERL" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$PERL" && break +done +test -n "$PERL" || PERL="no" - cat >> confdefs.h < /dev/null; then + ##STEPMAKE_WARN(cannot find . ) + false + else + true + fi + + if test $? -ne 0; then + + eval "OPTIONAL"=\"`eval echo \"'$'OPTIONAL\" \"perl\"`\" + + if test "OPTIONAL" = "REQUIRED"; then + command="echo ERROR: perl not found" + # abort configure process here? + else + command="- echo perl not found" + fi + eval "PERL"='$command' + false + else + true + fi + +# if ! expr '`eval echo '$'"PERL"`' : '.*\(echo\)' > /dev/null; then + if test $? -ne 0; then + # Extract the first word of "perl", so it can be a program name with args. +set dummy perl; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:3554: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + case "$PERL" in + /*) + ac_cv_path_PERL="$PERL" # Let the user override the test with a path. + ;; + ?:/*) + ac_cv_path_PERL="$PERL" # Let the user override the test with a dos path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_PERL="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + ;; +esac +fi +PERL="$ac_cv_path_PERL" +if test -n "$PERL"; then + echo "$ac_t""$PERL" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + fi @@ -3016,9 +3596,8 @@ EOF fi - echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:3022: checking for 8-bit clean memcmp" >&5 +echo "configure:3601: checking for 8-bit clean memcmp" >&5 if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3026,8 +3605,11 @@ else ac_cv_func_memcmp_clean=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_memcmp_clean=yes else @@ -3054,12 +3636,12 @@ echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6 test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}" echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:3058: checking for vprintf" >&5 +echo "configure:3640: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -3109,12 +3691,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:3113: checking for _doprnt" >&5 +echo "configure:3695: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -3167,12 +3749,12 @@ fi for ac_func in memmem snprintf vsnprintf gettext isinf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3171: checking for $ac_func" >&5 +echo "configure:3753: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3233,149 +3815,9 @@ EOF - for ac_prog in makeinfo -do -# Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3242: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_MAKEINFO'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$MAKEINFO"; then - ac_cv_prog_MAKEINFO="$MAKEINFO" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_MAKEINFO="$ac_prog" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -MAKEINFO="$ac_cv_prog_MAKEINFO" -if test -n "$MAKEINFO"; then - echo "$ac_t""$MAKEINFO" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -test -n "$MAKEINFO" && break -done -test -n "$MAKEINFO" || MAKEINFO="error" - - if test "$MAKEINFO" != "error"; then - echo $ac_n "checking whether makeinfo can split html by @node""... $ac_c" 1>&6 -echo "configure:3274: checking whether makeinfo can split html by @node" >&5 - mkdir -p out - makeinfo --html --output=out/split <&6 - rm -rf out/split - else - echo "$ac_t""no" 1>&6 - - echo "configure: warning: your html documentation will be one large file" 1>&2 - warn_b=yes - - rm -rf out/split - fi - fi - - - -# Extract the first word of "perl", so it can be a program name with args. -set dummy perl; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3303: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case "$PERL" in - /*) - ac_cv_path_PERL="$PERL" # Let the user override the test with a path. - ;; - ?:/*) - ac_cv_path_PERL="$PERL" # Let the user override the test with a dos path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_PERL="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_PERL" && ac_cv_path_PERL="error" - ;; -esac -fi -PERL="$ac_cv_path_PERL" -if test -n "$PERL"; then - echo "$ac_t""$PERL" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - - -for ac_hdr in python2.2/Python.h python2.1/Python.h python2.0/Python.h python2/Python.h python/Python.h python1.5/Python.h Python.h -do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3341: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3351: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&6 -fi -done - - - - + + trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure @@ -3555,20 +3997,21 @@ s%@localedir@%$localedir%g s%@DIR_LOCALEDIR@%$DIR_LOCALEDIR%g s%@MSGFMT@%$MSGFMT%g s%@METAFONT@%$METAFONT%g -s%@MFONT@%$MFONT%g s%@INIMETAFONT@%$INIMETAFONT%g -s%@INIMFONT@%$INIMFONT%g s%@MFMODE@%$MFMODE%g s%@KPSEWHICH@%$KPSEWHICH%g s%@TFM_PATH@%$TFM_PATH%g +s%@GUILE@%$GUILE%g +s%@GUILE_CONFIG@%$GUILE_CONFIG%g s%@GUILE_CFLAGS@%$GUILE_CFLAGS%g s%@GUILE_LDFLAGS@%$GUILE_LDFLAGS%g -s%@GUILE@%$GUILE%g s%@KPATHSEA@%$KPATHSEA%g -s%@LIBOBJS@%$LIBOBJS%g s%@MAKEINFO@%$MAKEINFO%g s%@SPLITTING_MAKEINFO@%$SPLITTING_MAKEINFO%g s%@PERL@%$PERL%g +s%@LIBOBJS@%$LIBOBJS%g +s%@OPTIONAL@%$OPTIONAL%g +s%@REQUIRED@%$REQUIRED%g CEOF EOF @@ -3877,6 +4320,28 @@ if test "$no_recursion" != yes; then fi + + if test -n "$OPTIONAL"; then + echo + echo "WARNING: Please consider installing optional programs: $OPTIONAL" + fi + + if test -n "$REQUIRED"; then + echo + echo "ERROR: Please install required programs: $REQUIRED" + fi + + if test -n "$OPTIONAL$REQUIRED"; then + echo + echo "See INSTALL.txt for more information on how to build $PACKAGE_NAME" + echo "Remove config.cache before rerunning ./configure" + fi + + if test -n "$REQUIRED"; then + rm -f $srcdir/GNUmakefile + exit 1 + fi + # regular in-place build # test for srcdir_build = yes ? if test "$builddir" = "."; then diff --git a/configure.in b/configure.in index 6e0c34df90..8c498a8f51 100644 --- a/configure.in +++ b/configure.in @@ -6,29 +6,36 @@ AC_INIT(make/lilypond.lsm.in) AC_CONFIG_HEADER($CONFIGFILE.h:config.hh.in) # Bootstrap StepMake configure -AC_STEPMAKE_INIT +STEPMAKE_INIT # For all packages except the StepMake package itself AC_CONFIG_SUBDIRS(stepmake) # Uncomment the configuration options your package needs. -AC_STEPMAKE_COMPILE +STEPMAKE_COMPILE # AC_HAVE_HEADERS(limits.h malloc.h string.h unistd.h values.h) AC_HAVE_HEADERS(assert.h sys/stat.h) AC_HEADER_STAT -AC_STEPMAKE_CXX -AC_STEPMAKE_GXX -AC_STEPMAKE_CXXTEMPLATE -AC_STEPMAKE_LEXYACC -AC_STEPMAKE_LIB -AC_STEPMAKE_LOCALE -AC_STEPMAKE_GETTEXT -AC_STEPMAKE_MSGFMT -AC_STEPMAKE_TEXMF -AC_STEPMAKE_TEXMF_DIRS -AC_STEPMAKE_GUILE -AC_STEPMAKE_KPATHSEA +STEPMAKE_CXX(REQUIRED) +STEPMAKE_GXX(REQUIRED) +STEPMAKE_CXXTEMPLATE +STEPMAKE_BISON(REQUIRED, 1.25) +STEPMAKE_FLEX(REQUIRED) +STEPMAKE_LIB(REQUIRED) +STEPMAKE_LOCALE +STEPMAKE_GETTEXT +STEPMAKE_MSGFMT(REQUIRED) +STEPMAKE_TEXMF +STEPMAKE_TEXMF_DIRS +STEPMAKE_GUILE(OPTIONAL) +STEPMAKE_GUILE_DEVEL(REQUIRED, 1.3.4) +STEPMAKE_KPATHSEA +STEPMAKE_MAKEINFO(REQUIRED) +STEPMAKE_PYTHON_DEVEL(REQUIRED) + +##need perl for help2man. +STEPMAKE_PERL(OPTIONAL) if test "$optimise_b" = yes; then @@ -37,10 +44,6 @@ if test "$optimise_b" = yes; then fi -dnl should check out -print -dnl huh? -dnl AC_CHECK_SEARCH_RESULT($FIND, find, Please use --enable-tex-dir) - AC_FUNC_MEMCMP AC_FUNC_VPRINTF AC_CHECK_FUNCS(memmem snprintf vsnprintf gettext isinf) @@ -48,16 +51,7 @@ AC_CHECK_FUNCS(memmem snprintf vsnprintf gettext isinf) AC_DEFINE_UNQUOTED(TOPLEVEL_VERSION, "${FULL_VERSION}") AC_DEFINE_UNQUOTED(FLOWER_VERSION, "${FULL_FLOWER_VERSION}") -AC_STEPMAKE_MAKEINFO - - -dnl need perl for help2man. -AC_PATH_PROG(PERL, perl, error) - -AC_HAVE_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) - - -AC_STEPMAKE_END +STEPMAKE_END test -n "$CONFIGURATION" && mc=" conf=$CONFIGURATION" || mc="" diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py index 4e8a532253..89b7d52630 100644 --- a/scripts/ly2dvi.py +++ b/scripts/ly2dvi.py @@ -50,9 +50,6 @@ TODO: ''' - - - import os import stat import string @@ -66,6 +63,11 @@ import tempfile import traceback +################################################################ +# lilylib.py -- options and stuff +# +# source file of the GNU LilyPond music typesetter + # Handle bug in Python 1.6-2.1 # # there are recursion limits for some patterns in Python 1.6 til 2.1. @@ -79,11 +81,14 @@ try: except ImportError: import re - -################################################################ -# lilylib.py -- options and stuff -# -# source file of the GNU LilyPond music typesetter +# Attempt to fix problems with limited stack size set by Python! +# Sets unlimited stack size. Note that the resource module only +# is available on UNIX. +try: + import resource + resource.setrlimit (resource.RLIMIT_STACK, (-1, -1)) +except: + pass try: import gettext @@ -96,7 +101,7 @@ except: program_version = '@TOPLEVEL_VERSION@' if program_version == '@' + 'TOPLEVEL_VERSION' + '@': - program_version = '1.5.17' + program_version = '1.5.54' def identify (): sys.stdout.write ('%s (GNU LilyPond) %s\n' % (program_name, program_version)) @@ -259,19 +264,41 @@ def strip_extension (f, ext): e = '' return p + e -################################################################ -# END Library + +def cp_to_dir (pattern, dir): + "Copy files matching re PATTERN from cwd to DIR" + # Duh. Python style portable: cp *.EXT OUTDIR + # system ('cp *.%s %s' % (ext, outdir), 1) + files = filter (lambda x, p=pattern: re.match (p, x), os.listdir ('.')) + map (lambda x, d=dir: shutil.copy2 (x, os.path.join (d, x)), files) +# Python < 1.5.2 compatibility +# +# On most platforms, this is equivalent to +#`normpath(join(os.getcwd()), PATH)'. *Added in Python version 1.5.2* +if os.path.__dict__.has_key ('abspath'): + abspath = os.path.abspath +else: + def abspath (path): + return os.path.normpath (os.path.join (os.getcwd (), path)) + +if os.__dict__.has_key ('makedirs'): + makedirs = os.makedirs +else: + def makedirs (dir, mode=0777): + system ('mkdir -p %s' % dir) +def mkdir_p (dir, mode=0777): + if not os.path.isdir (dir): + makedirs (dir, mode) # if set, LILYPONDPREFIX must take prevalence # if datadir is not set, we're doing a build and LILYPONDPREFIX datadir = '@datadir@' - if os.environ.has_key ('LILYPONDPREFIX') : datadir = os.environ['LILYPONDPREFIX'] else: @@ -281,6 +308,12 @@ else: while datadir[-1] == os.sep: datadir= datadir[:-1] +sys.path.insert (0, os.path.join (datadir, 'python')) + +################################################################ +# END Library + + program_name = 'ly2dvi' original_dir = os.getcwd () @@ -290,24 +323,6 @@ keep_temp_dir_p = 0 verbose_p = 0 preview_p = 0 -try: - import gettext - gettext.bindtextdomain ('lilypond', '@localedir@') - gettext.textdomain ('lilypond') - _ = gettext.gettext -except: - def _ (s): - return s - -# Attempt to fix problems with limited stack size set by Python! -# Sets unlimited stack size. Note that the resource module only -# is available on UNIX. -try: - import resource - resource.setrlimit (resource.RLIMIT_STACK, (-1, -1)) -except: - pass - help_summary = _ ("Generate .dvi with LaTeX for LilyPond") option_definitions = [ @@ -841,34 +856,6 @@ for opt in options: sys.exit (0) - -def cp_to_dir (pattern, dir): - "Copy files matching re PATTERN from cwd to DIR" - # Duh. Python style portable: cp *.EXT OUTDIR - # system ('cp *.%s %s' % (ext, outdir), 1) - files = filter (lambda x, p=pattern: re.match (p, x), os.listdir ('.')) - map (lambda x, d=dir: shutil.copy2 (x, os.path.join (d, x)), files) - -# Python < 1.5.2 compatibility -# -# On most platforms, this is equivalent to -#`normpath(join(os.getcwd()), PATH)'. *Added in Python version 1.5.2* -if os.path.__dict__.has_key ('abspath'): - abspath = os.path.abspath -else: - def abspath (path): - return os.path.normpath (os.path.join (os.getcwd (), path)) - -if os.__dict__.has_key ('makedirs'): - makedirs = os.makedirs -else: - def makedirs (dir, mode=0777): - system ('mkdir -p %s' % dir) - -def mkdir_p (dir, mode=0777): - if not os.path.isdir (dir): - makedirs (dir, mode) - include_path = map (abspath, include_path) original_output = output_name diff --git a/scripts/update-lily.py b/scripts/update-lily.py index e1a51d4a3c..f0493769e5 100644 --- a/scripts/update-lily.py +++ b/scripts/update-lily.py @@ -289,6 +289,7 @@ rm -f %n && ln -s %n-%v %n ''' +### URL lib def list_file (user, passwd, host, dir, file): match = [] @@ -328,31 +329,6 @@ def list_url (url): s = "list_%s ('%s', '%s', '%s', '%s', '%s')" % split_url (url) return eval (s) -def version_tuple_to_str (t): - if t[3]: - my = '.%s%d' % (t[3], t[4]) - else: - my = '' - return ('%d.%d.%d' % t[0:3]) + my - -def version_str_to_tuple (s): - t = string.split (s, '.') - if len (t) >= 4: - my_name = t[3][:-1] - my_number = string.atoi (t[3][-1]) - else: - my_name = None - my_number = None - return (string.atoi (t[0]), string.atoi (t[1]), string.atoi (t[2]), - my_name, my_number) - -def split_package (p): - m = re.match ('(.*)-([0-9]*.*).tar.gz', p) - return (m.group (1), version_str_to_tuple (m.group (2))) - -def join_package (t): - return t[0] + '-' + version_tuple_to_str (t[1]) - def copy_file (user, passwd, host, dir, file): os.system ('cp %s/%s .' % (dir, file)) @@ -385,13 +361,37 @@ def copy_ftp (user, passwd, host, dir, file): ftp.close () return list - - def copy_url (url, dir): os.chdir (dir) s = "copy_%s ('%s', '%s', '%s', '%s', '%s')" % split_url (url) eval (s) +### End URL lib + +def version_tuple_to_str (t): + if t[3]: + my = '.%s%d' % (t[3], t[4]) + else: + my = '' + return ('%d.%d.%d' % t[0:3]) + my + +def version_str_to_tuple (s): + t = string.split (s, '.') + if len (t) >= 4: + my_name = t[3][:-1] + my_number = string.atoi (t[3][-1]) + else: + my_name = None + my_number = None + return (string.atoi (t[0]), string.atoi (t[1]), string.atoi (t[2]), + my_name, my_number) + +def split_package (p): + m = re.match ('(.*)-([0-9]*.*).tar.gz', p) + return (m.group (1), version_str_to_tuple (m.group (2))) + +def join_package (t): + return t[0] + '-' + version_tuple_to_str (t[1]) def find_latest (url): progress (_ ("Listing `%s'...") % url) diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4 index 60cc900b71..e0e2576c5a 100644 --- a/stepmake/aclocal.m4 +++ b/stepmake/aclocal.m4 @@ -1,8 +1,76 @@ dnl aclocal.m4 -*-shell-script-*- dnl StepMake subroutines for configure.in -AC_DEFUN(AC_STEPMAKE_BIBTEX2HTML, [ - AC_CHECK_PROGS(BIBTEX2HTML, bibtex2html bib2html, error) + +### mostly interal macros + +# Get full path of executable ($1) +AC_DEFUN(STEPMAKE_GET_EXECUTABLE, [ + type -p "$1" 2>&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}' +]) + +# Calculate numeric version from version string ($1) +AC_DEFUN(STEPMAKE_NUMERIC_VERSION, [ + echo "$1" | awk -F. ' + { + if ([$]3) {last = [$]3} + else {last =0} + } + {printf "%s%s%s\n",[$]1*100, [$]2*10,last}' +]) + + +# Add item ($2) to list ($1, one of 'OPTIONAL', 'REQUIRED') +AC_DEFUN(STEPMAKE_ADD_ENTRY, [ + eval "$1"=\"`eval echo \"'$'$1\" \"$2\"`\" +]) + +# Check if tested program ($2) was found ($1). +# If not, add etry to missing-list ($3, one of 'OPTIONAL', 'REQUIRED'). +# We could abort here if a 'REQUIRED' program is not found +AC_DEFUN(STEPMAKE_OPTIONAL_REQUIRED, [ + #if test "`eval echo '$'"$1"`" = "no"; then + STEPMAKE_CHECK_SEARCH_RESULT($1) + if test $? -ne 0; then + STEPMAKE_ADD_ENTRY($3, $2) + if test "$3" = "REQUIRED"; then + command="echo ERROR: $2 not found" + # abort configure process here? + else + command="- echo $2 not found" + fi + eval "$1"='$command' + false + else + true + fi +]) + + +# Return if tested proram ($1) was found (true) or not (false). +AC_DEFUN(STEPMAKE_CHECK_SEARCH_RESULT, [ + r="`eval echo '$'"$1"`" + if test -n "$r" -a "$r" != "error" -a "$r" != "no" && ! expr '`eval echo '$'"$1"`' : '.*\(echo\)' > /dev/null; then + ##STEPMAKE_WARN(cannot find $2. $3) + false + else + true + fi +]) + + + +### Macros to build configure.in + + +AC_DEFUN(STEPMAKE_BIBTEX2HTML, [ + STEPMAKE_PROGS(BIBTEX2HTML, bibtex2html bib2html, $1) if test "$BIBTEX2HTML" = "bib2html"; then BIBTEX2HTML_FLAGS='$< $(@)' else @@ -13,11 +81,34 @@ AC_DEFUN(AC_STEPMAKE_BIBTEX2HTML, [ ]) -AC_DEFUN(AC_STEPMAKE_COMPILE, [ +AC_DEFUN(STEPMAKE_BISON, [ + # ugh, automake: we want (and check for) bison + AC_PROG_YACC + + STEPMAKE_PROGS(BISON, bison, $1) + + # urg. should test functionality rather than version. + if test "$BISON" = "bison" -a -n "$2"; then +# if test $? -eq 0 -a -n "$2"; then + AC_MSG_CHECKING("bison version") + exe=`STEPMAKE_GET_EXECUTABLE(bison)` + ver=`STEPMAKE_GET_VERSION($exe)` + num=`STEPMAKE_NUMERIC_VERSION($ver)` + req=`STEPMAKE_NUMERIC_VERSION($2)` + AC_MSG_RESULT("$ver") + if test "$num" -lt "$req"; then + STEPMAKE_ADD_ENTRY($1, "bison $2 (installed: $ver)") + fi + fi +]) + + + +AC_DEFUN(STEPMAKE_COMPILE, [ # -O is necessary to get inlining - CFLAGS=${CFLAGS:-""} - CXXFLAGS=${CXXFLAGS:-$CFLAGS} - LDFLAGS=${LDFLAGS:-""} + CFLAGS=${CFLAGS-""} + CXXFLAGS=${CXXFLAGS-$CFLAGS} + LDFLAGS=${LDFLAGS-""} checking_b=yes optimise_b=yes profile_b=no @@ -62,11 +153,12 @@ AC_DEFUN(AC_STEPMAKE_COMPILE, [ AC_PROG_CC + STEPMAKE_OPTIONAL_REQUIRED(CC, cc, $1) LD='$(CC)' AC_SUBST(LD) CFLAGS="$CFLAGS $OPTIMIZE" - CPPFLAGS=${CPPFLAGS:-""} + CPPFLAGS=${CPPFLAGS-""} AC_MSG_CHECKING([for IEEE-conformance compiler flags]) save_cflags="$CFLAGS" @@ -90,12 +182,13 @@ AC_DEFUN(AC_STEPMAKE_COMPILE, [ AC_SUBST(EXTRA_LIBES) ]) -AC_DEFUN(AC_STEPMAKE_CXX, [ +AC_DEFUN(STEPMAKE_CXX, [ AC_LANG_CPLUSPLUS AC_PROG_CXX + STEPMAKE_OPTIONAL_REQUIRED(CXX, c++, $1) AC_CHECK_HEADER(FlexLexer.h, true, - AC_STEPMAKE_WARN(can"\'"t find flex header. Please install Flex headers correctly)) + STEPMAKE_WARN(cannot find flex header. Please install Flex headers correctly)) CPPFLAGS="$CPPFLAGS $DEFINES" CXXFLAGS="$CXXFLAGS $OPTIMIZE" @@ -107,7 +200,8 @@ AC_DEFUN(AC_STEPMAKE_CXX, [ AC_SUBST(LD) ]) -AC_DEFUN(AC_STEPMAKE_CXXTEMPLATE, [ + +AC_DEFUN(STEPMAKE_CXXTEMPLATE, [ AC_CACHE_CHECK([whether explicit instantiation is needed], lily_cv_need_explicit_instantiation, AC_TRY_LINK([ @@ -121,7 +215,8 @@ AC_DEFUN(AC_STEPMAKE_CXXTEMPLATE, [ fi ]) -AC_DEFUN(AC_STEPMAKE_DATADIR, [ + +AC_DEFUN(STEPMAKE_DATADIR, [ if test "$datadir" = "\${prefix}/share"; then datadir='${prefix}/share/'$package fi @@ -144,9 +239,35 @@ AC_DEFUN(AC_STEPMAKE_DATADIR, [ AC_DEFINE_UNQUOTED(DIR_DATADIR, "${DIR_DATADIR}") ]) -AC_DEFUN(AC_STEPMAKE_END, [ + +AC_DEFUN(STEPMAKE_END, [ + AC_SUBST(OPTIONAL) + AC_SUBST(REQUIRED) + AC_OUTPUT($CONFIGFILE.make:config.make.in) + + if test -n "$OPTIONAL"; then + echo + echo "WARNING: Please consider installing optional programs: $OPTIONAL" + fi + + if test -n "$REQUIRED"; then + echo + echo "ERROR: Please install required programs: $REQUIRED" + fi + + if test -n "$OPTIONAL$REQUIRED"; then + echo + echo "See INSTALL.txt for more information on how to build $PACKAGE_NAME" + echo "Remove config.cache before rerunning ./configure" + fi + + if test -n "$REQUIRED"; then + rm -f $srcdir/GNUmakefile + exit 1 + fi + # regular in-place build # test for srcdir_build = yes ? if test "$builddir" = "."; then @@ -160,24 +281,75 @@ AC_DEFUN(AC_STEPMAKE_END, [ fi ]) -AC_DEFUN(AC_STEPMAKE_GXX, [ - AC_MSG_CHECKING("g++ version") - cxx_version=`$CXX --version` - AC_MSG_RESULT("$cxx_version") - changequote(<<, >>)dnl - # urg, egcs: how to check for egcs >= 1.1? - if expr "$cxx_version" : '.*2\.[89]' > /dev/null || - expr "$cxx_version" : '.*egcs' > /dev/null || - expr "$cxx_version" : '3\.0' > /dev/null - changequote([, ])dnl - then - true - else - AC_STEPMAKE_WARN(can\'t find g++ 2.8, 2.9, 3.0 or egcs 1.1) + +AC_DEFUN(STEPMAKE_FLEX, [ + # ugh, automake: we want (and check for) flex + # AC_PROG_LEX + # urg: automake 1.3: hope this doesn't break 1.2 ac_cv_pro_lex_root hack... + + # AC_DECL_YYTEXT + # ugh, ugh + ac_cv_prog_lex_root=lex.yy + STEPMAKE_PROGS(FLEX, flex, $1) +]) + + + +AC_DEFUN(STEPMAKE_GETTEXT, [ + DIR_LOCALEDIR=${localedir} + presome=${prefix} + if test "$prefix" = "NONE"; then + presome=${ac_default_prefix} fi + DIR_LOCALEDIR=`echo ${DIR_LOCALEDIR} | sed "s!\\\${prefix}!$presome!"` + AC_SUBST(localedir) + AC_SUBST(DIR_LOCALEDIR) + AC_DEFINE_UNQUOTED(DIR_LOCALEDIR, "${DIR_LOCALEDIR}") + + AC_CHECK_LIB(intl, gettext) + AC_CHECK_FUNCS(gettext) ]) -AC_DEFUN(AC_STEPMAKE_GUILE, [ + +AC_DEFUN(STEPMAKE_GUILE, [ + STEPMAKE_PATH_PROG(GUILE, guile, $1) +]) + + +# STEPMAKE_GUILE_FLAGS --- set flags for compiling and linking with Guile +# +# This macro runs the guile-config script, installed with Guile, +# to find out where Guile's header files and libraries are +# installed. It sets two variables, marked for substitution, as +# by AC_SUBST. +# +# GUILE_CFLAGS --- flags to pass to a C or C++ compiler to build +# code that uses Guile header files. This is almost +# always just a -I flag. +# +# GUILE_LDFLAGS --- flags to pass to the linker to link a +# program against Guile. This includes -lguile for +# the Guile library itself, any libraries that Guile +# itself requires (like -lqthreads), and so on. It may +# also include a -L flag to tell the compiler where to +# find the libraries. + +AC_DEFUN([STEPMAKE_GUILE_FLAGS], [ + exe=`STEPMAKE_GET_EXECUTABLE($guile_config)` + if test -x $exe; then + AC_MSG_CHECKING("guile compile flags") + GUILE_CFLAGS="`$guile_config compile`" + AC_MSG_RESULT($GUILE_CFLAGS) + AC_MSG_CHECKING("guile link flags") + GUILE_LDFLAGS="`$guile_config link`" + AC_MSG_RESULT($GUILE_LDFLAGS) + fi + AC_SUBST(GUILE_CFLAGS) + AC_SUBST(GUILE_LDFLAGS) +]) + + +AC_DEFUN(STEPMAKE_GUILE_DEVEL, [ ## First, let's just see if we can find Guile at all. AC_MSG_CHECKING("for guile-config") for guile_config in guile-config $target-guile-config $build-guile-config; do @@ -185,40 +357,67 @@ AC_DEFUN(AC_STEPMAKE_GUILE, [ if ! $guile_config --version > /dev/null 2>&1 ; then AC_MSG_WARN("cannot execute $guile_config") AC_MSG_CHECKING("if we are cross compiling") - guile_config=error + GUILE_CONFIG='echo no guile-config' else + GUILE_CONFIG=$guile_config break fi done - if test "$guile_config" = "error"; then - AC_MSG_ERROR("cannot find guile-config; is Guile installed?") - exit 1 - fi - AC_MSG_CHECKING("Guile version") - need_guile_version="1.3.4" - need_guile_version_numeric=100304 - guile_version=`$guile_config --version 2>&1 | awk '{print $NF}'` - guile_version_numeric=`echo $guile_version | awk -F. ' -{if ([$]3) {last = [$]3} -else {last =0}} -{printf "%s%s%s\n",[$]1*100, [$]2*10,last}'` - AC_MSG_RESULT("$guile_version") - if test $guile_version_numeric -lt $need_guile_version_numeric - then - AC_STEPMAKE_WARN("Guile version "$need_guile_version" or newer is needed") + STEPMAKE_OPTIONAL_REQUIRED(GUILE_CONFIG, $guile_config, $1) + #if expr "$GUILE_CONFIG" : '.*\(echo\)' >/dev/null; then + if test $? -ne 0; then + STEPMAKE_ADD_ENTRY($1, 'guile-config (guile-devel, guile-dev or libguile-dev package)') + fi + + STEPMAKE_CHECK_SEARCH_RESULT(GUILE_CONFIG) + # urg. should test functionality rather than version. + if test $? -eq 0 -a -n "$2"; then + AC_MSG_CHECKING("guile-config version") + exe=`STEPMAKE_GET_EXECUTABLE($guile_config)` + ver=`STEPMAKE_GET_VERSION($exe)` + set -- + num=`STEPMAKE_NUMERIC_VERSION($ver)` + req=`STEPMAKE_NUMERIC_VERSION($2)` + AC_MSG_RESULT("$ver") + if test "$num" -lt "$req"; then + STEPMAKE_ADD_ENTRY($1, "guile-config $2 (installed: $ver)") + fi fi + + AC_SUBST(GUILE_CONFIG) + + guile_version="$ver" changequote(<<, >>)dnl GUILE_MAJOR_VERSION=`expr $guile_version : '\([0-9]*\)'` GUILE_MINOR_VERSION=`expr $guile_version : '[0-9]*\.\([0-9]*\)'` changequote([, ])dnl - GUILE_FLAGS - AC_PATH_PROG(GUILE, guile, error) - AC_SUBST(GUILE) + STEPMAKE_GUILE_FLAGS AC_DEFINE_UNQUOTED(GUILE_MAJOR_VERSION, $GUILE_MAJOR_VERSION) AC_DEFINE_UNQUOTED(GUILE_MINOR_VERSION, $GUILE_MINOR_VERSION) ]) -AC_DEFUN(AC_STEPMAKE_INIT, [ + +AC_DEFUN(STEPMAKE_GXX, [ + AC_MSG_CHECKING("g++ version") + cxx_version=`$CXX --version` + AC_MSG_RESULT("$cxx_version") + changequote(<<, >>)dnl + # urg, egcs: how to check for egcs >= 1.1? + if expr "$cxx_version" : '.*2\.[89]' > /dev/null || + expr "$cxx_version" : '.*egcs' > /dev/null || + expr "$cxx_version" : '3\.[0-9]' > /dev/null + changequote([, ])dnl + then + true + else + STEPMAKE_WARN(cannot find g++ 2.8, 2.9, 3.x or egcs 1.1) + STEPMAKE_ADD_ENTRY($1, 'g++ >= 2.95 (gcc package)') + fi +]) + + + +AC_DEFUN(STEPMAKE_INIT, [ . $srcdir/VERSION FULL_VERSION=$MAJOR_VERSION.$MINOR_VERSION.$PATCH_LEVEL @@ -284,7 +483,7 @@ AC_DEFUN(AC_STEPMAKE_INIT, [ AC_MSG_RESULT($builddir) if expr "$srcdir" : '/' > /dev/null 2>&1; then absolute_srcdir=yes - AC_STEPMAKE_WARN(Absolute --srcdir specified: $srcdir) + STEPMAKE_WARN(Absolute --srcdir specified: $srcdir) fi AC_MSG_CHECKING(for stepmake) @@ -339,25 +538,21 @@ AC_DEFUN(AC_STEPMAKE_INIT, [ do \`make conf=CONF' to get output in ./out-CONF], [CONFIGURATION=$enableval]) + ##' + test -n "$CONFIGURATION" && CONFIGSUFFIX="-$CONFIGURATION" CONFIGFILE=config$CONFIGSUFFIX AC_SUBST(CONFIGSUFFIX) AC_CANONICAL_HOST - AC_CHECK_PROGS(MAKE, gmake make, error) - AC_CHECK_PROGS(FIND, find, error) + STEPMAKE_PROGS(MAKE, gmake make, REQUIRED) + STEPMAKE_PROGS(FIND, find, REQUIRED) -dnl system supplied INSTALL is unsafe; use our own install. -dnl AC_PROG_INSTALL -dnl if test "$INSTALL" = "bin/install-sh"; then -dnl export INSTALL="\$\(depth\)/bin/install-sh" -dnl fi - - AC_CHECK_PROGS(TAR, tar, error) + STEPMAKE_PROGS(TAR, tar, REQUIRED) if test "x`uname`" = "xHP-UX"; then AC_PATH_PROG(BASH, bash, /bin/sh) - AC_STEPMAKE_WARN(avoiding buggy /bin/sh) + STEPMAKE_WARN(avoiding buggy /bin/sh) AC_PATH_PROG(SHELL, bash, /bin/ksh) else AC_PATH_PROG(BASH, bash, /bin/sh) @@ -365,49 +560,22 @@ dnl fi AC_SUBST(SHELL) fi + STEPMAKE_PATH_PROG(PYTHON, python, REQUIRED) - AC_PATH_PROG(PYTHON, ${PYTHON:-python}, -echo no python) - AC_SUBST(PYTHON) - - if test $MAKE != "error" ; then - $MAKE -v 2> /dev/null | grep GNU > /dev/null - if test "$?" = 1 - then - AC_STEPMAKE_WARN(Please install *GNU* make) - fi + if expr "$MAKE" : '.*\(echo\)' >/dev/null; then + $MAKE -v 2> /dev/null | grep GNU > /dev/null + if test "$?" = 1; then + warn='make (Please install *GNU* make)' + STEPMAKE_WARN($warn) + STEPMAKE_ADD_ENTRY(REQUIRED, $warn) + fi fi - AC_CHECK_SEARCH_RESULT($PYTHON, python, You should install Python) - - if test "x$OSTYPE" = "xcygwin32" || test "x$OSTYPE" = "xWindows_NT"; then + if test "$OSTYPE" = "cygwin" -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 - # urg - # ROOTSEP=':' - # DIRSEP='\\' - # PATHSEP=';' - # - # cygwin fixes all these things. - # it seems these were used because of dos-style TEXINPUTS and - # MFINPUTS needed for miktex. - # but this breaks parsing of all other cygwin/unix style paths. - # - # if your (mik)tex breaks, make a: - # /usr/local/bin/tex: - # #!/bin/sh - # TEXINPUTS=`cygpath -pw $TEXINPUTS` /texmf/miktex/bin/tex $* - # - # and - # - # /usr/local/bin/mf: - # #!/bin/sh - # MFINPUTS=`cygpath -pw $MFINPUTS` /texmf/miktex/bin/mf $* - # - # this way, you may have buildscripts/out/lilypond-profile - # 'automatically' sourced from /usr/etc/profile.d/ too. - # ROOTSEP=':' DIRSEP='/' PATHSEP=':' @@ -432,10 +600,11 @@ dnl fi AC_SUBST(PATHSEP) AC_SUBST(DIRSEP) - AC_STEPMAKE_DATADIR + STEPMAKE_DATADIR ]) -AC_DEFUN(AC_STEPMAKE_KPATHSEA, [ + +AC_DEFUN(STEPMAKE_KPATHSEA, [ kpathsea_b=yes #FIXME --with-xxx is meant for specifying a PATH too, @@ -463,44 +632,15 @@ AC_DEFUN(AC_STEPMAKE_KPATHSEA, [ AC_DEFINE_UNQUOTED(KPATHSEA, $KPATHSEA) ]) -AC_DEFUN(AC_STEPMAKE_LEXYACC, [ - # ugh, automake: we want (and check for) bison - AC_PROG_YACC - # ugh, automake: we want (and check for) flex - # AC_PROG_LEX - # urg: automake 1.3: hope this doesn't break 1.2 ac_cv_pro_lex_root hack... - - # AC_DECL_YYTEXT - # ugh, ugh - ac_cv_prog_lex_root=lex.yy - - AC_CHECK_PROGS(BISON, bison, error) - AC_CHECK_PROGS(FLEX, flex, error) - AC_CHECK_SEARCH_RESULT($BISON, bison, Please install Bison, 1.25 or newer) - AC_CHECK_SEARCH_RESULT($FLEX, flex, Please install Flex, 2.5 or newer) - -## Urg. We should fix this configure test. -- so clumsy - if test $BISON != "error"; then - bison_version=`$BISON --version | head -1 | sed 's/^.* 1\.//g'` - if test $bison_version -lt 25; then - AC_STEPMAKE_WARN(The bison installed might be too old (1.$bison_version). You might have to install 1.25) - fi - fi - - AC_SUBST(BISON) - AC_SUBST(FLEX) -]) - -AC_DEFUN(AC_STEPMAKE_LIB, [ - AC_CHECK_PROGS(AR, ar, error) +AC_DEFUN(STEPMAKE_LIB, [ + STEPMAKE_PROGS(AR, ar, $1) AC_PROG_RANLIB - - AC_SUBST(AR) - AC_SUBST(RANLIB) + STEPMAKE_OPTIONAL_REQUIRED(RANLIB, ranlib, $1) ]) -AC_DEFUN(AC_STEPMAKE_LIBTOOL, [ + +AC_DEFUN(STEPMAKE_LIBTOOL, [ # libtool.info ... # **Never** try to set library version numbers so that they correspond # to the release number of your package. This is an abuse that only @@ -516,7 +656,8 @@ AC_DEFUN(AC_STEPMAKE_LIBTOOL, [ AC_SUBST(AGE) ]) -AC_DEFUN(AC_STEPMAKE_LOCALE, [ + +AC_DEFUN(STEPMAKE_LOCALE, [ lang=English ALL_LINGUAS="en nl" @@ -546,29 +687,15 @@ AC_DEFUN(AC_STEPMAKE_LOCALE, [ AC_MSG_RESULT($lang) if test "$lang" = "unknown" ; then - AC_STEPMAKE_WARN($language not supported; available are: $ALL_LINGUAS) + STEPMAKE_WARN($language not supported; available are: $ALL_LINGUAS) fi ]) -AC_DEFUN(AC_STEPMAKE_GETTEXT, [ - DIR_LOCALEDIR=${localedir} - presome=${prefix} - if test "$prefix" = "NONE"; then - presome=${ac_default_prefix} - fi - DIR_LOCALEDIR=`echo ${DIR_LOCALEDIR} | sed "s!\\\${prefix}!$presome!"` - AC_SUBST(localedir) - AC_SUBST(DIR_LOCALEDIR) - AC_DEFINE_UNQUOTED(DIR_LOCALEDIR, "${DIR_LOCALEDIR}") - - AC_CHECK_LIB(intl, gettext) - AC_CHECK_FUNCS(gettext) -]) -AC_DEFUN(AC_STEPMAKE_MAKEINFO, [ - AC_CHECK_PROGS(MAKEINFO, makeinfo, error) - if test "$MAKEINFO" != "error"; then +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; then + if test $? -ne 0; then + AC_PATH_PROG($1, $2) fi - - if test "x$TEXDIR" = xauto ; then - AC_TEX_SUBDIR(TEXDIR) +]) + + +# Check for program in set of names ($2), set result to ($1) . +# If missing, add entry to missing-list ($3, one of 'OPTIONAL', 'REQUIRED') +AC_DEFUN(STEPMAKE_PROGS, [ + AC_CHECK_PROGS($1, $2, no) + STEPMAKE_OPTIONAL_REQUIRED($1, $2, $3) +]) + + +AC_DEFUN(STEPMAKE_PERL, [ + STEPMAKE_PATH_PROG(PERL, perl, $1) +]) + + +AC_DEFUN(STEPMAKE_PYTHON_DEVEL, [ + AC_HAVE_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) + if test $? -ne 0; then + STEPMAKE_ADD_ENTRY($1, 'python.h (python-devel, python-dev or libpython-dev package)') fi - AC_SUBST(TEXPREFIX) - AC_SUBST(TEXDIR) - AC_SUBST(MFDIR) ]) -AC_DEFUN(AC_STEPMAKE_TEXMF_DIRS, [ + +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] ) - AC_CHECK_PROGS(KPSEWHICH, kpsewhich, no) + # ugh + STEPMAKE_PROGS(KPSEWHICH, kpsewhich, OPTIONAL) AC_MSG_CHECKING(for tfm path) TFM_FONTS="cmr msam" @@ -671,7 +788,7 @@ AC_DEFUN(AC_STEPMAKE_TEXMF_DIRS, [ TFM_PATH="$TFM_PATH `dirname $dir`" done else - AC_STEPMAKE_WARN(Please specify where cmr10.tfm lives: + STEPMAKE_WARN(Please specify where cmr10.tfm lives: ./configure --enable-tfm-path=/usr/local/TeX/lib/tex/fonts) fi else @@ -683,20 +800,12 @@ AC_DEFUN(AC_STEPMAKE_TEXMF_DIRS, [ AC_SUBST(TFM_PATH) ]) -AC_DEFUN(AC_STEPMAKE_TEXMF, [ - # urg, never know what names these teTeX guys will think up - AC_CHECK_PROGS(METAFONT, mf, no) - if test "x$METAFONT" = "xno"; then - AC_CHECK_PROGS(MFONT, mfont, -echo no mf or mfont) - METAFONT=$MFONT - fi +AC_DEFUN(STEPMAKE_TEXMF, [ + # urg, never know what names these teTeX guys will think up - AC_CHECK_PROGS(INIMETAFONT, inimf, no) - if test "x$INIMETAFONT" = "xno"; then - AC_CHECK_PROGS(INIMFONT, inimfont, -echo no inimf or inimfont) - INIMETAFONT=$INIMFONT - fi + STEPMAKE_PROGS(METAFONT, mf mfont, $1) + STEPMAKE_PROGS(INIMETAFONT, inimf inimfont, $1) AC_MSG_CHECKING(for working metafont mode) modelist='ljfour lj4 lj3 lj2 ljet laserjet' @@ -710,505 +819,13 @@ AC_DEFUN(AC_STEPMAKE_TEXMF, [ rm -f mfput.* - AC_SUBST(METAFONT) AC_SUBST(MFMODE) - AC_SUBST(INIMETAFONT) ]) -AC_DEFUN(AC_STEPMAKE_WARN, [ + +AC_DEFUN(STEPMAKE_WARN, [ AC_MSG_WARN($1) warn_b=yes ]) -AC_DEFUN(AC_STEPMAKE_YODL, [ - if test "x$YODL" = "x"; then - AC_CHECK_PROGS(STRIPROFF, striproff, -echo no striproff) - AC_CHECK_PROGS(YODL, yodl, -echo no yodl) - AC_CHECK_PROGS(YODL2HTML, yodl2html, -echo no yodl) - AC_CHECK_PROGS(YODL2LATEX, yodl2latex, ) - AC_CHECK_PROGS(YODL2MAN, yodl2man, -echo no yodl) - AC_CHECK_PROGS(YODL2MSLESS, yodl2msless, -echo no yodl) - AC_CHECK_PROGS(YODL2TEXINFO, yodl2texinfo, -echo no yodl) - AC_CHECK_PROGS(YODL2TXT, yodl2txt, -echo no yodl) - YODL2LESS_DIR='$(bindir)/' - else - AC_SUBST(STRIPROFF) - AC_SUBST(YODL) - AC_SUBST(YODL2HTML) - AC_SUBST(YODL2LATEX) - AC_SUBST(YODL2LESS_DIR) - AC_SUBST(YODL2MAN) - AC_SUBST(YODL2MSLESS) - AC_SUBST(YODL2TEXINFO) - AC_SUBST(YODL2TXT) - export STRIPROFF YODL YODL2HTML YODL2LATEX YODL2MAN YODL2MSLESS YODL2TEXINFO YODL2TXT - fi - if test "x$YODL" = "-echo no yodl"; then - AC_STEPMAKE_WARN(Did not find YODL (Yodl is Yet Oneother Document Language, see http://www.cs.uu.nl/~hanwen/yodl)) - fi -]) - -dnl should cache result. -dnl should look in $prefix first. -dnl should probably assume TDS - -AC_DEFUN(AC_TEX_PREFIX, [ - - - AC_MSG_CHECKING(TeX/MF root dir directory) - - find_root_prefix="$prefix" - - - test "x$find_root_prefix" = xNONE && find_root_prefix="$ac_default_prefix" - find_texpostfix=""; - for postfix in "/lib/tex/" "/lib/texmf" "/lib" "/tex" "/texmf"; do - find_texprefix="$find_root_prefix$postfix" - if test -d $find_texprefix; then - find_texpostfix=$postfix - break; - fi - done - - if test "x$find_texpostfix" = x; then - find_texpostfix='/lib/texmf/tex' - AC_STEPMAKE_WARN(Cannot determine the TeX-directory. Please use --enable-tex-prefix) - fi - - find_texprefix="$find_root_prefix/$find_texpostfix" - - # only assign if variablename not empty - if test x != "x[$]$1"; then - $1='${prefix}'/"$find_texpostfix" - fi - AC_MSG_RESULT($find_texprefix) - -]) - - -# find a directory inside a prefix, -# $1 the prefix (expanded version) -# $2 variable to assign -# $3 the directory name -# $4 description -AC_DEFUN(AC_FIND_DIR_IN_PREFIX, [ - - AC_MSG_CHECKING($4 directory) - find_dirdir=`(cd $1; - $FIND ./ -type d -a -name $3 -print |sort|head -1|sed 's#^\./##')` - - - if test "x$find_dirdir" = x; then - find_dirdir="/$3"; - AC_STEPMAKE_WARN(Cannot determine $4 subdirectory. Please set from command-line) - true - fi - $2=$find_dirdir - AC_MSG_RESULT($1/$find_dirdir) -]) -# ugh. this is hopeless -AC_DEFUN(AC_KPSE_TEX_DIR, [ - kpse_paths=`(kpsepath -n latex tex; kpsepath -n tex tex) | sed 's/:/ /g' | tr ' ' '\012' |sort | uniq -d` - kpse_syspaths=`echo $kpse_paths | grep '!'| sed 's/!//g'` - echo $kpse_paths - if test -w "$kpse_syspaths"; - then - dir=`echo $kpse_syspaths | head -1` - else - dir=`echo $kpse_paths | grep -v '!'| head -1` - fi - if test "$prefix" = "NONE"; then - local_prefix=$ac_default_prefix - local_prefix_quote='${prefix}' - - else - local_prefix=$prefix - local_prefix_quote=$prefix - fi - echo $local_prefix_quote = $local_prefix - echo $dir - echo $dir | sed 's!'$local_prefix'!\$local_prefix_quote!g' -]) - -AC_DEFUN(AC_TEX_SUBDIR, [ -dnl AC_REQUIRE([AC_TEX_PREFIX]) - AC_FIND_DIR_IN_PREFIX($find_texprefix, $1, tex,TeX input) - $1="$TEXPREFIX/$$1" -]) - -AC_DEFUN(AC_MF_SUBDIR, [ -dnl AC_REQUIRE([AC_TEX_PREFIX]) - AC_FIND_DIR_IN_PREFIX($find_texprefix, $1, source, MF input) - $1="$TEXPREFIX/$$1" -]) - -AC_DEFUN(AC_CHECK_SEARCH_RESULT, [ - result="`echo \"$1\" | grep echo`" - if test "x$1" = "xerror" -o "x$result" != "x"; then - AC_STEPMAKE_WARN(can\'t find $2. $3) - fi -]) - -dnl GUILE_FLAGS --- set flags for compiling and linking with Guile -dnl -dnl This macro runs the `guile-config' script, installed with Guile, -dnl to find out where Guile's header files and libraries are -dnl installed. It sets two variables, marked for substitution, as -dnl by AC_SUBST. -dnl -dnl GUILE_CFLAGS --- flags to pass to a C or C++ compiler to build -dnl code that uses Guile header files. This is almost -dnl always just a -I flag. -dnl -dnl GUILE_LDFLAGS --- flags to pass to the linker to link a -dnl program against Guile. This includes `-lguile' for -dnl the Guile library itself, any libraries that Guile -dnl itself requires (like -lqthreads), and so on. It may -dnl also include a -L flag to tell the compiler where to -dnl find the libraries. - -AC_DEFUN([GUILE_FLAGS],[ -## The GUILE_FLAGS macro. - AC_MSG_CHECKING(for Guile) - if ! $guile_config link > /dev/null ; then - AC_MSG_RESULT("cannot execute $guile_config") - AC_MSG_ERROR("cannot find guile-config; is Guile installed?") - exit 1 - fi - GUILE_CFLAGS="`$guile_config compile`" - GUILE_LDFLAGS="`$guile_config link`" - AC_SUBST(GUILE_CFLAGS) - AC_SUBST(GUILE_LDFLAGS) - AC_MSG_RESULT(yes) -]) - - -# Configure paths for GTK+ -# Owen Taylor 97-11-3 - -dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) -dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS -dnl -AC_DEFUN(AM_PATH_GTK, -[dnl -dnl Get the cflags and libraries from the gtk-config script -dnl - AC_PATH_PROG(GTK_CONFIG, gtk-config, no) - min_gtk_version=ifelse([$1], ,1.1.1,$1) - AC_MSG_CHECKING(for GTK - version >= $min_gtk_version) - no_gtk="" - if test "$GTK_CONFIG" != "no" ; then - GTK_CFLAGS=`$GTK_CONFIG --cflags` - GTK_LIBS=`$GTK_CONFIG --libs` - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - ac_save_CXXFLAGS="$CXXFLAGS" - CFLAGS="$CFLAGS $GTK_CFLAGS" - CXXFLAGS="$CXXFLAGS $GTK_CFLAGS" - LIBS="$LIBS $GTK_LIBS" -dnl -dnl Now check if the installed GTK is sufficiently new. (Also sanity -dnl checks the results of gtk-config to some extent) -dnl - AC_TRY_RUN([ -#include -#include - -int -main () -{ - int major, minor, micro; - - if (sscanf("$min_gtk_version", "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_gtk_version"); - exit(1); - } - - return !((gtk_major_version > major) || - ((gtk_major_version == major) && (gtk_minor_version > minor)) || - ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))); -} -],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - CXXFLAGS="$ac_save_CXXFLAGS" - LIBS="$ac_save_LIBS" - else - no_gtk=yes - fi - if test "x$no_gtk" = x ; then - AC_MSG_RESULT(yes) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) - GTK_CFLAGS="" - GTK_LIBS="" - ifelse([$3], , :, [$3]) - fi - CXXFLAGS="$CXXFLAGS $GTK_CFLAGS" - AC_SUBST(CXXFLAGS) - AC_SUBST(GTK_CFLAGS) - AC_SUBST(GTK_LIBS) -]) - - -# Configure paths for GTK-- -# Erik Andersen 30 May 1998 -# Modified by Tero Pulkkinen (added the compiler checks... I hope they work..) - -dnl Test for GTK__, and define GTK___CFLAGS and GTK___LIBS -dnl to be used as follows: -dnl AM_PATH_GTKMM([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) -dnl - -dnl Get the cflags and libraries from the gtkmm-config script -dnl -AC_ARG_WITH(gtkmm-prefix,[ --with-gtkmm-prefix=PREFIX - Prefix where GTK-- is installed (optional)], - gtkmm_config_prefix="$withval", gtkmm_config_prefix="") -AC_ARG_WITH(gtkmm-exec-prefix,[ --with-gtkmm-exec-prefix=PREFIX - Exec prefix where GTK-- is installed (optional)], - gtkmm_config_exec_prefix="$withval", gtkmm_config_exec_prefix="") -AC_ARG_ENABLE(gtkmmtest, [ --disable-gtkmmtest Do not try to compile and run a test GTK-- program], - , enable_gtkmmtest=yes) - - if test x$gtkmm_config_exec_prefix != x ; then - gtkmm_config_args="$gtkmm_config_args --exec-prefix=$gtkmm_config_exec_prefix" - if test x${GTKMM_CONFIG+set} != xset ; then - GTKMM_CONFIG=$gtkmm_config_exec_prefix/bin/gtkmm-config - fi - fi - if test x$gtkmm_config_prefix != x ; then - gtkmm_config_args="$gtkmm_config_args --prefix=$gtkmm_config_prefix" - if test x${GTKMM_CONFIG+set} != xset ; then - GTKMM_CONFIG=$gtkmm_config_prefix/bin/gtkmm-config - fi - fi - - -AC_DEFUN(AM_PATH_GTKMM, -[dnl - -dnl -dnl Check if the installed GTK-- is sufficiently new. -dnl - AC_PATH_PROG(GTKMM_CONFIG, gtkmm-config, no) - min_gtkmm_version=ifelse([$1], ,0.9.14,$1) - - AC_MSG_CHECKING(for GTK-- - version >= $min_gtkmm_version) - no_gtkmm="" - if test "$GTKMM_CONFIG" = "no" ; then - no_gtkmm=yes - else - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - - GTK___CFLAGS=`$GTKMM_CONFIG $gtkmm_config_args --cflags` - GTK___LIBS=`$GTKMM_CONFIG $gtkmm_config_args --libs` - gtkmm_config_major_version=`$GTKMM_CONFIG $gtkmm_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - gtkmm_config_minor_version=`$GTKMM_CONFIG $gtkmm_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - gtkmm_config_micro_version=`$GTKMM_CONFIG $gtkmm_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if test "x$enable_gtkmmtest" = "xyes" ; then - ac_save_CXXFLAGS="$CXXFLAGS" - ac_save_LIBS="$LIBS" - CXXFLAGS="$CXXFLAGS $GTK___CFLAGS" - LIBS="$LIBS $GTK___LIBS" -dnl -dnl Now check if the installed GTK-- is sufficiently new. (Also sanity -dnl checks the results of gtkmm-config to some extent -dnl - rm -f conf.gtkmmtest - AC_TRY_RUN([ -#include -#include -#include - -int -main () -{ - int major, minor, micro; - char *tmp_version; - - system ("touch conf.gtkmmtest"); - - /* HP/UX 0 (%@#!) writes to sscanf strings */ - tmp_version = g_strdup("$min_gtkmm_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_gtkmm_version"); - exit(1); - } - - if ((gtkmm_major_version != $gtkmm_config_major_version) || - (gtkmm_minor_version != $gtkmm_config_minor_version) || - (gtkmm_micro_version != $gtkmm_config_micro_version)) - { - printf("\n*** 'gtkmm-config --version' returned %d.%d.%d, but GTK-- (%d.%d.%d)\n", - $gtkmm_config_major_version, $gtkmm_config_minor_version, $gtkmm_config_micro_version, - gtkmm_major_version, gtkmm_minor_version, gtkmm_micro_version); - printf ("*** was found! If gtkmm-config was correct, then it is best\n"); - printf ("*** to remove the old version of GTK--. You may also be able to fix the error\n"); - printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); - printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); - printf("*** required on your system.\n"); - printf("*** If gtkmm-config was wrong, set the environment variable GTKMM_CONFIG\n"); - printf("*** to point to the correct copy of gtkmm-config, and remove the file config.cache\n"); - printf("*** before re-running configure\n"); - } -/* GTK-- does not have the GTKMM_*_VERSION constants */ -/* - else if ((gtkmm_major_version != GTKMM_MAJOR_VERSION) || - (gtkmm_minor_version != GTKMM_MINOR_VERSION) || - (gtkmm_micro_version != GTKMM_MICRO_VERSION)) - { - printf("*** GTK-- header files (version %d.%d.%d) do not match\n", - GTKMM_MAJOR_VERSION, GTKMM_MINOR_VERSION, GTKMM_MICRO_VERSION); - printf("*** library (version %d.%d.%d)\n", - gtkmm_major_version, gtkmm_minor_version, gtkmm_micro_version); - } -*/ - else - { - if ((gtkmm_major_version > major) || - ((gtkmm_major_version == major) && (gtkmm_minor_version > minor)) || - ((gtkmm_major_version == major) && (gtkmm_minor_version == minor) && (gtkmm_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** An old version of GTK-- (%d.%d.%d) was found.\n", - gtkmm_major_version, gtkmm_minor_version, gtkmm_micro_version); - printf("*** You need a version of GTK-- newer than %d.%d.%d. The latest version of\n", - major, minor, micro); - printf("*** GTK-- is always available from ftp://ftp.gtk.org.\n"); - printf("***\n"); - printf("*** If you have already installed a sufficiently new version, this error\n"); - printf("*** probably means that the wrong copy of the gtkmm-config shell script is\n"); - printf("*** being found. The easiest way to fix this is to remove the old version\n"); - printf("*** of GTK--, but you can also set the GTKMM_CONFIG environment to point to the\n"); - printf("*** correct copy of gtkmm-config. (In this case, you will have to\n"); - printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); - printf("*** so that the correct libraries are found at run-time))\n"); - } - } - return 1; -} -],, no_gtkmm=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CXXFLAGS="$ac_save_CXXFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_gtkmm" = x ; then - AC_MSG_RESULT(yes) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) - if test "$GTKMM_CONFIG" = "no" ; then - echo "*** The gtkmm-config script installed by GTK-- could not be found" - echo "*** If GTK-- was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the GTK_CONFIG environment variable to the" - echo "*** full path to gtk-config." - echo "*** The gtkmm-config script was not available in GTK-- versions" - echo "*** prior to 0.9.12. Perhaps you need to update your installed" - echo "*** version to 0.9.12 or newer" - else - if test -f conf.gtkmmtest ; then - : - else - echo "*** Could not run GTK-- test program, checking why..." - CXXFLAGS="$CFLAGS $GTKMM_CXXFLAGS" - LIBS="$LIBS $GTK___LIBS" - AC_TRY_LINK([ -#include -#include -], [ return ((gtkmm_major_version) || (gtkmm_minor_version) || (gtkmm_micro_version)); ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding GTK-- or finding the wrong" - echo "*** version of GTK--. If it is not finding GTK--, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means GTK-- was incorrectly installed" - echo "*** or that you have moved GTK-- since it was installed. In the latter case, you" - echo "*** may want to edit the gtkmm-config script: $GTKMM_CONFIG" ]) - CXXFLAGS="$ac_save_CXXFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - GTK___CFLAGS="" - GTK__LIBS="" - ifelse([$3], , :, [$3]) - AC_LANG_RESTORE - fi - AC_SUBST(GTK___CFLAGS) - AC_SUBST(GTK___LIBS) - rm -f conf.gtkmmtest -]) - -# Configure paths for GTK--DRAW -# Derek Quinn Wyatt 98-08-21 (adapted from Jan Nieuwenhuizen's code) - -dnl AM_PATH_GTK__DRAW([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) -dnl Test for GTK--DRAW, and define GTK___CFLAGS and GTK___LIBS -dnl -AC_DEFUN(AM_PATH_GTK__DRAW, -[dnl -dnl Get the cflags and libraries from the gtk__-config script -dnl - AC_PATH_PROG(GTKMM_CONFIG, gtkmm-config, no) - min_gtk___version=ifelse([$1], ,0.0.5,$1) - AC_MSG_CHECKING(for GTK--DRAW - version >= $min_gtk___version) - no_gtk__="" - if test "$GTKMM_CONFIG" != "no" ; then - GTK___CFLAGS=`$GTKMM_CONFIG --cflags` - GTK___LIBS=`$GTKMM_CONFIG --libs` - GTK___DLIBS="$GTK___LIBS -lgtkmmdraw" - GTK___LIBS="$GTK___DLIBS" - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - ac_save_CXXFLAGS="$CXXFLAGS" - CFLAGS="$CFLAGS $GTK___CFLAGS" - CXXFLAGS="$CXXFLAGS $GTK___CFLAGS" - LIBS="$LIBS $GTK___LIBS" -dnl -dnl Now check if the installed GTK__ is sufficiently new. (Also sanity -dnl checks the results of gtk__-config to some extent) -dnl - AC_TRY_RUN([ -#include -#include - -int -main () -{ - // urg - return 0; -} -],, no_gtk__=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - CXXFLAGS="$ac_save_CXXFLAGS" - LIBS="$ac_save_LIBS" - else - no_gtk__=yes - fi - if test "x$no_gtk__" = x ; then - AC_MSG_RESULT(yes) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) - GTK___CFLAGS="" - GTK___LIBS="" - ifelse([$3], , :, [$3]) - fi - CXXFLAGS="$CXXFLAGS $GTK___CFLAGS" - AC_SUBST(CXXFLAGS) - AC_SUBST(GTK___CFLAGS) - AC_SUBST(GTK___LIBS) -]) diff --git a/stepmake/bin/install-sh b/stepmake/bin/install-sh index 398f7f861e..e9de23842d 100755 --- a/stepmake/bin/install-sh +++ b/stepmake/bin/install-sh @@ -1,18 +1,27 @@ -#! /bin/sh - -# ugr. Why $#^&@ does configure need this? - +#!/bin/sh # # install - install a program, script, or datafile -# This comes from X11R5. +# This comes from X11R5 (mit/util/scripts/install.sh). +# +# Copyright 1991 by the Massachusetts Institute of Technology +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of M.I.T. not be used in advertising or +# publicity pertaining to distribution of the software without specific, +# written prior permission. M.I.T. makes no representations about the +# suitability of this software for any purpose. It is provided "as is" +# without express or implied warranty. # # Calling this script install-sh is preferred over install.sh, to prevent # `make' implicit rules from creating a file called install from it # when there is no Makefile. # # This script is compatible with the BSD install script, but was written -# from scratch. -# +# from scratch. It can only install one file at a time, a restriction +# shared with many OS's install programs. # set DOITPROG to echo to test this script @@ -109,6 +118,7 @@ if [ x"$dir_arg" != x ]; then if [ -d $dst ]; then instcmd=: + chmodcmd="" else instcmd=mkdir fi diff --git a/stepmake/configure b/stepmake/configure index f624893794..eb3b58d45d 100755 --- a/stepmake/configure +++ b/stepmake/configure @@ -1,58 +1,5 @@ #! /bin/sh -ac_help="$ac_help - --with-gtkmm-prefix=PREFIX - Prefix where GTK-- is installed (optional)" -# Check whether --with-gtkmm-prefix or --without-gtkmm-prefix was given. -if test "${with_gtkmm_prefix+set}" = set; then - withval="$with_gtkmm_prefix" - gtkmm_config_prefix="$withval" -else - gtkmm_config_prefix="" -fi - -ac_help="$ac_help - --with-gtkmm-exec-prefix=PREFIX - Exec prefix where GTK-- is installed (optional)" -# Check whether --with-gtkmm-exec-prefix or --without-gtkmm-exec-prefix was given. -if test "${with_gtkmm_exec_prefix+set}" = set; then - withval="$with_gtkmm_exec_prefix" - gtkmm_config_exec_prefix="$withval" -else - gtkmm_config_exec_prefix="" -fi - -ac_help="$ac_help - --disable-gtkmmtest Do not try to compile and run a test GTK-- program" -# Check whether --enable-gtkmmtest or --disable-gtkmmtest was given. -if test "${enable_gtkmmtest+set}" = set; then - enableval="$enable_gtkmmtest" - : -else - enable_gtkmmtest=yes -fi - - - if test x$gtkmm_config_exec_prefix != x ; then - gtkmm_config_args="$gtkmm_config_args --exec-prefix=$gtkmm_config_exec_prefix" - if test x${GTKMM_CONFIG+set} != xset ; then - GTKMM_CONFIG=$gtkmm_config_exec_prefix/bin/gtkmm-config - fi - fi - if test x$gtkmm_config_prefix != x ; then - gtkmm_config_args="$gtkmm_config_args --prefix=$gtkmm_config_prefix" - if test x${GTKMM_CONFIG+set} != xset ; then - GTKMM_CONFIG=$gtkmm_config_prefix/bin/gtkmm-config - fi - fi - - - - -# Configure paths for GTK--DRAW -# Derek Quinn Wyatt 98-08-21 (adapted from Jan Nieuwenhuizen's code) - - # Guess values for system-dependent variables and create Makefiles. # Generated automatically using autoconf version 2.13 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. @@ -615,12 +562,12 @@ fi fi echo $ac_n "checking Package""... $ac_c" 1>&6 -echo "configure:619: checking Package" >&5 +echo "configure:566: checking Package" >&5 if test "x$PACKAGE" = "xSTEPMAKE"; then echo "$ac_t""Stepmake package!" 1>&6 echo $ac_n "checking builddir""... $ac_c" 1>&6 -echo "configure:624: checking builddir" >&5 +echo "configure:571: checking builddir" >&5 if test "$srcdir" = "."; then builddir=. else @@ -657,7 +604,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. echo "$ac_t""$PACKAGE" 1>&6 echo $ac_n "checking builddir""... $ac_c" 1>&6 -echo "configure:661: checking builddir" >&5 +echo "configure:608: checking builddir" >&5 if test "$srcdir" = "."; then builddir=. srcdir_build=no @@ -677,7 +624,7 @@ echo "configure:661: checking builddir" >&5 fi echo $ac_n "checking for stepmake""... $ac_c" 1>&6 -echo "configure:681: checking for stepmake" >&5 +echo "configure:628: checking for stepmake" >&5 # Check for installed stepmake if test -d $stepmake; then echo "$ac_t""$stepmake" 1>&6 @@ -788,6 +735,8 @@ if test "${enable_config+set}" = set; then fi + ##' + test -n "$CONFIGURATION" && CONFIGSUFFIX="-$CONFIGURATION" CONFIGFILE=config$CONFIGSUFFIX @@ -799,7 +748,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:803: checking host system type" >&5 +echo "configure:752: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -819,12 +768,13 @@ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$host" 1>&6 + for ac_prog in gmake make do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:828: checking for $ac_word" >&5 +echo "configure:778: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MAKE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -852,14 +802,43 @@ fi test -n "$MAKE" && break done -test -n "$MAKE" || MAKE="error" +test -n "$MAKE" || MAKE="no" + + #if test "`eval echo '$'"MAKE"`" = "no"; then + + r="`eval echo '$'"MAKE"`" + if test -n "$r" -a "$r" != "error" -a "$r" != "no" && ! expr '`eval echo '$'"MAKE"`' : '.*\(echo\)' > /dev/null; then + ##STEPMAKE_WARN(cannot find . ) + false + else + true + fi + + if test $? -ne 0; then + + eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \"gmake make\"`\" + + if test "REQUIRED" = "REQUIRED"; then + command="echo ERROR: gmake make not found" + # abort configure process here? + else + command="- echo gmake make not found" + fi + eval "MAKE"='$command' + false + else + true + fi + + + for ac_prog in find do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:863: checking for $ac_word" >&5 +echo "configure:842: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_FIND'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -887,16 +866,44 @@ fi test -n "$FIND" && break done -test -n "$FIND" || FIND="error" +test -n "$FIND" || FIND="no" + + + #if test "`eval echo '$'"FIND"`" = "no"; then + + r="`eval echo '$'"FIND"`" + if test -n "$r" -a "$r" != "error" -a "$r" != "no" && ! expr '`eval echo '$'"FIND"`' : '.*\(echo\)' > /dev/null; then + ##STEPMAKE_WARN(cannot find . ) + false + else + true + fi + if test $? -ne 0; then + + eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \"find\"`\" + if test "REQUIRED" = "REQUIRED"; then + command="echo ERROR: find not found" + # abort configure process here? + else + command="- echo find not found" + fi + eval "FIND"='$command' + false + else + true + fi + + + for ac_prog in tar do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:900: checking for $ac_word" >&5 +echo "configure:907: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_TAR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -924,14 +931,42 @@ fi test -n "$TAR" && break done -test -n "$TAR" || TAR="error" +test -n "$TAR" || TAR="no" + + + #if test "`eval echo '$'"TAR"`" = "no"; then + + r="`eval echo '$'"TAR"`" + if test -n "$r" -a "$r" != "error" -a "$r" != "no" && ! expr '`eval echo '$'"TAR"`' : '.*\(echo\)' > /dev/null; then + ##STEPMAKE_WARN(cannot find . ) + false + else + true + fi + + if test $? -ne 0; then + + eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \"tar\"`\" + + if test "REQUIRED" = "REQUIRED"; then + command="echo ERROR: tar not found" + # abort configure process here? + else + command="- echo tar not found" + fi + eval "TAR"='$command' + false + else + true + fi + if test "x`uname`" = "xHP-UX"; then # Extract the first word of "bash", so it can be a program name with args. set dummy bash; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:935: checking for $ac_word" >&5 +echo "configure:970: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_BASH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -971,7 +1006,7 @@ fi # Extract the first word of "bash", so it can be a program name with args. set dummy bash; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:975: checking for $ac_word" >&5 +echo "configure:1010: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_SHELL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1008,7 +1043,7 @@ fi # Extract the first word of "bash", so it can be a program name with args. set dummy bash; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1012: checking for $ac_word" >&5 +echo "configure:1047: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_BASH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1045,11 +1080,75 @@ fi fi + + for ac_prog in python +do +# Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1090: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_PYTHON'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$PYTHON"; then + ac_cv_prog_PYTHON="$PYTHON" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_PYTHON="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +PYTHON="$ac_cv_prog_PYTHON" +if test -n "$PYTHON"; then + echo "$ac_t""$PYTHON" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$PYTHON" && break +done +test -n "$PYTHON" || PYTHON="no" + + + #if test "`eval echo '$'"PYTHON"`" = "no"; then + + r="`eval echo '$'"PYTHON"`" + if test -n "$r" -a "$r" != "error" -a "$r" != "no" && ! expr '`eval echo '$'"PYTHON"`' : '.*\(echo\)' > /dev/null; then + ##STEPMAKE_WARN(cannot find . ) + false + else + true + fi + + if test $? -ne 0; then + + eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \"python\"`\" + + if test "REQUIRED" = "REQUIRED"; then + command="echo ERROR: python not found" + # abort configure process here? + else + command="- echo python not found" + fi + eval "PYTHON"='$command' + false + else + true + fi - # Extract the first word of "${PYTHON:-python}", so it can be a program name with args. -set dummy ${PYTHON:-python}; ac_word=$2 +# if ! expr '`eval echo '$'"PYTHON"`' : '.*\(echo\)' > /dev/null; then + if test $? -ne 0; then + # Extract the first word of "python", so it can be a program name with args. +set dummy python; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1053: checking for $ac_word" >&5 +echo "configure:1152: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1071,7 +1170,6 @@ else fi done IFS="$ac_save_ifs" - test -z "$ac_cv_path_PYTHON" && ac_cv_path_PYTHON="-echo no python" ;; esac fi @@ -1082,58 +1180,28 @@ else echo "$ac_t""no" 1>&6 fi - + fi - if test $MAKE != "error" ; then - $MAKE -v 2> /dev/null | grep GNU > /dev/null - if test "$?" = 1 - then - - echo "configure: warning: Please install *GNU* make" 1>&2 - warn_b=yes - - fi - fi - - result="`echo \"$PYTHON\" | grep echo`" - if test "x$PYTHON" = "xerror" -o "x$result" != "x"; then - - echo "configure: warning: can\'t find python. You should install Python" 1>&2 + if expr "$MAKE" : '.*\(echo\)' >/dev/null; then + $MAKE -v 2> /dev/null | grep GNU > /dev/null + if test "$?" = 1; then + warn='make (Please install *GNU* make)' + + echo "configure: warning: $warn" 1>&2 warn_b=yes - fi + + eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \"$warn\"`\" + fi + fi - if test "x$OSTYPE" = "xcygwin32" || test "x$OSTYPE" = "xWindows_NT"; then + if test "$OSTYPE" = "cygwin" -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 - # urg - # ROOTSEP=':' - # DIRSEP='\\' - # PATHSEP=';' - # - # cygwin fixes all these things. - # it seems these were used because of dos-style TEXINPUTS and - # MFINPUTS needed for miktex. - # but this breaks parsing of all other cygwin/unix style paths. - # - # if your (mik)tex breaks, make a: - # /usr/local/bin/tex: - # #!/bin/sh - # TEXINPUTS=`cygpath -pw $TEXINPUTS` /texmf/miktex/bin/tex - # - # and - # - # /usr/local/bin/mf: - # #!/bin/sh - # MFINPUTS=`cygpath -pw $MFINPUTS` /texmf/miktex/bin/mf - # - # this way, you may have buildscripts/out/lilypond-profile - # 'automatically' sourced from /usr/etc/profile.d/ too. - # ROOTSEP=':' DIRSEP='/' PATHSEP=':' @@ -1190,14 +1258,14 @@ EOF # AC_CONFIG_SUBDIRS(stepmake) # Uncomment the configuration options your package needs. -# AC_STEPMAKE_COMPILE +# STEPMAKE_COMPILE # AC_HAVE_HEADERS(limits.h malloc.h string.h unistd.h values.h) -# AC_STEPMAKE_CXX -# AC_STEPMAKE_GXX -# AC_STEPMAKE_CXXTEMPLATE -# AC_STEPMAKE_LEXYACC -# AC_STEPMAKE_LIB -# AC_STEPMAKE_LIBTOOL +# STEPMAKE_CXX +# STEPMAKE_GXX +# STEPMAKE_CXXTEMPLATE +# STEPMAKE_LEXYACC +# STEPMAKE_LIB +# STEPMAKE_LIBTOOL lang=English ALL_LINGUAS="en nl" @@ -1222,7 +1290,7 @@ fi echo $ac_n "checking language""... $ac_c" 1>&6 -echo "configure:1226: checking language" >&5 +echo "configure:1294: checking language" >&5 case "$language" in En* | en* | Am* | am* | US* | us*) lang=English;; @@ -1243,11 +1311,11 @@ echo "configure:1226: checking language" >&5 fi -# AC_STEPMAKE_GETTEXT -# AC_STEPMAKE_MAN -# AC_STEPMAKE_MSGFMT -# AC_STEPMAKE_TEXMF -# AC_STEPMAKE_TEXMF_DIRS +# STEPMAKE_GETTEXT +# STEPMAKE_MAN +# STEPMAKE_MSGFMT +# STEPMAKE_TEXMF +# STEPMAKE_TEXMF_DIRS # AM_PATH_GTK(1.0.0,,AC_MSG_ERROR([please install proper version of gtk])) # AM_PATH_GTK__(0.9.4,,AC_MSG_ERROR([please install proper version of gtk--])) @@ -1257,7 +1325,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1261: checking for $ac_word" >&5 +echo "configure:1329: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MAKEINFO'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1289,6 +1357,9 @@ test -n "$MAKEINFO" || MAKEINFO="error" + + + trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure @@ -1449,6 +1520,8 @@ s%@PATHSEP@%$PATHSEP%g s%@DIRSEP@%$DIRSEP%g s%@DIR_DATADIR@%$DIR_DATADIR%g s%@MAKEINFO@%$MAKEINFO%g +s%@OPTIONAL@%$OPTIONAL%g +s%@REQUIRED@%$REQUIRED%g CEOF EOF @@ -1664,6 +1737,28 @@ rm -fr confdefs* $ac_clean_files test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 + + if test -n "$OPTIONAL"; then + echo + echo "WARNING: Please consider installing optional programs: $OPTIONAL" + fi + + if test -n "$REQUIRED"; then + echo + echo "ERROR: Please install required programs: $REQUIRED" + fi + + if test -n "$OPTIONAL$REQUIRED"; then + echo + echo "See INSTALL.txt for more information on how to build $PACKAGE_NAME" + echo "Remove config.cache before rerunning ./configure" + fi + + if test -n "$REQUIRED"; then + rm -f $srcdir/GNUmakefile + exit 1 + fi + # regular in-place build # test for srcdir_build = yes ? if test "$builddir" = "."; then diff --git a/stepmake/configure.in b/stepmake/configure.in index e4907b1a8c..1d1c3c8865 100644 --- a/stepmake/configure.in +++ b/stepmake/configure.in @@ -6,30 +6,30 @@ AC_INIT(make/stepmake.lsm.in) AC_CONFIG_HEADER($CONFIGFILE.h:config.hh.in) # Bootstrap StepMake configure -AC_STEPMAKE_INIT +STEPMAKE_INIT # For all packages except the StepMake package itself # AC_CONFIG_SUBDIRS(stepmake) # Uncomment the configuration options your package needs. -# AC_STEPMAKE_COMPILE +# STEPMAKE_COMPILE # AC_HAVE_HEADERS(limits.h malloc.h string.h unistd.h values.h) -# AC_STEPMAKE_CXX -# AC_STEPMAKE_GXX -# AC_STEPMAKE_CXXTEMPLATE -# AC_STEPMAKE_LEXYACC -# AC_STEPMAKE_LIB -# AC_STEPMAKE_LIBTOOL -AC_STEPMAKE_LOCALE -# AC_STEPMAKE_GETTEXT -# AC_STEPMAKE_MAN -# AC_STEPMAKE_MSGFMT -# AC_STEPMAKE_TEXMF -# AC_STEPMAKE_TEXMF_DIRS +# STEPMAKE_CXX +# STEPMAKE_GXX +# STEPMAKE_CXXTEMPLATE +# STEPMAKE_LEXYACC +# STEPMAKE_LIB +# STEPMAKE_LIBTOOL +STEPMAKE_LOCALE +# STEPMAKE_GETTEXT +# STEPMAKE_MAN +# STEPMAKE_MSGFMT +# STEPMAKE_TEXMF +# STEPMAKE_TEXMF_DIRS # AM_PATH_GTK(1.0.0,,AC_MSG_ERROR([please install proper version of gtk])) # AM_PATH_GTK__(0.9.4,,AC_MSG_ERROR([please install proper version of gtk--])) AC_CHECK_PROGS(MAKEINFO, makeinfo, error) -AC_STEPMAKE_END +STEPMAKE_END -- 2.39.2