From: Kir Kolyshkin Date: Thu, 3 Sep 2015 01:20:22 +0000 (-0700) Subject: build-sys: allow gettext 0.17 to be used X-Git-Tag: v2.27~10^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e46a7f8efed7f7e4d7c54153061a0a19b0d098e4;p=thirdparty%2Futil-linux.git build-sys: allow gettext 0.17 to be used The requirement for gettext 0.18 was introduced by commit e3e16717 to pass --no-wrap option to msgmerge tool, which I guess improves the process of updating po files for translators. At the same time, unfortunately, it makes building from git fail on a RHEL/CentOS 6 system, as it comes with gettext 0.17. Use the existing hack in autogen.sh to allow building with gettext 0.17, with an appropriate warning so that the user is aware: warning: forcing autopoint to use old gettext 0.17 The only negative side effect of this patch I am aware of is if gettext-0.17 is used, then --no-wrap is not being passed to msgmerge (although msgmerge 1.17 already supports it), because Makefile.in.in that comes with gettext 0.17 doesn't have MSGMERGE_OPTIONS. From my POV, this is way better than to not being able to build. NOTE if gettext 0.18.3 is installed, it is used and this patch doesn't change anything; it only allows gettext 1.17 to be used if this is all we have. Cc: Benno Schulenberg Cc: Sami Kerola Signed-off-by: Kir Kolyshkin --- diff --git a/autogen.sh b/autogen.sh index d9a6dcc2f8..f24ec44d0e 100755 --- a/autogen.sh +++ b/autogen.sh @@ -21,7 +21,7 @@ autopoint_fun () # check against this hardcoded set of alternative gettext versions gt_ver=`gettext --version |\ - sed -n -e 's/.* \(0\.18\|0\.18\.[1-2]\)$/\1/p'` + sed -n -e 's/.* \(0\.17\|0\.18\|0\.18\.[1-2]\)$/\1/p'` if [ -n "$gt_ver" ]; then echo "warning: forcing autopoint to use old gettext $gt_ver"