diff options
author | Jim Meyering <meyering@redhat.com> | 2012-09-08 15:11:20 +0200 |
---|---|---|
committer | Jim Meyering <meyering@redhat.com> | 2012-09-10 08:58:03 +0200 |
commit | c424de16b1c8607f2caa7c85d69196f9d8e3a103 (patch) | |
tree | fad5d543de0cef43dfa32e60a0e3937562799d15 /m4 | |
parent | 07fcfe36cee091b2dc15543dc406597bf1fffe67 (diff) | |
download | coreutils-c424de16b1c8607f2caa7c85d69196f9d8e3a103.tar.xz |
maint: move the last coreutils-specific files from lib/ to gl/
Convert the few remaining coreutils-specific files in lib/ to
gnulib-style modules under gl/, removing their corresponding .m4
files, since the information recorded in those files is better
stored in module-description file in gl/modules/.
* bootstrap.conf (gnulib_modules): Add new modules:
fd-reopen, buffer-lcm, xfts, strnumcmp.
* gl/lib/buffer-lcm.c: Renamed from the file in lib/.
* gl/lib/buffer-lcm.h: Likewise.
* gl/lib/fd-reopen.c: Likewise.
* gl/lib/fd-reopen.h: Likewise.
* gl/lib/strintcmp.c: Likewise.
* gl/lib/strnumcmp-in.h: Likewise.
* gl/lib/strnumcmp.c: Likewise.
* gl/lib/strnumcmp.h: Likewise.
* gl/lib/xfts.c: Likewise.
* gl/lib/xfts.h: Likewise.
* gl/modules/buffer-lcm: New module-description file.
* gl/modules/fd-reopen: Likewise.
* gl/modules/strnumcmp: Likewise.
* gl/modules/xfts: Likewise.
* m4/fd-reopen.m4: Remove, no longer needed.
* m4/strnumcmp.m4: Likewise.
* m4/xfts.m4: Likewise.
* m4/prereq.m4: Do not AC_REQUIRE the m4 functions from
our just-removed m4/*.m4 files.
Diffstat (limited to 'm4')
-rw-r--r-- | m4/fd-reopen.m4 | 15 | ||||
-rw-r--r-- | m4/prereq.m4 | 4 | ||||
-rw-r--r-- | m4/strnumcmp.m4 | 27 | ||||
-rw-r--r-- | m4/xfts.m4 | 14 |
4 files changed, 0 insertions, 60 deletions
diff --git a/m4/fd-reopen.m4 b/m4/fd-reopen.m4 deleted file mode 100644 index ae7390c83..000000000 --- a/m4/fd-reopen.m4 +++ /dev/null @@ -1,15 +0,0 @@ -# Invoke open, but return either a desired file descriptor or -1. - -dnl Copyright (C) 2005-2012 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. - -dnl Written by Paul Eggert. - -AC_DEFUN([gl_FD_REOPEN], -[ - AC_LIBSOURCES([fd-reopen.c, fd-reopen.h]) - AC_LIBOBJ([fd-reopen]) -]) diff --git a/m4/prereq.m4 b/m4/prereq.m4 index f458f9dc0..8ba61d129 100644 --- a/m4/prereq.m4 +++ b/m4/prereq.m4 @@ -36,9 +36,5 @@ AC_DEFUN([gl_PREREQ], # Invoke macros of modules that may migrate into gnulib. # There's no need to list gnulib modules here, since gnulib-tool # handles that; see ../bootstrap.conf. - AC_REQUIRE([gl_FD_REOPEN]) AC_REQUIRE([gl_FUNC_XATTR]) - AC_REQUIRE([gl_FUNC_XFTS]) - AC_REQUIRE([gl_STRINTCMP]) - AC_REQUIRE([gl_STRNUMCMP]) ]) diff --git a/m4/strnumcmp.m4 b/m4/strnumcmp.m4 deleted file mode 100644 index 437e18c9b..000000000 --- a/m4/strnumcmp.m4 +++ /dev/null @@ -1,27 +0,0 @@ -# Compare numeric strings. - -dnl Copyright (C) 2005-2012 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. - -dnl Written by Paul Eggert. - -AC_DEFUN([gl_STRINTCMP], -[ - AC_LIBSOURCES([strintcmp.c, strnumcmp.h, strnumcmp-in.h]) - AC_LIBOBJ([strintcmp]) - - dnl Prerequisites of lib/strintcmp.c. - AC_REQUIRE([AC_INLINE]) -]) - -AC_DEFUN([gl_STRNUMCMP], -[ - AC_LIBSOURCES([strnumcmp.c, strnumcmp.h, strnumcmp-in.h]) - AC_LIBOBJ([strnumcmp]) - - dnl Prerequisites of lib/strnumcmp.c. - AC_REQUIRE([AC_INLINE]) -]) diff --git a/m4/xfts.m4 b/m4/xfts.m4 deleted file mode 100644 index ce556925a..000000000 --- a/m4/xfts.m4 +++ /dev/null @@ -1,14 +0,0 @@ -#serial 1 -dnl Copyright (C) 2005-2012 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_FUNC_XFTS], -[ - AC_LIBSOURCES([xfts.c, xfts.h]) - AC_LIBOBJ([xfts]) - - dnl Prerequisites of lib/xfts.c. - : -]) |