X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Ffree.m4;h=8f7fee2d26c102bc30ec28def8aa7f92d0998f93;hb=ad9a24a121ab3154f30d9d38d8243f41566d151e;hp=537fb893ed14879fbb566e0f651e2240963dbfdb;hpb=265465e1145409720be48d30b6277a59151d293a;p=gnulib.git

diff --git a/m4/free.m4 b/m4/free.m4
index 537fb893e..8f7fee2d2 100644
--- a/m4/free.m4
+++ b/m4/free.m4
@@ -1,12 +1,9 @@
 # Check whether free (NULL) is supposed to work.
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
-
-# This file is free software, distributed under the terms of the GNU
-# General Public License.  As a special exception to the GNU General
-# Public License, this file may be distributed as part of a program
-# that contains a configuration script generated by Autoconf, under
-# the same distribution terms as the rest of that program.
+# Copyright (C) 2003, 2004, 2005, 2009, 2010 Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
 # Written by Paul Eggert.
 
@@ -19,25 +16,22 @@
 
 AC_DEFUN([gl_FUNC_FREE],
 [
-  AC_CHECK_HEADERS_ONCE(unistd.h)
   AC_CACHE_CHECK([whether free (NULL) is known to work],
     [gl_cv_func_free],
     [AC_COMPILE_IFELSE(
        [AC_LANG_PROGRAM(
-	  [[@%:@if HAVE_UNISTD_H
-	      @%:@include <unistd.h>
-	    @%:@endif]],
-	  [[@%:@if _POSIX_VERSION < 199009L && \
-	        (defined unix || defined _unix || defined _unix_ \
-	         || defined __unix || defined __unix__)
-	      @%:@error "'free (NULL)' is not known to work"
-	    @%:@endif]])],
+          [[@%:@include <unistd.h>]],
+          [[@%:@if _POSIX_VERSION < 199009L && \
+                (defined unix || defined _unix || defined _unix_ \
+                 || defined __unix || defined __unix__)
+              @%:@error "'free (NULL)' is not known to work"
+            @%:@endif]])],
        [gl_cv_func_free=yes],
        [gl_cv_func_free=no])])
 
-  if test $gl_cv_func_free = yes; then
-    AC_LIBOBJ(free)
-    AC_DEFINE(free, rpl_free,
+  if test $gl_cv_func_free = no; then
+    AC_LIBOBJ([free])
+    AC_DEFINE([free], [rpl_free],
       [Define to rpl_free if the replacement function should be used.])
   fi
 ])