diff options
| author | Bram Moolenaar <bram@vim.org> | 2014-07-30 13:22:52 +0200 |
|---|---|---|
| committer | Bram Moolenaar <bram@vim.org> | 2014-07-30 13:22:52 +0200 |
| commit | fdfa34dccefde8cbcdee0076eda3ac93c87555de (patch) | |
| tree | 18b6bae4e573a4a3346012d55aedfcda96236035 | |
| parent | 6fd2dfe4b6a265f70bfcc4469e9b9665e2c0a48e (diff) | |
| download | vim-fdfa34dccefde8cbcdee0076eda3ac93c87555de.tar.gz | |
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.
| -rwxr-xr-x | src/auto/configure | 2 | ||||
| -rw-r--r-- | src/configure.in | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/auto/configure b/src/auto/configure index 4ece95ea..30db8a02 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -12966,7 +12966,7 @@ rm -f core conftest.err conftest.$ac_objext \ { $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 diff --git a/src/configure.in b/src/configure.in index fc6d405f..1cee1e61 100644 --- 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) diff --git a/src/version.c b/src/version.c index ab84a360..87b1942d 100644 --- 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, |