Mercurial > hg > octave-lojdl > gnulib-hg

changeset 15078:c6c18bdb8fc9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Bruno Haible <bruno@clisp.org>
date Sat, 21 May 2011 18:13:27 +0200
parents 52f8925a96a4
children 4f21126cd802
files ChangeLog m4/regex.m4 modules/regex
diffstat 3 files changed, 12 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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 @@
       [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
 ])
 
--- a/modules/regex
+++ b/modules/regex
@@ -32,6 +32,10 @@
 
 configure.ac:
 gl_REGEX
+if test $ac_use_included_regex = yes; then
+  AC_LIBOBJ([regex])
+  gl_PREREQ_REGEX
+fi
 
 Makefile.am: