From 9a5b92fa76ec1494756d2ace6b7a0a43c48633ea Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 7 May 2011 14:11:41 +0200 Subject: [PATCH] crypto/gc: Move AC_LIBOBJ invocations to module description. * m4/gc.m4 (gl_GC): Move AC_LIBOBJ invocations from here... * modules/crypto/gc (configure.ac): ... to here. --- ChangeLog | 6 ++++++ m4/gc.m4 | 7 +------ modules/crypto/gc | 5 +++++ 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index d7b8efc1e..508338cba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2011-05-07 Bruno Haible + crypto/gc: Move AC_LIBOBJ invocations to module description. + * m4/gc.m4 (gl_GC): Move AC_LIBOBJ invocations from here... + * modules/crypto/gc (configure.ac): ... to here. + +2011-05-07 Bruno Haible + fwriting: Move AC_LIBOBJ invocations to module description. * m4/fwriting.m4 (gl_FUNC_FWRITINT): Move AC_LIBOBJ invocation from here... diff --git a/m4/gc.m4 b/m4/gc.m4 index 976c0d966..ea076e9e4 100644 --- a/m4/gc.m4 +++ b/m4/gc.m4 @@ -1,4 +1,4 @@ -# gc.m4 serial 7 +# gc.m4 serial 8 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, @@ -12,9 +12,4 @@ AC_DEFUN([gl_GC], if test "$libgcrypt" != no; then AC_LIB_HAVE_LINKFLAGS([gcrypt], [gpg-error], [#include ]) fi - if test "$ac_cv_libgcrypt" = yes; then - AC_LIBOBJ([gc-libgcrypt]) - else - AC_LIBOBJ([gc-gnulib]) - fi ]) diff --git a/modules/crypto/gc b/modules/crypto/gc index 408dfef74..339cb8163 100644 --- a/modules/crypto/gc +++ b/modules/crypto/gc @@ -12,6 +12,11 @@ havelib configure.ac: gl_GC +if test "$ac_cv_libgcrypt" = yes; then + AC_LIBOBJ([gc-libgcrypt]) +else + AC_LIBOBJ([gc-gnulib]) +fi if test $gl_cond_libtool = false; then gl_ltlibdeps="$gl_ltlibdeps $LTLIBGCRYPT" gl_libdeps="$gl_libdeps $LIBGCRYPT" -- 2.11.0