Create sha256 and sha512 modules and move files into gl/.

* bootstrap.conf (gnulib_modules): Add sha256 and sha512.
* m4/prereq.m4: Don't require gl_SHA256 or gl_SHA512.
* gl/modules/sha512: New file.
* gl/modules/sha256: New file.
* m4/sha256.m4: Move to ...
* gl/m4/sha256.m4: ...here, removing use of AC_SOURCES.
* m4/sha512.m4: Move to ...
* gl/m4/sha512.m4: ...here, removing use of AC_SOURCES.
* lib/sha256.c, lib/sha256.h: Move to ...
* gl/lib/sha256.c, gl/lib/sha256.h: ...here.
* lib/sha512.c, lib/sha512.h: Move to ...
* gl/lib/sha512.c, gl/lib/sha512.h: ...here.
* lib/u64.h: Move to ...
* gl/lib/u64.h: ...here.

diff --git a/bootstrap.conf b/bootstrap.conf
index 9244841b7e16d452fb450355b568afbda86eb6b4..452c67b3034dc1bf6dafd480ddfceac55fbc0bb6 100644 (file)
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -42,6 +42,7 @@ gnulib_modules="
        config-h configmake
        closein closeout
        crypto/md5 crypto/sha1
+       sha256 sha512
        cycle-check
        d-ino d-type diacrit dirfd dirname dup2
        error euidaccess exclude exitfail fchdir fcntl fcntl-safer fdl

diff --git a/lib/sha256.c b/gl/lib/sha256.c
similarity index 100%
rename from lib/sha256.c
rename to gl/lib/sha256.c

diff --git a/lib/sha256.h b/gl/lib/sha256.h
similarity index 100%
rename from lib/sha256.h
rename to gl/lib/sha256.h

diff --git a/lib/sha512.c b/gl/lib/sha512.c
similarity index 100%
rename from lib/sha512.c
rename to gl/lib/sha512.c

diff --git a/lib/sha512.h b/gl/lib/sha512.h
similarity index 100%
rename from lib/sha512.h
rename to gl/lib/sha512.h

diff --git a/lib/u64.h b/gl/lib/u64.h
similarity index 100%
rename from lib/u64.h
rename to gl/lib/u64.h

diff --git a/m4/sha256.m4 b/gl/m4/sha256.m4
similarity index 72%
rename from m4/sha256.m4
rename to gl/m4/sha256.m4
index 4284e3fab028a4361173aa6f4d940b0e345b4280..54b15e8da094e806cf55438852741ad397147f52 100644 (file)
--- a/m4/sha256.m4
+++ b/gl/m4/sha256.m4
@@ -1,15 +1,13 @@
-# sha256.m4 serial 1
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
+# sha256.m4 serial 2
+dnl Copyright (C) 2005, 2008 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_SHA256],
 [
-  AC_LIBSOURCES([sha256.c, sha256.h])
   AC_LIBOBJ([sha256])
 
   dnl Prerequisites of lib/sha256.c.
   AC_REQUIRE([AC_C_BIGENDIAN])
-  :
 ])

diff --git a/m4/sha512.m4 b/gl/m4/sha512.m4
similarity index 70%
rename from m4/sha512.m4
rename to gl/m4/sha512.m4
index 2de0b2ebd53f21e9530d8326607f96a357154839..888d50df660740c791ee19051455cdc03d3798fc 100644 (file)
--- a/m4/sha512.m4
+++ b/gl/m4/sha512.m4
@@ -1,15 +1,13 @@
-# sha512.m4 serial 2
-dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+# sha512.m4 serial 3
+dnl Copyright (C) 2005, 2006, 2008 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_SHA512],
 [
-  AC_LIBSOURCES([sha512.c, sha512.h, u64.h])
   AC_LIBOBJ([sha512])
 
   dnl Prerequisites of lib/sha512.c.
   AC_REQUIRE([AC_C_BIGENDIAN])
-  :
 ])

diff --git a/gl/modules/sha256 b/gl/modules/sha256
new file mode 100644 (file)
index 0000000..3d70c4a
--- /dev/null
+++ b/gl/modules/sha256
@@ -0,0 +1,24 @@
+Description:
+Compute SHA224 and SHA256 checksums.
+
+Files:
+lib/sha256.h
+lib/sha256.c
+m4/sha256.m4
+
+Depends-on:
+stdint
+
+configure.ac:
+gl_SHA256
+
+Makefile.am:
+
+Include:
+"sha256.h"
+
+License:
+LGPLv2+
+
+Maintainer:
+Jim Meyering

diff --git a/gl/modules/sha512 b/gl/modules/sha512
new file mode 100644 (file)
index 0000000..d1236f3
--- /dev/null
+++ b/gl/modules/sha512
@@ -0,0 +1,25 @@
+Description:
+Compute SHA384 and SHA512 checksums.
+
+Files:
+lib/sha512.h
+lib/sha512.c
+m4/sha512.m4
+lib/u64.h
+
+Depends-on:
+stdint
+
+configure.ac:
+gl_SHA512
+
+Makefile.am:
+
+Include:
+"sha512.h"
+
+License:
+LGPLv2+
+
+Maintainer:
+Jim Meyering

diff --git a/m4/ChangeLog b/m4/ChangeLog
index 6829ab166085efb30cf6644346f0f91c584b41ec..11fcc4a33e7c59988659232d45e9014be1629092 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,7 @@
+2008-03-02  Jim Meyering  <meyering@redhat.com>
+
+       * prereq.m4: Don't require gl_SHA256 or gl_SHA512.
+
 2007-08-30  Eric Blake  <ebb9@byu.net>
 
        * jm-macros.m4 (coreutils_MACROS): Remove GNU_PACKAGE.

diff --git a/m4/prereq.m4 b/m4/prereq.m4
index ea9b5bd56386451f0167a288c8402ce4a6d7956a..e65682fea772a010b540e93d5a0d234f6acf3d26 100644 (file)
--- a/m4/prereq.m4
+++ b/m4/prereq.m4
@@ -1,4 +1,4 @@
-#serial 74
+#serial 75
 
 dnl We use gl_ for non Autoconf macros.
 m4_pattern_forbid([^gl_[ABCDEFGHIJKLMNOPQRSTUVXYZ]])dnl
@@ -7,7 +7,7 @@ m4_pattern_forbid([^gl_[ABCDEFGHIJKLMNOPQRSTUVXYZ]])dnl
 # directory of the coreutils package.
 
 
-# Copyright (C) 1998, 2000, 2001, 2003-2007 Free Software Foundation, Inc.
+# Copyright (C) 1998, 2000, 2001, 2003-2008 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
@@ -40,8 +40,6 @@ AC_DEFUN([gl_PREREQ],
   AC_REQUIRE([gl_FD_REOPEN])
   AC_REQUIRE([gl_FUNC_XFTS])
   AC_REQUIRE([gl_MEMXFRM])
-  AC_REQUIRE([gl_SHA256])
-  AC_REQUIRE([gl_SHA512])
   AC_REQUIRE([gl_STRINTCMP])
   AC_REQUIRE([gl_STRNUMCMP])
 ])