Ooops. More fixes needed.

diff --git a/aclocal.glob b/aclocal.glob
index 66358faef884b6cac5674a6bdcf897380125eca5..5cbf245286945af19147da47299ac6fdddf7b7e2 100644 (file)
--- a/aclocal.glob
+++ b/aclocal.glob
@@ -230,7 +230,7 @@ dnl         variable actually works and is of the right version.  If it's
 dnl            not, an error is raised and configuration is aborted.
 
 AC_DEFUN([mdw_CHECK_PYTHON],
 dnl            not, an error is raised and configuration is aborted.
 
 AC_DEFUN([mdw_CHECK_PYTHON],

-[mdw_REQUIRE([mdw_PROG_PYTHON], [mdw_PROG_PYTHON([$1])])
+[AC_REQUIRE([mdw_PROG_PYTHON], [mdw_PROG_PYTHON([$1])])

 AC_MSG_CHECKING([whether Python ($PYTHON) works])
 if test "$PYTHON" != "none" && mdw__PYTHON_VERSION("$PYTHON", $1); then
   AC_MSG_RESULT([yes])
 AC_MSG_CHECKING([whether Python ($PYTHON) works])
 if test "$PYTHON" != "none" && mdw__PYTHON_VERSION("$PYTHON", $1); then
   AC_MSG_RESULT([yes])


@@ -311,7 +311,7 @@ dnl         variable actually works and is of the right version.  If it's
 dnl            not, an error is raised and configuration is aborted.
 
 AC_DEFUN([mdw_CHECK_PERL],
 dnl            not, an error is raised and configuration is aborted.
 
 AC_DEFUN([mdw_CHECK_PERL],

-[mdw_REQUIRE([mdw_PROG_PERL], [mdw_PROG_PERL([$1])])
+[AC_REQUIRE([mdw_PROG_PERL], [mdw_PROG_PERL([$1])])

 AC_MSG_CHECKING([whether Perl ($PERL) works])
 if test "$PERL" != "none" && mdw__PERL_VERSION("$PERL", $1); then
   AC_MSG_RESULT([yes])
 AC_MSG_CHECKING([whether Perl ($PERL) works])
 if test "$PERL" != "none" && mdw__PERL_VERSION("$PERL", $1); then
   AC_MSG_RESULT([yes])


@@ -349,7 +349,7 @@ AC_SUBST(NEEDED_PERLLIBS)dnl
 
 AC_DEFUN([mdw_PERLLIB_CHECK],
 [AC_REQUIRE([mdw__PERLLIB_INIT])
 
 AC_DEFUN([mdw_PERLLIB_CHECK],
 [AC_REQUIRE([mdw__PERLLIB_INIT])

-mdw_REQUIRE([mdw_CHECK_PERL], [mdw_PROG_PERL([5])])
+AC_REQUIRE([mdw_CHECK_PERL], [mdw_PROG_PERL([5])])

 AC_CACHE_CHECK([for Perl library $1], mdw_cv_perllib_$1,
 [if $PERL -e 'use $1;' >&5 2>&5; then
   mdw_cv_perllib_$1="yes"
 AC_CACHE_CHECK([for Perl library $1], mdw_cv_perllib_$1,
 [if $PERL -e 'use $1;' >&5 2>&5; then
   mdw_cv_perllib_$1="yes"


@@ -490,7 +490,7 @@ dnl
 dnl Use:       Configures an mgLib client program.
 
 AC_DEFUN([mdw_MGLIB],
 dnl Use:       Configures an mgLib client program.
 
 AC_DEFUN([mdw_MGLIB],

-[mdw_REQUIRE([mdw_MLIB], [mdw_MLIB([2.0.3])])
+[AC_REQUIRE([mdw_MLIB], [mdw_MLIB([2.0.3])])

 mdw_LIB_CONFIG(mgLib, mgLib, $@)])
 
 dnl --- *@-mdw_CATACOMB-@* ---
 mdw_LIB_CONFIG(mgLib, mgLib, $@)])
 
 dnl --- *@-mdw_CATACOMB-@* ---


@@ -506,7 +506,7 @@ dnl
 dnl Use:       Configures the program as a Catacomb client.
 
 AC_DEFUN([mdw_CATACOMB],
 dnl Use:       Configures the program as a Catacomb client.
 
 AC_DEFUN([mdw_CATACOMB],

-[mdw_REQUIRE([mdw_MLIB], [mdw_MLIB([2.0.3])])
+[AC_REQUIRE([mdw_MLIB], [mdw_MLIB([2.0.3])])

 mdw_LIB_CONFIG(catacomb, Catacomb, $@)])
 
 dnl --- *@-mdw_PK-@* ---
 mdw_LIB_CONFIG(catacomb, Catacomb, $@)])
 
 dnl --- *@-mdw_PK-@* ---


@@ -522,7 +522,7 @@ dnl
 dnl Use:       Configures the program as a PK client.
 
 AC_DEFUN([mdw_PK],
 dnl Use:       Configures the program as a PK client.
 
 AC_DEFUN([mdw_PK],

-[mdw_REQUIRE([mdw_MLIB], [mdw_MLIB([2.0.3])])
+[AC_REQUIRE([mdw_MLIB], [mdw_MLIB([2.0.3])])

 mdw_LIB_CONFIG(pk, PK, $@)])
 
 dnl --- *@-mdw_OPT_NDEBUG-@* ---
 mdw_LIB_CONFIG(pk, PK, $@)])
 
 dnl --- *@-mdw_OPT_NDEBUG-@* ---