[prev in list] [next in list] [prev in thread] [next in thread] 

List:       freeciv-dev
Subject:    [Freeciv-Dev] (PR#39921) [Patch] Fix gettext checks
From:       "Marko Lindqvist" <cazfi74 () domain ! hid>
Date:       2007-11-27 19:50:18
Message-ID: xed7813ad0711271235k2cabc025k9dd4f0d922750254 () domain ! hid
[Download RAW message or body]

<URL: http://bugs.freeciv.org/Ticket/Display.html?id=39921 >

 Output of recent 'xgettext --version' differs from what configure
check expects. Attached patch works for me.


 - ML


["GTVer.diff" (text/x-patch)]

diff -Nurd -X.diff_ignore freeciv/configure.ac freeciv/configure.ac
--- freeciv/configure.ac	2007-11-27 21:57:37.000000000 +0200
+++ freeciv/configure.ac	2007-11-27 22:30:23.000000000 +0200
@@ -245,7 +245,7 @@
 
   if test "$IS_BETA_VERSION" = "1" || test "$IS_DEVEL_VERSION" = "1"; then
     AC_MSG_CHECKING(for GNU xgettext version >= 0.10.36)
-    xgettext_version=`$XGETTEXT --version 2>&1 | grep GNU | sed 's/"/ /g'`
+    xgettext_version=`$XGETTEXT --version 2>&1 | grep GNU | head -n 1 | sed 's/"/ /g'`
     AC_TRY_RUN([
 #include <stdio.h>
 
@@ -280,7 +280,7 @@
     )
 
     AC_MSG_CHECKING(for GNU msgfmt version >= 0.10.35)
-    msgfmt_version=`$MSGFMT --version 2>&1 | grep GNU | sed 's/"/ /g'`
+    msgfmt_version=`$MSGFMT --version 2>&1 | grep GNU | head -n 1 | sed 's/"/ /g'`
     AC_TRY_RUN([
 #include <stdio.h>
 


[prev in list] [next in list] [prev in thread] [next in thread]