Merge branch 'master' into squeeze

[debian/amanda] / gnulib / regenerate / no-error.patch

diff --git a/gnulib/regenerate/no-error.patch b/gnulib/regenerate/no-error.patch
index a12e7d2ec2ec58ebbf11c39bfb68e80bae1afc5e..f62dd5702e24fb0bb1949d821b4acbeb24890159 100644 (file)
--- a/gnulib/regenerate/no-error.patch
+++ b/gnulib/regenerate/no-error.patch
@@ -2,13 +2,14 @@ Index: gnulib/Makefile.am
 ===================================================================
 --- gnulib/Makefile.am (revision 5691)
 +++ gnulib/Makefile.am (working copy)
-@@ -26,6 +26,9 @@
+@@ -27,6 +27,9 @@
  MAINTAINERCLEANFILES =
  
  AM_CPPFLAGS =
 +if GCC_COMPILER
 +  AM_CFLAGS = -Wno-error -Wno-sign-compare
 +endif
+ AM_CFLAGS =
  
  noinst_LTLIBRARIES += libgnu.la