- restore llvm bcond default for ac

[packages/clamav.git] / am-nosilentrules.patch

diff --git a/am-nosilentrules.patch b/am-nosilentrules.patch
index 111380a4b7723b2328f4fd6ebdddd0080d7590a8..418a5d0d3764b88d6640c6f351f79e3fd78ac927 100644 (file)
--- a/am-nosilentrules.patch
+++ b/am-nosilentrules.patch
@@ -1,12 +1,29 @@
---- clamav-0.96/configure.in~  2010-04-15 13:38:54.000000000 +0300
-+++ clamav-0.96/configure.in   2010-04-15 13:38:55.799688151 +0300
+--- clamav-0.96/configure.ac~  2010-04-15 13:38:54.000000000 +0300
++++ clamav-0.96/configure.ac   2010-04-15 13:38:55.799688151 +0300
 @@ -34,8 +34,7 @@
  
  dnl -Wall and -Werror here are NOT CFLAGS, they refer to automake warnings
  dnl enable stealth builds and psychedelic tests
--AM_INIT_AUTOMAKE([1.11 -Wall -Wportability -Wno-override -Werror std-options foreign dist-bzip2 no-define color-tests parallel-tests tar-ustar])
+-AM_INIT_AUTOMAKE([1.11 -Wall -Wportability -Wno-override std-options foreign dist-bzip2 no-define color-tests parallel-tests tar-ustar])
 -AM_SILENT_RULES([yes])
-+AM_INIT_AUTOMAKE([1.10 -Wall -Wportability -Wno-override -Werror std-options foreign dist-bzip2 no-define tar-ustar])
++AM_INIT_AUTOMAKE([1.10 -Wall -Wportability -Wno-override std-options foreign dist-bzip2 no-define tar-ustar])
  
  dnl we told automake to not define these, since we want to include
  dnl the date in the version
+--- clamav-0.96/m4/acinclude.m4~       2010-04-15 14:58:22.000000000 +0300
++++ clamav-0.96/m4/acinclude.m4        2010-04-15 14:59:20.072733581 +0300
+@@ -789,9 +789,9 @@
+ AC_DEFUN([CL_MSG_STATUS],
+ [
+    m4_if($#,3,,[m4_fatal([$0: invalid number of arguments: $#])])
+-   AS_ECHO_N(["              $1: "])
+-   AS_IF([test "x$3" = "xno"], [AS_ECHO(["$2 (disabled)"])],
+-       [test "x$3" = "xyes"], [AS_ECHO(["$2"])],
+-       [test "x$3" = "x"], [AS_ECHO(["$2"])],
+-       [AS_ECHO(["$2 ($3)"])])
++   echo ["              $1: "]
++   AS_IF([test "x$3" = "xno"], [echo ["$2 (disabled)"]],
++       [test "x$3" = "xyes"], [echo ["$2"]],
++       [test "x$3" = "x"], [echo ["$2"]],
++       [echo ["$2 ($3)"]])
+ ])