upstream: Fix extraction of device nodes.

[tar] / m4 / strtoll.m4

diff --git a/m4/strtoll.m4 b/m4/strtoll.m4
index 53cbed21338c7ee006b915a902e5eb31730e212a..065047a66b49e7119415caf98f648fc8ec6ff83b 100644 (file)
--- a/m4/strtoll.m4
+++ b/m4/strtoll.m4
@@ -1,17 +1,20 @@
-# strtoll.m4 serial 4
-dnl Copyright (C) 2002, 2004, 2006 Free Software Foundation, Inc.
+# strtoll.m4 serial 6
+dnl Copyright (C) 2002, 2004, 2006, 2008, 2009, 2010 Free Software Foundation,
+dnl 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_STRTOLL],
 [
+  AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
   dnl We don't need (and can't compile) the replacement strtoll
   dnl unless the type 'long long int' exists.
   AC_REQUIRE([AC_TYPE_LONG_LONG_INT])
   if test "$ac_cv_type_long_long_int" = yes; then
-    AC_REPLACE_FUNCS(strtoll)
+    AC_REPLACE_FUNCS([strtoll])
     if test $ac_cv_func_strtoll = no; then
+      HAVE_STRTOLL=0
       gl_PREREQ_STRTOLL
     fi
   fi