diff --git a/configure b/configure index 6e81f94257b..55464c71b32 100755 --- a/configure +++ b/configure @@ -5150,11 +5150,31 @@ $as_echo "yes ($icotool_version_major.$icotool_version_minor)" >&6; } fi test "x$with_gettext" != xno || MSGFMT=false +if test "$MSGFMT" != "false" +then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether msgfmt supports contexts" >&5 +$as_echo_n "checking whether msgfmt supports contexts... " >&6; } + cat >conftest.po <&5 + then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + MSGFMT=false + fi +fi if test "$MSGFMT" = false; then : case "x$with_gettext" in - x) as_fn_append wine_warnings "|gettext tools not found, translations won't be built." ;; + x) as_fn_append wine_warnings "|gettext tools not found (or too old), translations won't be built." ;; xno) ;; - *) as_fn_error $? "gettext tools not found, translations won't be built. + *) as_fn_error $? "gettext tools not found (or too old), translations won't be built. This is an error since --with-gettext was requested." "$LINENO" 5 ;; esac fi diff --git a/configure.ac b/configure.ac index 0b687743a24..357c829f7f0 100644 --- a/configure.ac +++ b/configure.ac @@ -349,8 +349,25 @@ else fi test "x$with_gettext" != xno || MSGFMT=false +if test "$MSGFMT" != "false" +then + AC_MSG_CHECKING([whether msgfmt supports contexts]) + cat >conftest.po <&AS_MESSAGE_LOG_FD + then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + MSGFMT=false + fi +fi WINE_WARNING_WITH(gettext,[test "$MSGFMT" = false], - [gettext tools not found, translations won't be built.]) + [gettext tools not found (or too old), translations won't be built.]) dnl **** Check for some libraries ****