3 files changed, 52 insertions, 5 deletions

diff --git a/THANKS.in b/THANKS.in
index 4967ff0..60af6bf 100644
--- a/THANKS.in
+++ b/THANKS.in
@@ -185,3 +185,5 @@ Michael Tiernan
 Jeremy Reed
 Holger Weiss
 Cire Iriarte
+Allan Bennett
+Ari Pollak
diff --git a/m4/alloca.m4 b/m4/alloca.m4
new file mode 100644
index 0000000..a9e3f45
--- /dev/null
+++ b/m4/alloca.m4
@@ -0,0 +1,42 @@
+# alloca.m4 serial 5
+dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_FUNC_ALLOCA],
+[
+  dnl Work around a bug of AC_EGREP_CPP in autoconf-2.57.
+  AC_REQUIRE([AC_PROG_CPP])
+  AC_REQUIRE([AC_PROG_EGREP])
+
+  AC_REQUIRE([AC_FUNC_ALLOCA])
+  if test $ac_cv_func_alloca_works = no; then
+    gl_PREREQ_ALLOCA
+  fi
+
+  # Define an additional variable used in the Makefile substitution.
+  if test $ac_cv_working_alloca_h = yes; then
+    AC_EGREP_CPP([Need own alloca], [
+#if defined __GNUC__ || defined _AIX || defined _MSC_VER
+        Need own alloca
+#endif
+      ],
+      [AC_DEFINE(HAVE_ALLOCA, 1,
+            [Define to 1 if you have `alloca' after including <alloca.h>,
+             a header that may be supplied by this distribution.])
+       ALLOCA_H=alloca.h],
+      [ALLOCA_H=])
+  else
+    ALLOCA_H=alloca.h
+  fi
+  AC_SUBST([ALLOCA_H])
+
+  AC_DEFINE(HAVE_ALLOCA_H, 1,
+    [Define HAVE_ALLOCA_H for backward compatibility with older code
+     that includes <alloca.h> only if HAVE_ALLOCA_H is defined.])
+])
+
+# Prerequisites of lib/alloca.c.
+# STACK_DIRECTION is already handled by AC_FUNC_ALLOCA.
+AC_DEFUN([gl_PREREQ_ALLOCA], [:])
diff --git a/m4/np_coreutils.m4 b/m4/np_coreutils.m4
index 18c5f66..23d55e4 100644
--- a/m4/np_coreutils.m4
+++ b/m4/np_coreutils.m4
@@ -12,12 +12,15 @@ AC_DEFUN([np_COREUTILS],
 [
   AC_REQUIRE([AM_STDBOOL_H])
   AC_REQUIRE([gl_C_STRTOLD])
-  AC_REQUIRE([gl_GETOPT])
-  AC_REQUIRE([gl_AFS])
   AC_REQUIRE([gl_EXITFAIL])
-  AC_REQUIRE([gl_XALLOC])
-  AC_REQUIRE([gl_MOUNTLIST])
   AC_REQUIRE([gl_FSUSAGE])
-  AC_REQUIRE([gl_FUNC_GLIBC_UNLOCKED_IO])
+  AC_REQUIRE([gl_FUNC_ALLOCA])
+  AC_REQUIRE([gl_GETOPT])
+  AC_REQUIRE([gl_MOUNTLIST])
   AC_REQUIRE([gl_REGEX])
+  AC_REQUIRE([gl_XALLOC])
+  AC_REQUIRE([gl_FUNC_GLIBC_UNLOCKED_IO])
+
+dnl This is in jm-macros.m4, which calls prereq.m4, and then calls this afterwards
+  AC_REQUIRE([gl_AFS])
 ])