diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | m4/strstr.m4 | 7 | ||||
| -rw-r--r-- | modules/strstr | 3 | ||||
| -rw-r--r-- | modules/strstr-simple | 3 |
4 files changed, 15 insertions, 6 deletions
@@ -1,5 +1,13 @@ 2011-05-22 Bruno Haible <bruno@clisp.org> + strstr*: Move AC_LIBOBJ invocations to module description. + * m4/strstr.m4 (gl_FUNC_STRSTR_SIMPLE, gl_FUNC_STRSTR): Move AC_LIBOBJ + invocations from here... + * modules/strstr-simple (configure.ac): ... to here. + * modules/strstr (configure.ac): ... and here. + +2011-05-22 Bruno Haible <bruno@clisp.org> + strsignal: Move AC_LIBOBJ invocations to module description. * m4/strsignal.m4 (gl_FUNC_STRSIGNAL): Set HAVE_STRSIGNAL. Move AC_LIBOBJ and gl_PREREQ_STRSIGNAL invocations from here... diff --git a/m4/strstr.m4 b/m4/strstr.m4 index a42a1db984..010bd7ffe5 100644 --- a/m4/strstr.m4 +++ b/m4/strstr.m4 @@ -1,4 +1,4 @@ -# strstr.m4 serial 13 +# strstr.m4 serial 14 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, @@ -11,7 +11,6 @@ AC_DEFUN([gl_FUNC_STRSTR_SIMPLE], AC_REQUIRE([gl_FUNC_MEMCHR]) if test "$gl_cv_func_memchr_works" != yes; then REPLACE_STRSTR=1 - AC_LIBOBJ([strstr]) else dnl Detect http://sourceware.org/bugzilla/show_bug.cgi?id=12092. AC_CACHE_CHECK([whether strstr works], @@ -53,7 +52,6 @@ AC_DEFUN([gl_FUNC_STRSTR_SIMPLE], ]) if test "$gl_cv_func_strstr_works_always" != yes; then REPLACE_STRSTR=1 - AC_LIBOBJ([strstr]) fi fi ]) # gl_FUNC_STRSTR_SIMPLE @@ -121,7 +119,4 @@ static void quit (int sig) { exit (sig + 128); } REPLACE_STRSTR=1 fi fi - if test $REPLACE_STRSTR = 1; then - AC_LIBOBJ([strstr]) - fi ]) # gl_FUNC_STRSTR diff --git a/modules/strstr b/modules/strstr index dc33bd2952..49367614df 100644 --- a/modules/strstr +++ b/modules/strstr @@ -8,6 +8,9 @@ strstr-simple configure.ac: gl_FUNC_STRSTR +if test $REPLACE_STRSTR = 1; then + AC_LIBOBJ([strstr]) +fi Makefile.am: diff --git a/modules/strstr-simple b/modules/strstr-simple index 5f66b279c2..c61afc45ad 100644 --- a/modules/strstr-simple +++ b/modules/strstr-simple @@ -14,6 +14,9 @@ memcmp [test $REPLACE_STRSTR = 1] configure.ac: gl_FUNC_STRSTR_SIMPLE +if test $REPLACE_STRSTR = 1; then + AC_LIBOBJ([strstr]) +fi gl_STRING_MODULE_INDICATOR([strstr]) Makefile.am: |