Tom G. Christensen wrote:
> a bootstrap with all modules is now broken.
>
> These modules contain references to a deleted m4 file:
> crypto/gc-arcfour:m4/arcfour.m4
> crypto/gc-des:m4/des.m4
> crypto/gc-hmac-md5:m4/hmac-md5.m4
> crypto/gc-hmac-sha1:m4/hmac-sha1.m4
> crypto/gc-rijndael:m4/rijndael.m4
>
> It causes the bootstrap (--create-testdir --with-tests --dir=foo) to fail:
> /home/tgc/projects/gnulib/gnulib/gnulib-tool: *** file
> /home/tgc/projects/gnulib/gnulib/m4/arcfour.m4 not found
Oops. Indeed. My bad: I had concentrated my testing on the POSIX modules.
I'm applying these fixes:
2011-06-16 Bruno Haible <br...@clisp.org>
crypto/gc-arcfour: Fix recent regression.
* modules/crypto/gc-arcfour (Files): Remove m4/arcfour.m4.
(configure.ac): Invoke AC_LIBOBJ here.
* m4/gc-arcfour.m4 (gl_GC_ARCFOUR): Don't invoke gl_ARCFOUR.
Reported by Tom G. Christensen <t...@jupiterrise.com>.
--- modules/crypto/gc-arcfour.orig Fri Jun 17 00:35:09 2011
+++ modules/crypto/gc-arcfour Fri Jun 17 00:28:21 2011
@@ -5,7 +5,6 @@
m4/gc-arcfour.m4
lib/arcfour.h
lib/arcfour.c
-m4/arcfour.m4
Depends-on:
stdint
@@ -13,6 +12,9 @@
configure.ac:
gl_GC_ARCFOUR
+if test "$ac_cv_libgcrypt" != yes; then
+ AC_LIBOBJ([arcfour])
+fi
gl_MODULE_INDICATOR([gc-arcfour])
Makefile.am:
--- m4/gc-arcfour.m4.orig Fri Jun 17 00:35:09 2011
+++ m4/gc-arcfour.m4 Fri Jun 17 00:28:21 2011
@@ -1,4 +1,4 @@
-# gc-arcfour.m4 serial 2
+# gc-arcfour.m4 serial 3
dnl Copyright (C) 2005, 2007, 2009-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -7,7 +7,4 @@
AC_DEFUN([gl_GC_ARCFOUR],
[
AC_REQUIRE([gl_GC])
- if test "$ac_cv_libgcrypt" != yes; then
- gl_ARCFOUR
- fi
])
2011-06-16 Bruno Haible <br...@clisp.org>
crypto/gc-des: Fix recent regression.
* modules/crypto/gc-des (Files): Remove m4/des.m4.
(configure.ac): Invoke AC_LIBOBJ here.
* m4/gc-des.m4 (gl_GC_DES): Don't invoke gl_DES.
Reported by Tom G. Christensen <t...@jupiterrise.com>.
--- modules/crypto/gc-des.orig Fri Jun 17 00:35:09 2011
+++ modules/crypto/gc-des Fri Jun 17 00:28:21 2011
@@ -5,7 +5,6 @@
m4/gc-des.m4
lib/des.h
lib/des.c
-m4/des.m4
Depends-on:
stdint
@@ -14,6 +13,9 @@
configure.ac:
gl_GC_DES
+if test "$ac_cv_libgcrypt" != yes; then
+ AC_LIBOBJ([des])
+fi
gl_MODULE_INDICATOR([gc-des])
Makefile.am:
--- m4/gc-des.m4.orig Fri Jun 17 00:35:09 2011
+++ m4/gc-des.m4 Fri Jun 17 00:28:21 2011
@@ -1,4 +1,4 @@
-# gc-des.m4 serial 2
+# gc-des.m4 serial 3
dnl Copyright (C) 2005, 2007, 2009-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -7,7 +7,4 @@
AC_DEFUN([gl_GC_DES],
[
AC_REQUIRE([gl_GC])
- if test "$ac_cv_libgcrypt" != yes; then
- gl_DES
- fi
])
2011-06-16 Bruno Haible <br...@clisp.org>
crypto/gc-hmac-md5: Fix recent regression.
* modules/crypto/gc-hmac-md5 (Files): Remove m4/hmac-md5.m4.
(configure.ac): Invoke AC_LIBOBJ here.
* m4/gc-hmac-md5.m4 (gl_GC_HMAC_MD5): Don't invoke gl_HMAC_MD5.
Reported by Tom G. Christensen <t...@jupiterrise.com>.
--- modules/crypto/gc-hmac-md5.orig Fri Jun 17 00:35:10 2011
+++ modules/crypto/gc-hmac-md5 Fri Jun 17 00:28:21 2011
@@ -8,7 +8,6 @@
m4/md5.m4
lib/hmac.h
lib/hmac-md5.c
-m4/hmac-md5.m4
lib/memxor.h
lib/memxor.c
m4/memxor.m4
@@ -19,6 +18,11 @@
configure.ac:
gl_GC_HMAC_MD5
+if test "$ac_cv_libgcrypt" != yes; then
+ AC_LIBOBJ([md5])
+ AC_LIBOBJ([hmac-md5])
+ AC_LIBOBJ([memxor])
+fi
gl_MODULE_INDICATOR([gc-hmac-md5])
Makefile.am:
--- m4/gc-hmac-md5.m4.orig Fri Jun 17 00:35:09 2011
+++ m4/gc-hmac-md5.m4 Fri Jun 17 00:28:21 2011
@@ -1,4 +1,4 @@
-# gc-hmac-md5.m4 serial 2
+# gc-hmac-md5.m4 serial 3
dnl Copyright (C) 2005, 2007, 2009-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -9,7 +9,6 @@
AC_REQUIRE([gl_GC])
if test "$ac_cv_libgcrypt" != yes; then
gl_MD5
- gl_HMAC_MD5
gl_MEMXOR
fi
])
2011-06-16 Bruno Haible <br...@clisp.org>
crypto/gc-hmac-sha1: Fix recent regression.
* modules/crypto/gc-hmac-sha1 (Files): Remove m4/hmac-sha1.m4.
(configure.ac): Invoke AC_LIBOBJ here.
* m4/gc-hmac-sha1.m4 (gl_GC_HMAC_SHA1): Don't invoke gl_HMAC_SHA1.
Reported by Tom G. Christensen <t...@jupiterrise.com>.
--- modules/crypto/gc-hmac-sha1.orig Fri Jun 17 00:35:10 2011
+++ modules/crypto/gc-hmac-sha1 Fri Jun 17 00:28:21 2011
@@ -8,7 +8,6 @@
m4/sha1.m4
lib/hmac.h
lib/hmac-sha1.c
-m4/hmac-sha1.m4
lib/memxor.h
lib/memxor.c
m4/memxor.m4
@@ -19,6 +18,11 @@
configure.ac:
gl_GC_HMAC_SHA1
+if test "$ac_cv_libgcrypt" != yes; then
+ AC_LIBOBJ([sha1])
+ AC_LIBOBJ([hmac-sha1])
+ AC_LIBOBJ([memxor])
+fi
gl_MODULE_INDICATOR([gc-hmac-sha1])
Makefile.am:
--- m4/gc-hmac-sha1.m4.orig Fri Jun 17 00:35:09 2011
+++ m4/gc-hmac-sha1.m4 Fri Jun 17 00:28:21 2011
@@ -1,4 +1,4 @@
-# gc-hmac-sha1.m4 serial 2
+# gc-hmac-sha1.m4 serial 3
dnl Copyright (C) 2005, 2007, 2009-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -9,7 +9,6 @@
AC_REQUIRE([gl_GC])
if test "$ac_cv_libgcrypt" != yes; then
gl_SHA1
- gl_HMAC_SHA1
gl_MEMXOR
fi
])
2011-06-16 Bruno Haible <br...@clisp.org>
crypto/gc-rijndael: Fix recent regression.
* modules/crypto/gc-rijndael (Files): Remove m4/rijndael.m4.
(configure.ac): Invoke AC_LIBOBJ here.
* m4/gc-rijndael.m4 (gl_GC_RIJNDAEL): Don't invoke gl_RIJNDAEL.
Reported by Tom G. Christensen <t...@jupiterrise.com>.
--- modules/crypto/gc-rijndael.orig Fri Jun 17 00:35:10 2011
+++ modules/crypto/gc-rijndael Fri Jun 17 00:28:21 2011
@@ -7,7 +7,6 @@
lib/rijndael-alg-fst.h
lib/rijndael-api-fst.c
lib/rijndael-api-fst.h
-m4/rijndael.m4
Depends-on:
stdint
@@ -15,6 +14,10 @@
configure.ac:
gl_GC_RIJNDAEL
+if test "$ac_cv_libgcrypt" != yes; then
+ AC_LIBOBJ([rijndael-alg-fst])
+ AC_LIBOBJ([rijndael-api-fst])
+fi
gl_MODULE_INDICATOR([gc-rijndael])
Makefile.am:
--- m4/gc-rijndael.m4.orig Fri Jun 17 00:35:09 2011
+++ m4/gc-rijndael.m4 Fri Jun 17 00:28:21 2011
@@ -1,4 +1,4 @@
-# gc-rijndael.m4 serial 2
+# gc-rijndael.m4 serial 3
dnl Copyright (C) 2005, 2007, 2009-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -7,7 +7,4 @@
AC_DEFUN([gl_GC_RIJNDAEL],
[
AC_REQUIRE([gl_GC])
- if test "$ac_cv_libgcrypt" != yes; then
- gl_RIJNDAEL
- fi
])
2011-06-16 Bruno Haible <br...@clisp.org>
crypto/gc-arctwo: Fix recent regression.
* modules/crypto/gc-arctwo (configure.ac): Invoke AC_LIBOBJ here.
* m4/arctwo.m4 (gl_ARCTWO): Ensure the expansion is non-empty.
--- modules/crypto/gc-arctwo.orig Fri Jun 17 00:57:29 2011
+++ modules/crypto/gc-arctwo Fri Jun 17 00:28:21 2011
@@ -14,6 +14,9 @@
configure.ac:
gl_GC_ARCTWO
+if test "$ac_cv_libgcrypt" != yes; then
+ AC_LIBOBJ([arctwo])
+fi
gl_MODULE_INDICATOR([gc-arctwo])
Makefile.am:
--- m4/arctwo.m4.orig Fri Jun 17 00:57:28 2011
+++ m4/arctwo.m4 Fri Jun 17 00:33:21 2011
@@ -1,4 +1,4 @@
-# arctwo.m4 serial 3
+# arctwo.m4 serial 4
dnl Copyright (C) 2005-2006, 2009-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -8,4 +8,5 @@
AC_DEFUN([gl_ARCTWO],
[
AC_REQUIRE([AC_C_INLINE])
+ :
])
2011-06-16 Bruno Haible <br...@clisp.org>
crypto/gc-md4: Fix recent regression.
* modules/crypto/gc-md4 (configure.ac): Invoke AC_LIBOBJ here.
* m4/md4.m4 (gl_MD4): Ensure the expansion is non-empty.
--- m4/md4.m4.orig Fri Jun 17 00:57:28 2011
+++ m4/md4.m4 Fri Jun 17 00:32:43 2011
@@ -1,4 +1,4 @@
-# md4.m4 serial 5
+# md4.m4 serial 6
dnl Copyright (C) 2002-2006, 2008-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -9,4 +9,5 @@
[
AC_REQUIRE([gl_BIGENDIAN])
AC_REQUIRE([AC_C_INLINE])
+ :
])
--- modules/crypto/gc-md4.orig Fri Jun 17 00:57:29 2011
+++ modules/crypto/gc-md4 Fri Jun 17 00:28:21 2011
@@ -13,6 +13,9 @@
configure.ac:
gl_GC_MD4
+if test "$ac_cv_libgcrypt" != yes; then
+ AC_LIBOBJ([md4])
+fi
gl_MODULE_INDICATOR([gc-md4])
Makefile.am:
2011-06-16 Bruno Haible <br...@clisp.org>
crypto/gc-md5: Fix recent regression.
* modules/crypto/gc-md5 (configure.ac): Invoke AC_LIBOBJ here.
--- modules/crypto/gc-md5.orig Fri Jun 17 00:57:29 2011
+++ modules/crypto/gc-md5 Fri Jun 17 00:28:21 2011
@@ -13,6 +13,9 @@
configure.ac:
gl_GC_MD5
+if test "$ac_cv_libgcrypt" != yes; then
+ AC_LIBOBJ([md5])
+fi
gl_MODULE_INDICATOR([gc-md5])
Makefile.am:
2011-06-16 Bruno Haible <br...@clisp.org>
crypto/gc-sha1: Fix recent regression.
* modules/crypto/gc-sha1 (configure.ac): Invoke AC_LIBOBJ here.
* m4/gc-sha1.m4 (gl_GC_SHA1): Don't invoke gl_SHA1.
--- modules/crypto/gc-sha1.orig Fri Jun 17 00:57:29 2011
+++ modules/crypto/gc-sha1 Fri Jun 17 00:28:21 2011
@@ -13,6 +13,9 @@
configure.ac:
gl_GC_SHA1
+if test "$ac_cv_libgcrypt" != yes; then
+ AC_LIBOBJ([sha1])
+fi
gl_MODULE_INDICATOR([gc-sha1])
Makefile.am:
--- m4/gc-sha1.m4.orig Fri Jun 17 00:57:28 2011
+++ m4/gc-sha1.m4 Fri Jun 17 00:28:21 2011
@@ -1,4 +1,4 @@
-# gc-sha1.m4 serial 2
+# gc-sha1.m4 serial 3
dnl Copyright (C) 2005, 2007, 2009-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -7,7 +7,4 @@
AC_DEFUN([gl_GC_SHA1],
[
AC_REQUIRE([gl_GC])
- if test "$ac_cv_libgcrypt" != yes; then
- gl_SHA1
- fi
])
--
In memoriam Imre Nagy <http://en.wikipedia.org/wiki/Imre_Nagy>
