diff options
| author | Bruno Haible <bruno@clisp.org> | 2011-05-21 18:13:27 +0200 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2011-06-16 00:06:42 +0200 |
| commit | a851d08b8a4acb3fedf2e698fb4a8e157aed6113 (patch) | |
| tree | 67019c44d95ee43715b62f49e4ca4e4b07bfd8e1 | |
| parent | 86e2d81da06878e9aace64867dd3f09d63e9f39e (diff) | |
| download | gnulib-a851d08b8a4acb3fedf2e698fb4a8e157aed6113.tar.gz | |
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.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | m4/regex.m4 | 4 | ||||
| -rw-r--r-- | modules/regex | 4 |
3 files changed, 12 insertions, 3 deletions
@@ -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 24198b5570..e48fab0e54 100644 --- 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 730076c2b3..4c268a2115 100644 --- 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: |