#
#
# patch "m4/library.m4"
#  from [d7f50a4e511ae1cbd2739a7124788c1689944571]
#    to [3455f28dcfb1dc60fd61229a471d885fd12ecdfe]
# 
# patch "m4/mtn-gettext.m4"
#  from [d86e51b0bea3264152d2c3c3be140ce880c4c1f3]
#    to [5302bc5b6157c5f51110753755847e322ebe044d]
#
============================================================
--- m4/library.m4	d7f50a4e511ae1cbd2739a7124788c1689944571
+++ m4/library.m4	3455f28dcfb1dc60fd61229a471d885fd12ecdfe
@@ -122,7 +122,7 @@ if $_notfound; then
 
   echo "$as_me: candidate -config programs are:" >&AS_MESSAGE_LOG_FD
   sed 's/^/| /' conftest.candcfg >&AS_MESSAGE_LOG_FD
-  for f in `cat conftest.candcfg`; do
+  for c in `cat conftest.candcfg`; do
     n=`AS_BASENAME([$c])`
     AC_MSG_CHECKING([for $1 using $n])
     if _ccflg=`$c --cflags 2>&AS_MESSAGE_LOG_FD` &&
@@ -131,7 +131,7 @@ if $_notfound; then
       $1[]_CFLAGS="$_ccflg"
       $1[]_LIBS="$_clibs"
       AC_MSG_RESULT([yes])
-      notfound=false
+      _notfound=false
       break
     else
       AC_MSG_RESULT([no])
============================================================
--- m4/mtn-gettext.m4	d86e51b0bea3264152d2c3c3be140ce880c4c1f3
+++ m4/mtn-gettext.m4	5302bc5b6157c5f51110753755847e322ebe044d
@@ -138,7 +138,7 @@ if test x"$USE_NLS" != xno; then
     save_LIBS="$LIBS"
     save_CFLAGS="$CFLAGS"
     CFLAGS="$save_CFLAGS $intl_CFLAGS"
-    for try in "$@"; do
+    for try in "$[]@"; do
       LIBS="$save_LIBS $try"
       AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <libintl.h>], [[
 	const char *a = textdomain("");