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.

diff --git a/ChangeLog b/ChangeLog
index d7b8efc1eeef148259959326a4873432d74273e7..508338cbab06341cb6c9ac8ddad77ac1e66143a0 100644 (file)
--- 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.

diff --git a/m4/gc.m4 b/m4/gc.m4
index 976c0d966d69d81990f457fb010c3da5c49b8ad6..ea076e9e4a3d87b2d510159b7b41ca21d7e9f04c 100644 (file)
--- 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 <gcrypt.h>])
   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 408dfef740dadea76bb50534e9c5a56bcfdef133..339cb81638d1353d25bcdce67747b468c8f357f1 100644 (file)
--- 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"