mutt stable branch with some hacks

Avoid more m4 macro collisions.

+2 -2
+1 -1
m4/gettext.m4
··· 291 291 AC_REQUIRE([AC_TYPE_SIZE_T])dnl 292 292 AC_REQUIRE([AC_FUNC_ALLOCA])dnl 293 293 AC_REQUIRE([AC_FUNC_MMAP])dnl 294 - AC_REQUIRE([jm_GLIBC21])dnl 294 + AC_REQUIRE([MUTT_jm_GLIBC21])dnl 295 295 296 296 AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \ 297 297 stdlib.h string.h unistd.h sys/param.h])
+1 -1
m4/glibc21.m4
··· 3 3 # Test for the GNU C Library, version 2.1 or newer. 4 4 # From Bruno Haible. 5 5 6 - AC_DEFUN([jm_GLIBC21], 6 + AC_DEFUN([MUTT_jm_GLIBC21], 7 7 [ 8 8 AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer, 9 9 ac_cv_gnu_library_2_1,