X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=stepmake%2Faclocal.m4;h=d0910b11b301eb263bfd65c47aadb01baed2e4cf;hb=36079063504b59027cdd84e36a1fc9e2bfc4fc76;hp=b63198794a9abc035b6b9fb951ade8e0056e43a7;hpb=f72ce2054b73324ccc4f5c09640b044ce130988e;p=lilypond.git

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index b63198794a..d0910b11b3 100644
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -193,7 +193,7 @@ AC_DEFUN(STEPMAKE_COMPILE, [
 ])
 
 AC_DEFUN(STEPMAKE_CXX, [
-    AC_LANG_CPLUSPLUS
+    AC_LANG([C++])
     AC_PROG_CXX
     STEPMAKE_OPTIONAL_REQUIRED(CXX, c++, $1)
 
@@ -248,7 +248,8 @@ AC_DEFUN(STEPMAKE_END, [
     AC_SUBST(OPTIONAL)
     AC_SUBST(REQUIRED)
     
-    AC_OUTPUT($CONFIGFILE.make:config.make.in)
+    AC_CONFIG_FILES([$CONFIGFILE.make:config.make.in])
+AC_OUTPUT
 
     
     if test -n "$OPTIONAL"; then
@@ -291,7 +292,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_DECL_YYTEXT
+    # AC_PROG_LEX()
     # ugh, ugh
     ac_cv_prog_lex_root=lex.yy
     STEPMAKE_PROGS(FLEX, flex, $1)
@@ -299,7 +300,7 @@ AC_DEFUN(STEPMAKE_FLEX, [
 
 
 AC_DEFUN(STEPMAKE_FLEXLEXER, [
-    AC_HAVE_HEADERS(FlexLexer.h, true, false)
+    AC_CHECK_HEADERS([FlexLexer.h],[true],[false])
     if test $? -ne 0; then
 	warn='FlexLexer.h (flex package)'
 	STEPMAKE_ADD_ENTRY($1, $warn)
@@ -618,9 +619,9 @@ AC_DEFUN(STEPMAKE_KPATHSEA, [
     [kpathsea_b=$with_kpathsea])
 
     if test "$kpathsea_b" != "no"; then	
-	AC_HAVE_HEADERS(kpathsea/kpathsea.h)
+	AC_CHECK_HEADERS([kpathsea/kpathsea.h])
 	AC_CHECK_LIB(kpathsea, kpse_find_file)
-	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.))
+	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.]))
     fi
     AC_MSG_CHECKING(whether to use kpathsea)
     if test "$kpathsea_b" != no; then
@@ -770,7 +771,7 @@ AC_DEFUN(STEPMAKE_PERL, [
 
 
 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, PYTHON_HEADER=yes)
+    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])
     if test -z "$PYTHON_HEADER"; then
 	warn='python.h (python-devel, python-dev or libpython-dev package)'
 	STEPMAKE_ADD_ENTRY($1, $warn)