X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fcanonicalize.m4;h=0ed92e1f153dfa2e14fda202b076ed9be800e2cf;hb=b0df6af4ba3f1b975ae8a39c959862f9f4c37820;hp=0731f4dc579caf702998ddbfa7ca3802dee89bd9;hpb=cbb957509a65c2a1a7a14e90a35882df286948d1;p=gnulib.git

diff --git a/m4/canonicalize.m4 b/m4/canonicalize.m4
index 0731f4dc5..0ed92e1f1 100644
--- a/m4/canonicalize.m4
+++ b/m4/canonicalize.m4
@@ -1,27 +1,17 @@
-#serial 3
+#serial 9
 
-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Copyright (C) 2003, 2004, 2005 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 Jim Meyering.
 
 AC_DEFUN([AC_FUNC_CANONICALIZE_FILE_NAME],
   [
-    AC_REQUIRE([AC_HEADER_STDC])
-    AC_CHECK_HEADERS(string.h sys/param.h stddef.h)
+    AC_LIBSOURCES([canonicalize.c, canonicalize.h])
+    AC_LIBOBJ([canonicalize])
+
+    AC_CHECK_HEADERS(sys/param.h)
     AC_CHECK_FUNCS(resolvepath canonicalize_file_name)
-    AC_REQUIRE([AC_HEADER_STAT])
   ])