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.

diff --git a/src/auto/configure b/src/auto/configure
index 4ece95ea801ebb6ee12a733571149a19f0f45c0a..30db8a022f4bfe7ce9281a0c86f62b4382a05690 100755 (executable)
--- 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 fc6d405fe762671498c08d17e64249c31685a6f5..1cee1e61d180c93d9080a86638ae78c37dbb9bbb 100644 (file)
--- 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 ab84a3604047c8f5e3f6f063e1dc2f1a4d8143d8..87b1942df9d5bddf4e191befd0a05fd66330ceea 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    385,
 /**/
     384,
 /**/