btowc: Move AC_LIBOBJ invocations to module description.

* m4/btowc.m4 (gl_FUNC_BTOWC): Move AC_LIBOBJ and gl_PREREQ_BTOWC
invocations from here...
* modules/btowc (configure.ac): ... to here.

diff --git a/ChangeLog b/ChangeLog
index f030e93a005580cad7b416e4a25d0bf618388313..9d185f53dd575f81b07f5d7eab1864a5f7227671 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-05-05  Bruno Haible  <bruno@clisp.org>
+
+       btowc: Move AC_LIBOBJ invocations to module description.
+       * m4/btowc.m4 (gl_FUNC_BTOWC): Move AC_LIBOBJ and gl_PREREQ_BTOWC
+       invocations from here...
+       * modules/btowc (configure.ac): ... to here.
+
 2011-05-21  Bruno Haible  <bruno@clisp.org>
 
        atexit: Move AC_LIBOBJ invocations to module description.

diff --git a/m4/btowc.m4 b/m4/btowc.m4
index 32bf0cfca0a1c492a7d54aa43c8fec5e9f7232e0..2b845e7ceb21212a4f0f007a28c518d2759746b9 100644 (file)
--- a/m4/btowc.m4
+++ b/m4/btowc.m4
@@ -1,4 +1,4 @@
-# btowc.m4 serial 9
+# btowc.m4 serial 10
 dnl Copyright (C) 2008-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,
@@ -108,10 +108,6 @@ int main ()
       *) REPLACE_BTOWC=1 ;;
     esac
   fi
-  if test $HAVE_BTOWC = 0 || test $REPLACE_BTOWC = 1; then
-    AC_LIBOBJ([btowc])
-    gl_PREREQ_BTOWC
-  fi
 ])
 
 # Prerequisites of lib/btowc.c.

diff --git a/modules/btowc b/modules/btowc
index 1566a2fa713951fda6bce9c59f15cfc367cdc3ec..b9572a637503d7b3d184b7ea1c78fc37a9222749 100644 (file)
--- a/modules/btowc
+++ b/modules/btowc
@@ -12,6 +12,10 @@ mbtowc          [test $HAVE_BTOWC = 0 || test $REPLACE_BTOWC = 1]
 
 configure.ac:
 gl_FUNC_BTOWC
+if test $HAVE_BTOWC = 0 || test $REPLACE_BTOWC = 1; then
+  AC_LIBOBJ([btowc])
+  gl_PREREQ_BTOWC
+fi
 gl_WCHAR_MODULE_INDICATOR([btowc])
 
 Makefile.am: