>From dc4b3181b30ece859f68902610f2ce0c613e85d1 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 5 Jul 2020 18:05:31 +0200 Subject: [PATCH 1/7] dirname, dirname-lgpl: Simplify. * m4/dirname.m4: Remove file. * modules/dirname (configure.ac): Don't invoke gl_DIRNAME. * modules/dirname-lgpl (Files): Remove m4/dirname.m4. (configure.ac): Don't invoke gl_DIRNAME_LGPL. --- ChangeLog | 8 ++++++++ m4/dirname.m4 | 19 ------------------- modules/dirname | 1 - modules/dirname-lgpl | 2 -- 4 files changed, 8 insertions(+), 22 deletions(-) delete mode 100644 m4/dirname.m4 diff --git a/ChangeLog b/ChangeLog index 4a4b8bb..b2fe127 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2020-07-05 Bruno Haible + + dirname, dirname-lgpl: Simplify. + * m4/dirname.m4: Remove file. + * modules/dirname (configure.ac): Don't invoke gl_DIRNAME. + * modules/dirname-lgpl (Files): Remove m4/dirname.m4. + (configure.ac): Don't invoke gl_DIRNAME_LGPL. + 2020-07-05 Bernhard Voelker tests: avoid shadowing warning diff --git a/m4/dirname.m4 b/m4/dirname.m4 deleted file mode 100644 index 9995ff3..0000000 --- a/m4/dirname.m4 +++ /dev/null @@ -1,19 +0,0 @@ -#serial 10 -*- autoconf -*- -dnl Copyright (C) 2002-2006, 2009-2020 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], -[ - AC_REQUIRE([gl_DIRNAME_LGPL]) -]) - -AC_DEFUN([gl_DIRNAME_LGPL], -[ - dnl Prerequisites of lib/dirname.h. - AC_REQUIRE([gl_DOUBLE_SLASH_ROOT]) - - dnl No prerequisites of lib/basename-lgpl.c, lib/dirname-lgpl.c, - dnl lib/stripslash.c. -]) diff --git a/modules/dirname b/modules/dirname index dce323a..e3ffbe0 100644 --- a/modules/dirname +++ b/modules/dirname @@ -12,7 +12,6 @@ xalloc xstrndup configure.ac: -gl_DIRNAME gl_MODULE_INDICATOR([dirname]) Makefile.am: diff --git a/modules/dirname-lgpl b/modules/dirname-lgpl index d6c3efd..b919102 100644 --- a/modules/dirname-lgpl +++ b/modules/dirname-lgpl @@ -6,7 +6,6 @@ lib/dirname.h lib/dirname-lgpl.c lib/basename-lgpl.c lib/stripslash.c -m4/dirname.m4 Depends-on: double-slash-root @@ -15,7 +14,6 @@ malloc-posix stdbool configure.ac: -gl_DIRNAME_LGPL Makefile.am: lib_SOURCES += dirname-lgpl.c basename-lgpl.c stripslash.c -- 2.7.4