X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=m4%2Fdirname.m4;h=5897a2a8b3f280ed827c77e81a01b0706af9314e;hb=fa1db0dd22768f09a507674a30beb5b8a87bb35f;hp=8b04bcabda8a44770a9797c702c8338d94c97f49;hpb=53b8fa05726a7fb30010e42ce02e44a35f0d7489;p=gnulib.git

diff --git a/m4/dirname.m4 b/m4/dirname.m4
index 8b04bcabd..5897a2a8b 100644
--- a/m4/dirname.m4
+++ b/m4/dirname.m4
@@ -1,25 +1,19 @@
-# dirname.m4 serial 1
-dnl Copyright (C) 2002 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.
+#serial 10   -*- autoconf -*-
+dnl Copyright (C) 2002-2006, 2009-2013 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_DIRNAME],
 [
-  dnl Prerequisites of lib/dirname.h.
-  AC_REQUIRE([jm_AC_DOS])
-
-  dnl Prerequisites of lib/dirname.c.
-  AC_REQUIRE([AC_HEADER_STDC])
-  AC_CHECK_HEADERS_ONCE(string.h)
+  AC_REQUIRE([gl_DIRNAME_LGPL])
+])
 
-  dnl Prerequisites of lib/basename.c.
-  AC_REQUIRE([AC_HEADER_STDC])
-  AC_CHECK_HEADERS_ONCE(string.h)
+AC_DEFUN([gl_DIRNAME_LGPL],
+[
+  dnl Prerequisites of lib/dirname.h.
+  AC_REQUIRE([gl_DOUBLE_SLASH_ROOT])
 
-  dnl Prerequisites of lib/stripslash.c.
-  AC_REQUIRE([AC_HEADER_STDC])
-  AC_CHECK_HEADERS_ONCE(string.h)
+  dnl No prerequisites of lib/basename-lgpl.c, lib/dirname-lgpl.c,
+  dnl lib/stripslash.c.
 ])