diff options
author | Jim Meyering <meyering@redhat.com> | 2007-09-01 09:54:45 +0200 |
---|---|---|
committer | Jim Meyering <meyering@redhat.com> | 2007-10-07 19:43:35 +0200 |
commit | 58a7ead41d056909784bfab9323c5f44f577d3d0 (patch) | |
tree | ea0f1849f46529be4cac93d09f1b4f6f85f53255 /m4 | |
parent | 696f4a8042e11f6caf479f729b09dcae2700e541 (diff) | |
download | coreutils-58a7ead41d056909784bfab9323c5f44f577d3d0.tar.xz |
Convert coreutils' rand*.{c,h,m4} into modules.
First step: move these files to gl/lib:
* lib/rand-isaac.c, lib/rand-isaac.h
* lib/randint.c, lib/randint.h
* lib/randperm.c, lib/randperm.h
* lib/randread.c, lib/randread.h
Step 2: add modules/rand* and remove now-unneeded .m4 files.
* gl/modules/randint: New file.
* gl/modules/randperm: New file.
* gl/modules/randread: New file.
* m4/randint.m4: Remove file.
* m4/randperm.m4: Remove file.
* m4/randread.m4: Remove file.
Step 3: use the new modules
* bootstrap.conf (gnulib_modules): Add randint and randperm.
* m4/prereq.m4 (gl_RANDINT, gl_RANDREAD, gl_RANDPERM): Don't require;
These have been removed.
(gl_ROOT_DEV_INO): Don't require; already handled via bootstrap.conf.
Diffstat (limited to 'm4')
-rw-r--r-- | m4/prereq.m4 | 9 | ||||
-rw-r--r-- | m4/randint.m4 | 12 | ||||
-rw-r--r-- | m4/randperm.m4 | 10 | ||||
-rw-r--r-- | m4/randread.m4 | 11 |
4 files changed, 2 insertions, 40 deletions
diff --git a/m4/prereq.m4 b/m4/prereq.m4 index c5a2d45cb..ea9b5bd56 100644 --- a/m4/prereq.m4 +++ b/m4/prereq.m4 @@ -1,4 +1,4 @@ -#serial 73 +#serial 74 dnl We use gl_ for non Autoconf macros. m4_pattern_forbid([^gl_[ABCDEFGHIJKLMNOPQRSTUVXYZ]])dnl @@ -7,8 +7,7 @@ m4_pattern_forbid([^gl_[ABCDEFGHIJKLMNOPQRSTUVXYZ]])dnl # directory of the coreutils package. -# Copyright (C) 1998, 2000, 2001, 2003, 2004, 2005, 2006 Free Software -# Foundation, Inc. +# Copyright (C) 1998, 2000, 2001, 2003-2007 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -41,10 +40,6 @@ AC_DEFUN([gl_PREREQ], AC_REQUIRE([gl_FD_REOPEN]) AC_REQUIRE([gl_FUNC_XFTS]) AC_REQUIRE([gl_MEMXFRM]) - AC_REQUIRE([gl_RANDINT]) - AC_REQUIRE([gl_RANDPERM]) - AC_REQUIRE([gl_RANDREAD]) - AC_REQUIRE([gl_ROOT_DEV_INO]) AC_REQUIRE([gl_SHA256]) AC_REQUIRE([gl_SHA512]) AC_REQUIRE([gl_STRINTCMP]) diff --git a/m4/randint.m4 b/m4/randint.m4 deleted file mode 100644 index 50209ed2a..000000000 --- a/m4/randint.m4 +++ /dev/null @@ -1,12 +0,0 @@ -dnl Copyright (C) 2006 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_RANDINT], -[ - AC_LIBSOURCES([randint.c, randint.h]) - AC_LIBOBJ([randint]) - - AC_REQUIRE([AC_C_INLINE]) -]) diff --git a/m4/randperm.m4 b/m4/randperm.m4 deleted file mode 100644 index de2d691db..000000000 --- a/m4/randperm.m4 +++ /dev/null @@ -1,10 +0,0 @@ -dnl Copyright (C) 2006 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_RANDPERM], -[ - AC_LIBSOURCES([randperm.c, randperm.h]) - AC_LIBOBJ([randperm]) -]) diff --git a/m4/randread.m4 b/m4/randread.m4 deleted file mode 100644 index c30ddd3f2..000000000 --- a/m4/randread.m4 +++ /dev/null @@ -1,11 +0,0 @@ -dnl Copyright (C) 2006 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_RANDREAD], -[ - AC_LIBSOURCES([randread.c, randread.h, rand-isaac.c, rand-isaac.h]) - AC_LIBOBJ([randread]) - AC_LIBOBJ([rand-isaac]) -]) |