From 9d5dc512b84adc1a257f0c7d3dd98b0fbb13dc59 Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Wed, 8 Jul 2020 01:37:19 +0200
Subject: [PATCH] Clarify dependencies to double-slash-root.

* modules/canonicalize (Files): Remove m4/double-slash-root.m4.
(Depends-on): Add double-slash-root.
* modules/canonicalize-lgpl (Depends-on): Add double-slash-root.
* modules/dirname-lgpl (Depends-on): Add double-slash-root.
---
 ChangeLog                 |  8 +++++
 modules/canonicalize      |  2 +-
 modules/canonicalize-lgpl | 83 ++++++++++++++++++++++++-----------------------
 modules/dirname-lgpl      |  1 +
 4 files changed, 52 insertions(+), 42 deletions(-)
 rewrite modules/canonicalize-lgpl (61%)

diff --git a/ChangeLog b/ChangeLog
index a82bd45be1..ec447a9831 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2020-07-07  Bruno Haible  <bruno@clisp.org>
+
+	Clarify dependencies to double-slash-root.
+	* modules/canonicalize (Files): Remove m4/double-slash-root.m4.
+	(Depends-on): Add double-slash-root.
+	* modules/canonicalize-lgpl (Depends-on): Add double-slash-root.
+	* modules/dirname-lgpl (Depends-on): Add double-slash-root.
+
 2020-07-06  Paul Eggert  <eggert@cs.ucla.edu>
 
 	libgmp: new module
diff --git a/modules/canonicalize b/modules/canonicalize
index 233fba96f2..a59b9fb6b1 100644
--- a/modules/canonicalize
+++ b/modules/canonicalize
@@ -5,10 +5,10 @@ Files:
 lib/canonicalize.h
 lib/canonicalize.c
 m4/canonicalize.m4
-m4/double-slash-root.m4
 
 Depends-on:
 areadlink-with-size
+double-slash-root
 errno
 extensions
 file-set
diff --git a/modules/canonicalize-lgpl b/modules/canonicalize-lgpl
dissimilarity index 61%
index 35264223c8..20ee7908b8 100644
--- a/modules/canonicalize-lgpl
+++ b/modules/canonicalize-lgpl
@@ -1,41 +1,42 @@
-Description:
-realpath, canonicalize_file_name: Provide canonical absolute file name
-
-Files:
-lib/canonicalize-lgpl.c
-m4/canonicalize.m4
-m4/double-slash-root.m4
-
-Depends-on:
-extensions
-stdlib
-nocrash
-alloca-opt      [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1]
-errno           [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1]
-filename        [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1]
-lstat           [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1]
-malloca         [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1]
-memmove         [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1]
-pathmax         [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1]
-readlink        [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1]
-sys_stat        [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1]
-
-configure.ac:
-gl_CANONICALIZE_LGPL
-if test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1; then
-  AC_LIBOBJ([canonicalize-lgpl])
-fi
-gl_MODULE_INDICATOR([canonicalize-lgpl])
-gl_STDLIB_MODULE_INDICATOR([canonicalize_file_name])
-gl_STDLIB_MODULE_INDICATOR([realpath])
-
-Makefile.am:
-
-Include:
-<stdlib.h>
-
-License:
-LGPLv2+
-
-Maintainer:
-all
+Description:
+realpath, canonicalize_file_name: Provide canonical absolute file name
+
+Files:
+lib/canonicalize-lgpl.c
+m4/canonicalize.m4
+m4/double-slash-root.m4
+
+Depends-on:
+extensions
+stdlib
+nocrash
+alloca-opt        [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1]
+double-slash-root [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1]
+errno             [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1]
+filename          [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1]
+lstat             [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1]
+malloca           [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1]
+memmove           [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1]
+pathmax           [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1]
+readlink          [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1]
+sys_stat          [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1]
+
+configure.ac:
+gl_CANONICALIZE_LGPL
+if test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1; then
+  AC_LIBOBJ([canonicalize-lgpl])
+fi
+gl_MODULE_INDICATOR([canonicalize-lgpl])
+gl_STDLIB_MODULE_INDICATOR([canonicalize_file_name])
+gl_STDLIB_MODULE_INDICATOR([realpath])
+
+Makefile.am:
+
+Include:
+<stdlib.h>
+
+License:
+LGPLv2+
+
+Maintainer:
+all
diff --git a/modules/dirname-lgpl b/modules/dirname-lgpl
index b7585359fe..8eb1dd7ad7 100644
--- a/modules/dirname-lgpl
+++ b/modules/dirname-lgpl
@@ -8,6 +8,7 @@ lib/stripslash.c
 
 Depends-on:
 basename-lgpl
+double-slash-root
 filename
 malloc-posix
 stdbool
-- 
2.11.4.GIT