diff options
| author | Jan Nieuwenhuizen <janneke@gnu.org> | 2002-06-18 15:46:03 +0000 |
|---|---|---|
| committer | Jan Nieuwenhuizen <janneke@gnu.org> | 2002-06-18 15:46:03 +0000 |
| commit | 38655bc28e73a0b218ba1582bdb84bab0fdfec4b (patch) | |
| tree | 44f9049304684992b7587ef01cb410f2e0e6b69a /aclocal.m4 | |
| parent | 17912cfaa97a8c3159026435db295c055a977270 (diff) | |
* Documentation/windows/zlily-profile.sh:
* Documentation/windows/post-lilypond.sh: Assume normal
prefix=/usr for lilypond.
* lily/musical-request.cc (length_mom): Display origin with error.
* lily/lily-guile.cc (ly_pair_p): [PARANOID]: Check for freed
cells.
* lily/part-combine-music-iterator.cc (get_state): Bugfix: use
ly_symbol2scm to get a scm symbol (rather than ly_str02scm).
* aclocal.m4:
* autogen.sh: Regenerate.
* Documentation/topdocs/INSTALL.texi:
* configure.in:
* stepmake/configure.in:
* stepmake/aclocal.m4: Revert autoconf upgrade. Autoconf 2.53 has
a serious bug wrt AC_CONFIG_AUX_DIR (reported). Creating
./configure once again requires autoconf == 2.13.
* stepmake/autogen.sh: Check for autoconf == 2.13.
Diffstat (limited to 'aclocal.m4')
| -rw-r--r-- | aclocal.m4 | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index cf597f3789..13de08358c 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -196,7 +196,7 @@ AC_DEFUN(STEPMAKE_COMPILE, [ ]) AC_DEFUN(STEPMAKE_CXX, [ - AC_LANG([C++]) + AC_LANG_CPLUSPLUS AC_PROG_CXX STEPMAKE_OPTIONAL_REQUIRED(CXX, c++, $1) @@ -251,8 +251,7 @@ AC_DEFUN(STEPMAKE_END, [ AC_SUBST(OPTIONAL) AC_SUBST(REQUIRED) - AC_CONFIG_FILES([$CONFIGFILE.make:config.make.in]) -AC_OUTPUT + AC_OUTPUT($CONFIGFILE.make:config.make.in) if test -n "$OPTIONAL"; then @@ -295,7 +294,7 @@ AC_DEFUN(STEPMAKE_FLEX, [ # AC_PROG_LEX # urg: automake 1.3: hope this doesn't break 1.2 ac_cv_pro_lex_root hack... - # AC_PROG_LEX() + # AC_DECL_YYTEXT # ugh, ugh ac_cv_prog_lex_root=lex.yy STEPMAKE_PROGS(FLEX, flex, $1) @@ -303,7 +302,7 @@ AC_DEFUN(STEPMAKE_FLEX, [ AC_DEFUN(STEPMAKE_FLEXLEXER, [ - AC_CHECK_HEADERS([FlexLexer.h],[true],[false]) + AC_HAVE_HEADERS(FlexLexer.h, true, false) if test $? -ne 0; then warn='FlexLexer.h (flex package)' STEPMAKE_ADD_ENTRY($1, $warn) @@ -622,9 +621,9 @@ AC_DEFUN(STEPMAKE_KPATHSEA, [ [kpathsea_b=$with_kpathsea]) if test "$kpathsea_b" != "no"; then - AC_CHECK_HEADERS([kpathsea/kpathsea.h]) + AC_HAVE_HEADERS(kpathsea/kpathsea.h) AC_CHECK_LIB(kpathsea, kpse_find_file) - AC_CHECK_FUNCS(kpse_find_file,, AC_MSG_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.])) + AC_CHECK_FUNCS(kpse_find_file,, AC_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.)) fi AC_MSG_CHECKING(whether to use kpathsea) if test "$kpathsea_b" != no; then @@ -774,7 +773,7 @@ AC_DEFUN(STEPMAKE_PERL, [ AC_DEFUN(STEPMAKE_PYTHON_DEVEL, [ - AC_CHECK_HEADERS([python2.2/Python.h python2.1/Python.h python2.0/Python.h python2/Python.h python/Python.h python1.5/Python.h Python.h],[PYTHON_HEADER=yes]) + 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, PYTHON_HEADER=yes) if test -z "$PYTHON_HEADER"; then warn='python.h (python-devel, python-dev or libpython-dev package)' STEPMAKE_ADD_ENTRY($1, $warn) |