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.

4 files changed, 6 insertions, 34 deletions

diff --git a/m4/ChangeLog b/m4/ChangeLog
index 6829ab166..11fcc4a33 100644
--- 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 ea9b5bd56..e65682fea 100644
--- 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])
 ])
diff --git a/m4/sha256.m4 b/m4/sha256.m4
deleted file mode 100644
index 4284e3fab..000000000
--- a/m4/sha256.m4
+++ /dev/null
@@ -1,15 +0,0 @@
-# sha256.m4 serial 1
-dnl Copyright (C) 2005 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/m4/sha512.m4
deleted file mode 100644
index 2de0b2ebd..000000000
--- a/m4/sha512.m4
+++ /dev/null
@@ -1,15 +0,0 @@
-# sha512.m4 serial 2
-dnl Copyright (C) 2005, 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_SHA512],
-[
-  AC_LIBSOURCES([sha512.c, sha512.h, u64.h])
-  AC_LIBOBJ([sha512])
-
-  dnl Prerequisites of lib/sha512.c.
-  AC_REQUIRE([AC_C_BIGENDIAN])
-  :
-])