X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fxalloc.m4;h=49008208b3ddf188ba10b737b9d86c4215e24629;hb=9a5b92fa76ec1494756d2ace6b7a0a43c48633ea;hp=dec84177c7016ed5c9c94edff25f2e40ca060bf7;hpb=346d5dc0410331c94de5d3f469bd32884ec9a1a0;p=gnulib.git

diff --git a/m4/xalloc.m4 b/m4/xalloc.m4
index dec84177c..49008208b 100644
--- a/m4/xalloc.m4
+++ b/m4/xalloc.m4
@@ -1,32 +1,24 @@
-# xalloc.m4 serial 8
-dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# xalloc.m4 serial 16
+dnl Copyright (C) 2002-2006, 2009-2011 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_XALLOC],
 [
+  AC_LIBOBJ([xmalloc])
+
   gl_PREREQ_XALLOC
   gl_PREREQ_XMALLOC
-  gl_PREREQ_XSTRDUP
 ])
 
 # Prerequisites of lib/xalloc.h.
 AC_DEFUN([gl_PREREQ_XALLOC], [
+  AC_REQUIRE([gl_INLINE])
   :
 ])
 
 # Prerequisites of lib/xmalloc.c.
 AC_DEFUN([gl_PREREQ_XMALLOC], [
-  AC_REQUIRE([AC_C_INLINE])
-  AC_REQUIRE([jm_FUNC_MALLOC])
-  AC_REQUIRE([jm_FUNC_REALLOC])
-  :
-])
-
-# Prerequisites of lib/xstrdup.c.
-AC_DEFUN([gl_PREREQ_XSTRDUP], [
   :
 ])