X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=inline;f=m4%2Fjm-macros.m4;h=6f8155b2bf3db58f3c199e7fd770cc5fb79d883f;hb=3fe59d6cc48e3aca9e98a8a4f7499d589ece1db7;hp=d60f2d53754de33e6e9e7dced6c11d44a449f576;hpb=e562e7a2371a48a0691310c10622e3c5e76fbe1b;p=gnulib.git

diff --git a/m4/jm-macros.m4 b/m4/jm-macros.m4
index d60f2d537..6f8155b2b 100644
--- a/m4/jm-macros.m4
+++ b/m4/jm-macros.m4
@@ -6,10 +6,6 @@ AC_DEFUN(jm_MACROS,
 [
   AC_PREREQ(2.14a)
 
-  # Kludge to work around bug in latest cvs automake.
-  # FIXME: remove this directive once the bug is fixed.
-  AC_CONFIG_AUX_DIR(.)
-
   GNU_PACKAGE="GNU $PACKAGE"
   AC_DEFINE_UNQUOTED(GNU_PACKAGE, "$GNU_PACKAGE",
     [The concatenation of the strings `GNU ', and PACKAGE.])
@@ -20,7 +16,7 @@ AC_DEFUN(jm_MACROS,
   AC_SUBST(MAN)
   AC_SUBST(DF_PROG)
 
-  # This macro actually runs replacement code.  See isc-posix.m4.
+  dnl This macro actually runs replacement code.  See isc-posix.m4.
   AC_REQUIRE([AC_ISC_POSIX])dnl
 
   AC_CHECK_HEADERS( \
@@ -61,6 +57,9 @@ AC_DEFUN(jm_MACROS,
     values.h \
   )
 
+  AC_CHECK_HEADERS(langinfo.h)
+  AC_CHECK_FUNCS(nl_langinfo)
+
   jm_INCLUDED_REGEX([lib/regex.c])
 
   AC_REQUIRE([jm_BISON])
@@ -208,7 +207,9 @@ AC_DEFUN(jm_CHECK_ALL_TYPES,
 
   AC_REQUIRE([AC_HEADER_DIRENT])
   AC_REQUIRE([AC_HEADER_STDC])
-  AC_CHECK_MEMBERS((struct stat.st_blksize))
+  AC_CHECK_MEMBERS((struct stat.st_blksize),,,[$ac_includes_default
+#include <sys/stat.h>
+  ])
   AC_REQUIRE([AC_STRUCT_ST_BLOCKS])
 
   AC_REQUIRE([AC_STRUCT_TM])