Make autogen.sh use the ax_ prefix for m4 lookup.

diff --git a/autogen.sh b/autogen.sh
index d194906e01b690cbdee256ae30269fd0b0c11aa3..e307073096187649192f29828b1070448309dd72 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -16,7 +16,7 @@ case `uname` in
 esac
 aclocal
 sed -e 's/AC_PROG_AWK/dnl &/' -i aclocal.m4
 esac
 aclocal
 sed -e 's/AC_PROG_AWK/dnl &/' -i aclocal.m4

-cat `aclocal --print-ac-dir`/check_gnu_make.m4 !(aclocal).m4 >> aclocal.m4
+cat `aclocal --print-ac-dir`/ax_check_gnu_make.m4 !(aclocal).m4 >> aclocal.m4

 function filter()
 {
        sed -e '/no proper invocation of AM_INIT_AUTOMAKE was found\./d' \
 function filter()
 {
        sed -e '/no proper invocation of AM_INIT_AUTOMAKE was found\./d' \

diff --git a/configure.ac b/configure.ac
index 43ca9756ce00d8fa3aca55780cd9ec9c1c65cd8d..6cf476e5200ba39024e02df7c3a613fe0482f863 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ AC_CONFIG_SRCDIR([Console.cpp])
 AC_CONFIG_AUX_DIR([.])
 LT_INIT([disable-static])
 PKG_PROG_PKG_CONFIG([0.22])
 AC_CONFIG_AUX_DIR([.])
 LT_INIT([disable-static])
 PKG_PROG_PKG_CONFIG([0.22])

-CHECK_GNU_MAKE
+AX_CHECK_GNU_MAKE

 AC_SUBST([GMAKE], [$_cv_gnu_make_command])
 AC_SUBST([LTFLAGS])
 AS_IF([test "x$GMAKE" = x], [AC_MSG_ERROR([You need GNU make])])
 AC_SUBST([GMAKE], [$_cv_gnu_make_command])
 AC_SUBST([LTFLAGS])
 AS_IF([test "x$GMAKE" = x], [AC_MSG_ERROR([You need GNU make])])