From 23120a4b85719b00bd05ef70b976913cf9f888b1 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Mon, 23 May 2011 23:33:47 +0200 Subject: [PATCH] crypto/gc-pbkdf2-sha1: Move AC_LIBOBJ invocations to module description. * m4/gc-pbkdf2-sha1.m4: Remove file. * modules/crypto/gc-pbkdf2-sha1 (Files): Remove it. (configure.ac): Remove gl_GC_PBKDF2_SHA1 call. (Makefile.am): Augment lib_SOURCES. --- ChangeLog | 8 ++++++++ m4/gc-pbkdf2-sha1.m4 | 10 ---------- modules/crypto/gc-pbkdf2-sha1 | 3 +-- 3 files changed, 9 insertions(+), 12 deletions(-) delete mode 100644 m4/gc-pbkdf2-sha1.m4 diff --git a/ChangeLog b/ChangeLog index a6a63ee8d..72cfe8c9c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2011-05-23 Bruno Haible + crypto/gc-pbkdf2-sha1: Move AC_LIBOBJ invocations to module description. + * m4/gc-pbkdf2-sha1.m4: Remove file. + * modules/crypto/gc-pbkdf2-sha1 (Files): Remove it. + (configure.ac): Remove gl_GC_PBKDF2_SHA1 call. + (Makefile.am): Augment lib_SOURCES. + +2011-05-23 Bruno Haible + fts: Move AC_LIBOBJ invocations to module description. * m4/fts.m4 (gl_FUNC_FTS_CORE): Move AC_LIBOBJ invocation from here... * modules/fts (configure.ac): ... to here. diff --git a/m4/gc-pbkdf2-sha1.m4 b/m4/gc-pbkdf2-sha1.m4 deleted file mode 100644 index 9f7e1c5a9..000000000 --- a/m4/gc-pbkdf2-sha1.m4 +++ /dev/null @@ -1,10 +0,0 @@ -# gc-pbkdf2-sha1.m4 serial 2 -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, -dnl with or without modifications, as long as this notice is preserved. - -AC_DEFUN([gl_GC_PBKDF2_SHA1], -[ - AC_LIBOBJ([gc-pbkdf2-sha1]) -]) diff --git a/modules/crypto/gc-pbkdf2-sha1 b/modules/crypto/gc-pbkdf2-sha1 index d70960c1e..b0cec6145 100644 --- a/modules/crypto/gc-pbkdf2-sha1 +++ b/modules/crypto/gc-pbkdf2-sha1 @@ -3,16 +3,15 @@ Password-Based Key Derivation Function according to PKCS#5/RFC2898 Files: lib/gc-pbkdf2-sha1.c -m4/gc-pbkdf2-sha1.m4 Depends-on: crypto/gc crypto/gc-hmac-sha1 configure.ac: -gl_GC_PBKDF2_SHA1 Makefile.am: +lib_SOURCES += gc-pbkdf2-sha1.c Include: "gc.h" -- 2.11.0