*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 0dba09ea8586f7dfe0779e3fd1aa0140a8187f3d..928795087e5395b8450f36bff6564774b341b7b1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 2003-06-08  Jan Nieuwenhuizen  <janneke@gnu.org>
 
-       * stepmake/aclocal.m4 (STEPMAKE_CHECK_VERSION_SUPPORT): New
+       * stepmake/aclocal.m4 (STEPMAKE_CHECK_VERSION_UNSUPPORTED): New
        function.
        (STEPMAKE_GETTEXT): If g++ >= 3.3, use gcc for gettext checking.
 

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index 079bd0e4daea76b330a64532d0ee924f1f0b7692..4f568bb8e0a79a098fe1ac7d9e3d9d939114e603 100644 (file)
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -97,9 +97,9 @@ AC_DEFUN(STEPMAKE_CHECK_VERSION, [
 ])
 
 # Check version of program ($1)
-# If version is greater than or equals requested ($3),
+# If version is greater than or equals unsupported ($3),
 # add entry to unsupported list ($2, 'UNSUPPORTED')
-AC_DEFUN(STEPMAKE_CHECK_VERSION_SUPPORT, [
+AC_DEFUN(STEPMAKE_CHECK_VERSION_UNSUPPORTED, [
     r="`eval echo '$'"$1"`"
     AC_MSG_CHECKING([$r version])
     exe=`STEPMAKE_GET_EXECUTABLE($r)`
@@ -308,13 +308,13 @@ AC_DEFUN(STEPMAKE_END, [
         echo "ERROR: Please use older version of programs: $UNSUPPORTED"
     fi
     
-    if test -n "$OPTIONAL$REQUIRED"; then
+    if test -n "$OPTIONAL$REQUIRED$UNSUPPORTED"; 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
+    if test -n "$REQUIRED$UNSUPPORTED"; then
        rm -f $srcdir/GNUmakefile
         exit 1
     fi
@@ -403,7 +403,7 @@ AC_DEFUN(STEPMAKE_GETTEXT, [
     # Use a workaround until this is resolved:
     # for g++ >= 3.3, select C language.
     GCC_UNSUPPORTED=
-    STEPMAKE_CHECK_VERSION_SUPPORT(CXX, GCC_UNSUPPORTED, 3.3)
+    STEPMAKE_CHECK_VERSION_UNSUPPORTED(CXX, GCC_UNSUPPORTED, 3.3)
     if test -n "$GCC_UNSUPPORTED"; then
        AC_MSG_WARN([autoconf <= 2.57 with g++ >= 3.3 gettext test broken.])
        AC_MSG_WARN([Trying gcc, cross thumbs.])