Mercurial > hg > octave-lojdl > gnulib-hg
changeset 14954:ec17d168ffc6
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.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Sat, 07 May 2011 14:11:41 +0200 |
| parents | 632892f73130 |
| children | 2a2e0d5e8803 |
| files | ChangeLog m4/gc.m4 modules/crypto/gc |
| diffstat | 3 files changed, 12 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-05-07 Bruno Haible <bruno@clisp.org> + + 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 <bruno@clisp.org> fwriting: Move AC_LIBOBJ invocations to module description.
--- 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 @@ if test "$libgcrypt" != no; then AC_LIB_HAVE_LINKFLAGS([gcrypt], [gpg-error], [#include <gcrypt.h>]) fi - if test "$ac_cv_libgcrypt" = yes; then - AC_LIBOBJ([gc-libgcrypt]) - else - AC_LIBOBJ([gc-gnulib]) - fi ])
--- a/modules/crypto/gc +++ b/modules/crypto/gc @@ -12,6 +12,11 @@ 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"