diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | m4/dirname.m4 | 19 | ||||
| -rw-r--r-- | modules/dirname | 1 | ||||
| -rw-r--r-- | modules/dirname-lgpl | 2 |
4 files changed, 8 insertions, 22 deletions
@@ -1,3 +1,11 @@ +2020-07-05 Bruno Haible <bruno@clisp.org> + + 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 <mail@bernhard-voelker.de> tests: avoid shadowing warning diff --git a/m4/dirname.m4 b/m4/dirname.m4 deleted file mode 100644 index 9995ff3c42..0000000000 --- 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 dce323adc7..e3ffbe04d7 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 d6c3efd72a..b919102e67 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 |