changeset 7180:d445de86b311

Avoid the need for AC_LIBSOURCES in m4 macros. * modules/arcfour (EXTRA_DIST): Add arcfour.h. * modules/arctwo (EXTRA_DIST): Add arctwo.h. * modules/check-version (EXTRA_DIST): Add check-version.h. * modules/crc (EXTRA_DIST): Add crc.h. * modules/des (EXTRA_DIST): Add des.h. * modules/gc (EXTRA_DIST): Add gc.h. * modules/getdelim (EXTRA_DIST): Add getdelim.h. * modules/getline (EXTRA_DIST): Add getline.h. * modules/getlogin_r (EXTRA_DIST): Add getlogin_r.h. * modules/hmac-md5 (EXTRA_DIST): Add hmac.h. * modules/hmac-sha1 (EXTRA_DIST): Add hmac.h. * modules/md2 (EXTRA_DIST): Add md2.h. * modules/md4 (EXTRA_DIST): Add md4.h. * modules/pagealign_alloc (EXTRA_DIST): Add pagealign_alloc.h. * modules/read-file (EXTRA_DIST): Add read-file.h. * modules/readline (EXTRA_DIST): Add readline.h. * modules/rijndael (EXTRA_DIST): Add rijndael-alg-fst.h, rijndael-api-fst.h. * m4/rijndael.m4 (gl_ARCFOUR): * m4/arctwo.m4 (gl_ARCTWO): * m4/check-version.m4 (gl_CHECK_VERSION): * m4/crc.m4 (gl_CRC): * m4/des.m4 (gl_DES): * m4/gc-pbkdf2-sha1.m4 (gl_GC_PBKDF2_SHA1): * m4/gc.m4 (gl_GC): * m4/getdelim.m4 (gl_FUNC_GETDELIM): * m4/getline.m4 (gl_FUNC_GETLINE): * m4/getlogin_r.m4 (gl_GETLOGIN_R_SUBSTITUTE): * m4/hmac-md5.m4 (gl_HMAC_MD5): * m4/hmac-sha1.m4 (gl_HMAC_SHA1): * m4/md2.m4 (gl_MD2): * m4/md4.m4 (gl_MD4): * m4/pagealign_alloc.m4 (gl_PAGEALIGN_ALLOC): * m4/read-file.m4 (gl_FUNC_READ_FILE): * m4/readline.m4 (gl_FUNC_READLINE): * m4/rijndael.m4 (gl_RIJNDAEL): Don't use AC_LIBSOURCES; instead, rely on the files in ../modules/ to get the necessary .h files and whatnot.
author Paul Eggert <eggert@cs.ucla.edu>
date Tue, 22 Aug 2006 17:15:28 +0000
parents 2fa0a8f44af8
children 1090c1338506
files ChangeLog m4/ChangeLog m4/arcfour.m4 m4/arctwo.m4 m4/check-version.m4 m4/crc.m4 m4/des.m4 m4/gc-pbkdf2-sha1.m4 m4/gc.m4 m4/getdelim.m4 m4/getline.m4 m4/getlogin_r.m4 m4/hmac-md5.m4 m4/hmac-sha1.m4 m4/md2.m4 m4/md4.m4 m4/pagealign_alloc.m4 m4/read-file.m4 m4/readline.m4 m4/rijndael.m4 modules/arcfour modules/arctwo modules/check-version modules/crc modules/des modules/gc modules/getdelim modules/getline modules/getlogin_r modules/hmac-md5 modules/hmac-sha1 modules/md2 modules/md4 modules/pagealign_alloc modules/read-file modules/readline modules/rijndael
diffstat 37 files changed, 93 insertions(+), 52 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2006-08-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Avoid the need for AC_LIBSOURCES in m4 macros.
+	* modules/arcfour (EXTRA_DIST): Add arcfour.h.
+	* modules/arctwo (EXTRA_DIST): Add arctwo.h.
+	* modules/check-version (EXTRA_DIST): Add check-version.h.
+	* modules/crc (EXTRA_DIST): Add crc.h.
+	* modules/des (EXTRA_DIST): Add des.h.
+	* modules/gc (EXTRA_DIST): Add gc.h.
+	* modules/getdelim (EXTRA_DIST): Add getdelim.h.
+	* modules/getline (EXTRA_DIST): Add getline.h.
+	* modules/getlogin_r (EXTRA_DIST): Add getlogin_r.h.
+	* modules/hmac-md5 (EXTRA_DIST): Add hmac.h.
+	* modules/hmac-sha1 (EXTRA_DIST): Add hmac.h.
+	* modules/md2 (EXTRA_DIST): Add md2.h.
+	* modules/md4 (EXTRA_DIST): Add md4.h.
+	* modules/pagealign_alloc (EXTRA_DIST): Add pagealign_alloc.h.
+	* modules/read-file (EXTRA_DIST): Add read-file.h.
+	* modules/readline (EXTRA_DIST): Add readline.h.
+	* modules/rijndael (EXTRA_DIST): Add rijndael-alg-fst.h,
+	rijndael-api-fst.h.
+
 2006-08-22  Simon Josefsson  <jas@extundo.com>
 
 	* MODULES.html.sh: Add "Support for maintaining and release
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,26 @@
+2006-08-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* rijndael.m4 (gl_ARCFOUR):
+	* arctwo.m4 (gl_ARCTWO):
+	* check-version.m4 (gl_CHECK_VERSION):
+	* crc.m4 (gl_CRC):
+	* des.m4 (gl_DES):
+	* gc-pbkdf2-sha1.m4 (gl_GC_PBKDF2_SHA1):
+	* gc.m4 (gl_GC):
+	* getdelim.m4 (gl_FUNC_GETDELIM):
+	* getline.m4 (gl_FUNC_GETLINE):
+	* getlogin_r.m4 (gl_GETLOGIN_R_SUBSTITUTE):
+	* hmac-md5.m4 (gl_HMAC_MD5):
+	* hmac-sha1.m4 (gl_HMAC_SHA1):
+	* md2.m4 (gl_MD2):
+	* md4.m4 (gl_MD4):
+	* pagealign_alloc.m4 (gl_PAGEALIGN_ALLOC):
+	* read-file.m4 (gl_FUNC_READ_FILE):
+	* readline.m4 (gl_FUNC_READLINE):
+	* rijndael.m4 (gl_RIJNDAEL):
+	Don't use AC_LIBSOURCES; instead, rely on the files in ../modules/
+	to get the necessary .h files and whatnot.
+
 2006-08-21  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* mkdir-p.m4 (gl_MKDIR_PARENTS): Check for fchmod.
--- a/m4/arcfour.m4
+++ b/m4/arcfour.m4
@@ -1,11 +1,10 @@
-# arcfour.m4 serial 1
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
+# arcfour.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_ARCFOUR],
 [
-  AC_LIBSOURCES([arcfour.c, arcfour.h])
   AC_LIBOBJ([arcfour])
 ])
--- a/m4/arctwo.m4
+++ b/m4/arctwo.m4
@@ -1,12 +1,11 @@
-# arctwo.m4 serial 1
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
+# arctwo.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_ARCTWO],
 [
-  AC_LIBSOURCES([arctwo.c, arctwo.h])
   AC_LIBOBJ([arctwo])
   # Prerequisites of lib/arctwo.c.
   AC_REQUIRE([AC_C_INLINE])
--- a/m4/check-version.m4
+++ b/m4/check-version.m4
@@ -1,11 +1,10 @@
-#serial 1
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
+#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_CHECK_VERSION],
 [
-  AC_LIBSOURCES([check-version.c, check-version.h])
   AC_LIBOBJ([check-version])
 ])
--- a/m4/crc.m4
+++ b/m4/crc.m4
@@ -1,11 +1,10 @@
-# crc.m4 serial 1
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
+# crc.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_CRC],
 [
-  AC_LIBSOURCES([crc.h, crc.c])
   AC_LIBOBJ([crc])
 ])
--- a/m4/des.m4
+++ b/m4/des.m4
@@ -1,11 +1,10 @@
-# des.m4 serial 1
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
+# des.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_DES],
 [
-  AC_LIBSOURCES([des.c, des.h])
   AC_LIBOBJ([des])
 ])
--- a/m4/gc-pbkdf2-sha1.m4
+++ b/m4/gc-pbkdf2-sha1.m4
@@ -1,11 +1,10 @@
-# gc-pbkdf2-sha1.m4 serial 1
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
+# gc-pbkdf2-sha1.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_GC_PBKDF2_SHA1],
 [
-  AC_LIBSOURCES([gc-pbkdf2-sha1.c])
   AC_LIBOBJ([gc-pbkdf2-sha1])
 ])
--- a/m4/gc.m4
+++ b/m4/gc.m4
@@ -1,4 +1,4 @@
-# gc.m4 serial 3
+# gc.m4 serial 4
 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,
@@ -6,7 +6,6 @@
 
 AC_DEFUN([gl_GC],
 [
-  AC_LIBSOURCES([gc.h, gc-gnulib.c, gc-libgcrypt.c])
   AC_ARG_WITH(libgcrypt,
     AS_HELP_STRING([--with-libgcrypt], [use libgcrypt for low-level crypto]),
     libgcrypt=$withval, libgcrypt=no)
--- a/m4/getdelim.m4
+++ b/m4/getdelim.m4
@@ -1,6 +1,6 @@
-# getdelim.m4 serial 1
+# getdelim.m4 serial 2
 
-dnl Copyright (C) 2005 Free Software dnl Foundation, Inc.
+dnl Copyright (C) 2005, 2006 Free Software dnl Foundation, Inc.
 dnl
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -10,7 +10,6 @@
 
 AC_DEFUN([gl_FUNC_GETDELIM],
 [
-  AC_LIBSOURCES([getdelim.c, getdelim.h])
 
   dnl Persuade glibc <stdio.h> to declare getdelim().
   AC_REQUIRE([AC_GNU_SOURCE])
--- a/m4/getline.m4
+++ b/m4/getline.m4
@@ -1,4 +1,4 @@
-# getline.m4 serial 14
+# getline.m4 serial 15
 
 dnl Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2006 Free Software
 dnl Foundation, Inc.
@@ -15,8 +15,6 @@
 dnl to do with the function we need.
 AC_DEFUN([gl_FUNC_GETLINE],
 [
-  AC_LIBSOURCES([getline.c, getline.h])
-
   dnl Persuade glibc <stdio.h> to declare getline().
   AC_REQUIRE([AC_GNU_SOURCE])
 
--- a/m4/getlogin_r.m4
+++ b/m4/getlogin_r.m4
@@ -1,4 +1,4 @@
-#serial 2
+#serial 3
 
 # Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 #
@@ -14,7 +14,6 @@
 AC_DEFUN([gl_GETLOGIN_R_SUBSTITUTE],
 [
   gl_PREREQ_GETLOGIN_R
-  AC_LIBSOURCE([getlogin_r.h])
   AC_LIBOBJ([getlogin_r])
 ])
 
--- a/m4/hmac-md5.m4
+++ b/m4/hmac-md5.m4
@@ -1,11 +1,10 @@
-# hmac-md5.m4 serial 1
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
+# hmac-md5.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_HMAC_MD5],
 [
-  AC_LIBSOURCES([hmac.h, hmac-md5.c])
   AC_LIBOBJ([hmac-md5])
 ])
--- a/m4/hmac-sha1.m4
+++ b/m4/hmac-sha1.m4
@@ -1,11 +1,10 @@
-# hmac-sha1.m4 serial 1
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
+# hmac-sha1.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_HMAC_SHA1],
 [
-  AC_LIBSOURCES([hmac.h, hmac-sha1.c])
   AC_LIBOBJ([hmac-sha1])
 ])
--- a/m4/md2.m4
+++ b/m4/md2.m4
@@ -1,11 +1,10 @@
-# md2.m4 serial 1
-dnl Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# md2.m4 serial 2
+dnl Copyright (C) 2002, 2003, 2004, 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_MD2],
 [
-  AC_LIBSOURCES([md2.c, md2.h])
   AC_LIBOBJ([md2])
 ])
--- a/m4/md4.m4
+++ b/m4/md4.m4
@@ -1,12 +1,11 @@
-# md4.m4 serial 1
-dnl Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# md4.m4 serial 2
+dnl Copyright (C) 2002, 2003, 2004, 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_MD4],
 [
-  AC_LIBSOURCES([md4.c, md4.h])
   AC_LIBOBJ([md4])
 
   dnl Prerequisites of lib/md4.c.
--- a/m4/pagealign_alloc.m4
+++ b/m4/pagealign_alloc.m4
@@ -1,5 +1,5 @@
-#serial 2
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
+#serial 3
+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.
@@ -9,7 +9,6 @@
   dnl Persuade glibc <sys/mman.h> to define MAP_ANONYMOUS.
   AC_REQUIRE([AC_GNU_SOURCE])
 
-  AC_LIBSOURCE([pagealign_alloc.h])
   AC_LIBOBJ([pagealign_alloc])
   gl_PREREQ_PAGEALIGN_ALLOC
 ])
--- a/m4/read-file.m4
+++ b/m4/read-file.m4
@@ -1,4 +1,4 @@
-# read-file.m4 serial 1
+# read-file.m4 serial 2
 dnl Copyright (C) 2002, 2003, 2004, 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,
@@ -6,7 +6,6 @@
 
 AC_DEFUN([gl_FUNC_READ_FILE],
 [
-  AC_LIBSOURCES([read-file.c, read-file.h])
   AC_LIBOBJ([read-file])
   gl_PREREQ_READ_FILE
 ])
--- a/m4/readline.m4
+++ b/m4/readline.m4
@@ -1,4 +1,4 @@
-# readline.m4 serial 4
+# readline.m4 serial 5
 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,
@@ -9,8 +9,6 @@
 
 AC_DEFUN([gl_FUNC_READLINE],
 [
-  AC_LIBSOURCES([readline.c, readline.h])
-
   dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
   AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
   AC_REQUIRE([AC_LIB_RPATH])
--- a/m4/rijndael.m4
+++ b/m4/rijndael.m4
@@ -1,13 +1,11 @@
-# rijndael.m4 serial 1
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
+# rijndael.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_RIJNDAEL],
 [
-  AC_LIBSOURCES([rijndael-alg-fst.c, rijndael-alg-fst.h])
   AC_LIBOBJ([rijndael-alg-fst])
-  AC_LIBSOURCES([rijndael-api-fst.c, rijndael-api-fst.h])
   AC_LIBOBJ([rijndael-api-fst])
 ])
--- a/modules/arcfour
+++ b/modules/arcfour
@@ -13,6 +13,7 @@
 gl_ARCFOUR
 
 Makefile.am:
+EXTRA_DIST += arcfour.h
 
 Include:
 "arcfour.h"
--- a/modules/arctwo
+++ b/modules/arctwo
@@ -13,6 +13,7 @@
 gl_ARCTWO
 
 Makefile.am:
+EXTRA_DIST += arctwo.h
 
 Include:
 "arctwo.h"
--- a/modules/check-version
+++ b/modules/check-version
@@ -13,6 +13,7 @@
 gl_CHECK_VERSION
 
 Makefile.am:
+EXTRA_DIST += check-version.h
 
 Include:
 "check-version.h"
--- a/modules/crc
+++ b/modules/crc
@@ -13,6 +13,7 @@
 gl_CRC
 
 Makefile.am:
+EXTRA_DIST += crc.h
 
 Include:
 "crc.h"
--- a/modules/des
+++ b/modules/des
@@ -14,6 +14,7 @@
 gl_DES
 
 Makefile.am:
+EXTRA_DIST += des.h
 
 Include:
 "des.h"
--- a/modules/gc
+++ b/modules/gc
@@ -14,6 +14,7 @@
 gl_GC
 
 Makefile.am:
+EXTRA_DIST += gc.h
 if GL_COND_LIBTOOL
 lib_LIBADD += $(LTLIBGCRYPT)
 else
--- a/modules/getdelim
+++ b/modules/getdelim
@@ -12,6 +12,7 @@
 gl_FUNC_GETDELIM
 
 Makefile.am:
+EXTRA_DIST += getdelim.h
 
 Include:
 "getdelim.h"
--- a/modules/getline
+++ b/modules/getline
@@ -13,6 +13,7 @@
 gl_FUNC_GETLINE
 
 Makefile.am:
+EXTRA_DIST += getline.h
 
 Include:
 "getline.h"
--- a/modules/getlogin_r
+++ b/modules/getlogin_r
@@ -13,6 +13,7 @@
 gl_GETLOGIN_R
 
 Makefile.am:
+EXTRA_DIST += getlogin_r.h
 
 Include:
 "getlogin_r.h"
--- a/modules/hmac-md5
+++ b/modules/hmac-md5
@@ -14,6 +14,7 @@
 gl_HMAC_MD5
 
 Makefile.am:
+EXTRA_DIST += hmac.h
 
 Include:
 "hmac.h"
--- a/modules/hmac-sha1
+++ b/modules/hmac-sha1
@@ -14,6 +14,7 @@
 gl_HMAC_SHA1
 
 Makefile.am:
+EXTRA_DIST += hmac.h
 
 Include:
 "hmac.h"
--- a/modules/md2
+++ b/modules/md2
@@ -13,6 +13,7 @@
 gl_MD2
 
 Makefile.am:
+EXTRA_DIST += md2.h
 
 Include:
 "md2.h"
--- a/modules/md4
+++ b/modules/md4
@@ -13,6 +13,7 @@
 gl_MD4
 
 Makefile.am:
+EXTRA_DIST += md4.h
 
 Include:
 "md4.h"
--- a/modules/pagealign_alloc
+++ b/modules/pagealign_alloc
@@ -19,6 +19,7 @@
 gl_PAGEALIGN_ALLOC
 
 Makefile.am:
+EXTRA_DIST += pagealign_alloc.h
 
 Include:
 #include "pagealign_alloc.h"
--- a/modules/read-file
+++ b/modules/read-file
@@ -12,6 +12,7 @@
 gl_FUNC_READ_FILE
 
 Makefile.am:
+EXTRA_DIST += read-file.h
 
 Include:
 "read-file.h"
--- a/modules/readline
+++ b/modules/readline
@@ -14,6 +14,7 @@
 gl_FUNC_READLINE
 
 Makefile.am:
+EXTRA_DIST += readline.h
 
 Include:
 "readline.h"
--- a/modules/rijndael
+++ b/modules/rijndael
@@ -15,6 +15,7 @@
 gl_RIJNDAEL
 
 Makefile.am:
+EXTRA_DIST += rijndael-alg-fst.h rijndael-api-fst.h
 
 Include:
 "rijndael-alg-fst.h"