Werner LEMBERG a écrit :
[autoconf 2.63]
[g++ 4.3.2]
The STEPMAKE_GETTEXT function in aclocal.m4 is missing a test for the
autoconf version. For the above tool versions I still get the message
autoconf <= 2.59 with g++ >= 3.3 gettext test broken.
Trying gcc, cross fingers.
which is completely bogus.
What do you think of the attached patch?
Best,
John
diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index b113c80..6a7e204 100644
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -478,18 +478,24 @@ AC_DEFUN(STEPMAKE_GETTEXT, [
AC_SUBST(localedir)
AC_DEFINE_UNQUOTED(LOCALEDIR, ["${LOCALEDIR}"])
- # ouch. autoconf <= 2.57's gettext check fails for
- # g++ >= 3.3 (with -std=gnu++98, the default).
- # While the check is OK for g++ -std=c++98,
- # LilyPond needs GNU g++, so who is to blame here?
- # Use a workaround until this is resolved:
- # for g++ >= 3.3, select C language.
- GCC_UNSUPPORTED=
- STEPMAKE_CHECK_VERSION_UNSUPPORTED(CXX, GCC_UNSUPPORTED, 3.3)
- if test -n "$GCC_UNSUPPORTED"; then
- AC_MSG_WARN([autoconf <= 2.59 with g++ >= 3.3 gettext test broken.])
- AC_MSG_WARN([Trying gcc, cross fingers.])
- AC_LANG_PUSH(C)
+
+ autoconf_exe=`STEPMAKE_GET_EXECUTABLE(autoconf)`
+ autoconf_version=`STEPMAKE_GET_VERSION($autoconf_exe)`
+ num=`STEPMAKE_NUMERIC_VERSION($autoconf_version)`
+ if test "$num" -le `STEPMAKE_NUMERIC_VERSION(2.60)`; then
+ # ouch. autoconf <= 2.59's gettext check fails for
+ # g++ >= 3.3 (with -std=gnu++98, the default).
+ # While the check is OK for g++ -std=c++98,
+ # LilyPond needs GNU g++, so who is to blame here?
+ # Use a workaround until this is resolved:
+ # for g++ >= 3.3, select C language.
+ GCC_UNSUPPORTED=
+ STEPMAKE_CHECK_VERSION_UNSUPPORTED(CXX, GCC_UNSUPPORTED, 3.3)
+ if test -n "$GCC_UNSUPPORTED"; then
+ AC_MSG_WARN([autoconf <= 2.59 with g++ >= 3.3 gettext test broken.])
+ AC_MSG_WARN([Trying gcc, cross fingers.])
+ AC_LANG_PUSH(C)
+ fi
fi
AC_CHECK_LIB(intl, gettext)
AC_CHECK_FUNCS(gettext)
_______________________________________________
bug-lilypond mailing list
bug-lilypond@gnu.org
http://lists.gnu.org/mailman/listinfo/bug-lilypond
