; * lib/gnulib.mk.in: Update from gnulib.

diff --git a/lib/gnulib.mk.in b/lib/gnulib.mk.in
index ca4df18458c10b86aa7ef64221d1c24485101059..99286852f8b67fd67c0d85bd246f4f0dc60f61d8 100644 (file)
--- a/lib/gnulib.mk.in
+++ b/lib/gnulib.mk.in
@@ -1117,7 +1117,6 @@ INT32_MAX_LT_INTMAX_MAX = @INT32_MAX_LT_INTMAX_MAX@
 INT64_MAX_EQ_LONG_MAX = @INT64_MAX_EQ_LONG_MAX@
 JARSIGNER = @JARSIGNER@
 JAVAC = @JAVAC@
-JAVAFLAGS = @JAVAFLAGS@
 JPEG_CFLAGS = @JPEG_CFLAGS@
 JSON_CFLAGS = @JSON_CFLAGS@
 JSON_LIBS = @JSON_LIBS@
@@ -1210,6 +1209,7 @@ NDK_BUILD_AR = @NDK_BUILD_AR@
 NDK_BUILD_ARCH = @NDK_BUILD_ARCH@
 NDK_BUILD_CC = @NDK_BUILD_CC@
 NDK_BUILD_CFLAGS = @NDK_BUILD_CFLAGS@
+NDK_BUILD_CXX = @NDK_BUILD_CXX@
 NDK_BUILD_CXX_SHARED = @NDK_BUILD_CXX_SHARED@
 NDK_BUILD_MODULES = @NDK_BUILD_MODULES@
 NDK_BUILD_NASM = @NDK_BUILD_NASM@
@@ -1603,6 +1603,7 @@ W32_LIBS = @W32_LIBS@
 W32_OBJ = @W32_OBJ@
 W32_RES_LINK = @W32_RES_LINK@
 WARN_CFLAGS = @WARN_CFLAGS@
+WARN_JAVAFLAGS = @WARN_JAVAFLAGS@
 WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
 WEBKIT_CFLAGS = @WEBKIT_CFLAGS@
 WEBKIT_LIBS = @WEBKIT_LIBS@