Mercurial > hg > octave-lojdl > gnulib-hg
changeset 14917:42a9e4eb100a
gnulib-tool: Addendum to 2011-06-08 commit.
* gnulib-tool (func_emit_lib_Makefile_am): If options --makefile-name
and --witness-c-macro have been given, augment AM_CPPFLAGS.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Mon, 13 Jun 2011 17:44:26 +0200 |
| parents | d9e175d5d217 |
| children | fc8a3cc2baa8 |
| files | ChangeLog gnulib-tool |
| diffstat | 2 files changed, 21 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-06-13 Bruno Haible <bruno@clisp.org> + + gnulib-tool: Addendum to 2011-06-08 commit. + * gnulib-tool (func_emit_lib_Makefile_am): If options --makefile-name + and --witness-c-macro have been given, augment AM_CPPFLAGS. + 2011-06-13 Bruno Haible <bruno@clisp.org> fseeko: Provide a non-inline replacement of fseek().
--- a/gnulib-tool +++ b/gnulib-tool @@ -3341,20 +3341,25 @@ fi fi done + if test -n "$witness_c_macro"; then + cppflags_part1=" -D$witness_c_macro=1" + else + cppflags_part1= + fi + if $for_test; then + cppflags_part2=" -DGNULIB_STRICT_CHECKING=1" + else + cppflags_part2= + fi if test -z "$makefile_name"; then echo - if $for_test; then - cppflags_part1=" -DGNULIB_STRICT_CHECKING=1" - else - cppflags_part1= - fi - if test -n "$witness_c_macro"; then - cppflags_part2=" -D$witness_c_macro=1" - else - cppflags_part2= - fi echo "AM_CPPFLAGS =$cppflags_part1$cppflags_part2" echo "AM_CFLAGS =" + else + if test -n "$cppflags_part1$cppflags_part2"; then + echo + echo "AM_CPPFLAGS +=$cppflags_part1$cppflags_part2" + fi fi echo if LC_ALL=C grep "^[a-zA-Z0-9_]*_${perhapsLT}LIBRARIES *+\{0,1\}= *$libname\\.$libext\$" "$tmp"/allsnippets > /dev/null \