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.

diff --git a/ChangeLog b/ChangeLog
index 95a9a875a3acb8784046370c7386aa7a7c7eebd5..19a3dffbb1b994b5908366d522dc3f091f2cf672 100644 (file)
--- 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().

diff --git a/gnulib-tool b/gnulib-tool
index 37073ededfe994a7a1a53f77993fbb69ca888862..2235cf9ca77329d4a2da474ea45d59428a12cdb8 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -3341,20 +3341,25 @@ func_emit_lib_Makefile_am ()
       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 \