Mercurial > gnulib
changeset 15801:3002f394d1fe
gnulib-tool: Improve suggestion where to put gl_EARLY invocation.
* gnulib-tool (func_import): If the configure.ac has an AC_PROG_CC_STDC
invocation, say "right after AC_PROG_CC_STDC", not "right after
AC_PROG_CC".
Reported by Gary V. Vaughan <gary@gnu.org>.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Fri, 30 Sep 2011 12:10:27 +0200 |
| parents | d79b27b411b7 |
| children | 2f532a2411eb |
| files | ChangeLog gnulib-tool |
| diffstat | 2 files changed, 18 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Sep 30 11:54:58 2011 +0200 +++ b/ChangeLog Fri Sep 30 12:10:27 2011 +0200 @@ -1,3 +1,11 @@ +2011-09-30 Bruno Haible <bruno@clisp.org> + + gnulib-tool: Improve suggestion where to put gl_EARLY invocation. + * gnulib-tool (func_import): If the configure.ac has an AC_PROG_CC_STDC + invocation, say "right after AC_PROG_CC_STDC", not "right after + AC_PROG_CC". + Reported by Gary V. Vaughan <gary@gnu.org>. + 2011-09-30 Bruno Haible <bruno@clisp.org> Centralize C99 requirement.
--- a/gnulib-tool Fri Sep 30 11:54:58 2011 +0200 +++ b/gnulib-tool Fri Sep 30 12:10:27 2011 +0200 @@ -5460,7 +5460,16 @@ echo " - mention \"${val}\" in ${var} in ${dir}Makefile.am," fi done - echo " - invoke ${macro_prefix}_EARLY in $configure_ac, right after AC_PROG_CC," + if grep '^ *AC_PROG_CC_STDC' "$configure_ac" > /dev/null; then + position_early_after=AC_PROG_CC_STDC + else + if grep '^ *AC_PROG_CC_C99' "$configure_ac" > /dev/null; then + position_early_after=AC_PROG_CC_C99 + else + position_early_after=AC_PROG_CC + fi + fi + echo " - invoke ${macro_prefix}_EARLY in $configure_ac, right after $position_early_after," echo " - invoke ${macro_prefix}_INIT in $configure_ac." }