Mercurial > vim

changeset 6094:6e24b97dde69 v7.4.385

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.4.385 Problem: When building with tiny or small features building the .mo files fails. Solution: In autoconf do not setup for building the .mo files when it would fail.
author Bram Moolenaar <bram@vim.org>
date Wed, 30 Jul 2014 13:22:52 +0200
parents 045bf2458aef
children 9a22f0837a3a
files src/auto/configure src/configure.in src/version.c
diffstat 3 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -12966,7 +12966,7 @@ rm -f core conftest.err conftest.$ac_obj
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: msgfmt not found - disabled" >&5
 $as_echo "msgfmt not found - disabled" >&6; };
     fi
-    if test $have_gettext = "yes"; then
+    if test $have_gettext = "yes" -a "x$features" != "xtiny" -a "x$features" != "xsmall"; then
       $as_echo "#define HAVE_GETTEXT 1" >>confdefs.h
 
       MAKEMO=yes
--- a/src/configure.in
+++ b/src/configure.in
@@ -3818,7 +3818,7 @@ if test "$enable_nls" = "yes"; then
     else
       AC_MSG_RESULT([msgfmt not found - disabled]);
     fi
-    if test $have_gettext = "yes"; then
+    if test $have_gettext = "yes" -a "x$features" != "xtiny" -a "x$features" != "xsmall"; then
       AC_DEFINE(HAVE_GETTEXT)
       MAKEMO=yes
       AC_SUBST(MAKEMO)
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    385,
+/**/
     384,
 /**/
     383,