[pkg-wine-party] [SCM] Debian Wine packaging branch, wheezy, updated. wine-1.4-7-302-gb61b690

[Alexandre Julliard]

The following commit has been merged in the wheezy branch:
commit 191122602a28eb3bcf361b6fcdc1b7a4a981b89c
Author: Christian Costa <titan.costa at gmail.com>
Date:   Mon Mar 5 20:00:20 2012 +0100

    configure: Check if version of msgfmt (from gettext) is recent enough.
    (cherry picked from commit 949693011dfc91c38a79c779b96df0ac4d8f54e8)

diff --git a/configure b/configure
index 6e81f94..55464c7 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 <<EOF
+# comment
+msgctxt "ctxt"
+msgid "id"
+msgstr "str"
+EOF
+  if $MSGFMT -o /dev/null conftest.po 2>&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 0b68774..357c829 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 <<EOF
+# comment
+msgctxt "ctxt"
+msgid "id"
+msgstr "str"
+EOF
+  if $MSGFMT -o /dev/null conftest.po 2>&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 ****
 

-- 
Debian Wine packaging