X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Frename.m4;h=a2e0d74fd6f93dd3cef06f2b1613cd5f4e29462e;hb=80a044bf3461d0c54e2ca2a5e7df4e61db737236;hp=ba76240fd13923821b02aaaf3fb74596039c3642;hpb=acfe248fd3612724fbb2e58507d4dda616aa223a;p=gnulib.git

diff --git a/m4/rename.m4 b/m4/rename.m4
index ba76240fd..a2e0d74fd 100644
--- a/m4/rename.m4
+++ b/m4/rename.m4
@@ -1,4 +1,4 @@
-#serial 2
+#serial 5
 
 dnl From Volker Borchert.
 dnl Determine whether rename works for source paths with a trailing slash.
@@ -8,7 +8,7 @@ dnl If it doesn't, then define RENAME_TRAILING_SLASH_BUG and arrange
 dnl to compile the wrapper function.
 dnl
 
-AC_DEFUN(vb_FUNC_RENAME,
+AC_DEFUN([vb_FUNC_RENAME],
 [
  AC_CACHE_CHECK([whether rename is broken],
   vb_cv_func_rename_trailing_slash_bug,
@@ -33,8 +33,18 @@ AC_DEFUN(vb_FUNC_RENAME,
   ])
   if test $vb_cv_func_rename_trailing_slash_bug = yes; then
     AC_LIBOBJ(rename)
-    AC_DEFINE_UNQUOTED(RENAME_TRAILING_SLASH_BUG, 1,
-[Define if rename does not work for source paths with a trailing slash,
-   like the one from SunOS 4.1.1_U1.])
+    AC_DEFINE(rename, rpl_rename,
+      [Define to rpl_rename if the replacement function should be used.])
+    AC_DEFINE(RENAME_TRAILING_SLASH_BUG, 1,
+      [Define if rename does not work for source paths with a trailing slash,
+       like the one from SunOS 4.1.1_U1.])
+    gl_PREREQ_RENAME
   fi
 ])
+
+# Prerequisites of lib/rename.c.
+AC_DEFUN([gl_PREREQ_RENAME],
+[
+  AC_CHECK_HEADERS_ONCE(stdlib.h string.h)
+  AC_CHECK_DECLS_ONCE(free)
+])