regex: Move AC_LIBOBJ invocations to module description.

* m4/regex.m4 (gl_REGEX): Move AC_LIBOBJ and gl_PREREQ_REGEX
invocations from here...
* modules/regex (configure.ac): ... to here.

diff --git a/ChangeLog b/ChangeLog
index d9d2715..cd7367a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2011-05-21  Bruno Haible  <bruno@clisp.org>
 
+       regex: Move AC_LIBOBJ invocations to module description.
+       * m4/regex.m4 (gl_REGEX): Move AC_LIBOBJ and gl_PREREQ_REGEX
+       invocations from here...
+       * modules/regex (configure.ac): ... to here.
+
+2011-05-21  Bruno Haible  <bruno@clisp.org>
+
        realloc-*: Move AC_LIBOBJ invocations to module description.
        * m4/realloc.m4 (gl_REPLACE_REALLOC): Remove macro.
        (gl_FUNC_REALLOC_GNU, gl_FUNC_REALLOC_POSIX): Inline it here. Move

diff --git a/m4/regex.m4 b/m4/regex.m4
index 24198b5..e48fab0 100644 (file)
--- a/m4/regex.m4
+++ b/m4/regex.m4
@@ -1,4 +1,4 @@
-# serial 58
+# serial 59
 
 # Copyright (C) 1996-2001, 2003-2011 Free Software Foundation, Inc.
 #
@@ -207,8 +207,6 @@ AC_DEFUN([gl_REGEX],
       [Define to rpl_regerror if the replacement should be used.])
     AC_DEFINE([regfree], [rpl_regfree],
       [Define to rpl_regfree if the replacement should be used.])
-    AC_LIBOBJ([regex])
-    gl_PREREQ_REGEX
   fi
 ])
 

diff --git a/modules/regex b/modules/regex
index 730076c..4c268a2 100644 (file)
--- a/modules/regex
+++ b/modules/regex
@@ -32,6 +32,10 @@ wctype-h        [test $ac_use_included_regex = yes]
 
 configure.ac:
 gl_REGEX
+if test $ac_use_included_regex = yes; then
+  AC_LIBOBJ([regex])
+  gl_PREREQ_REGEX
+fi
 
 Makefile.am: