From: Victor Julien <victor@inliniac.net>
Date: Tue, 14 Jan 2014 12:41:09 +0000 (+0100)
Subject: coccinelle: add --disable-coccinelle to configure
X-Git-Tag: suricata-2.0rc1~199
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F770%2Fhead;p=thirdparty%2Fsuricata.git

coccinelle: add --disable-coccinelle to configure

This allows disabling of the expensive cocci QA checks during
QA.
---

diff --git a/configure.ac b/configure.ac
index 619b53c78d..ccef2dad81 100644
--- a/configure.ac
+++ b/configure.ac
@@ -91,17 +91,6 @@
         exit 1
     fi
 
-    AC_PATH_PROG(HAVE_COCCINELLE_CONFIG, spatch, "no")
-    if test "$HAVE_COCCINELLE_CONFIG" = "no"; then
-        echo
-        echo "   Warning! spatch not found, you will not be "
-        echo "   able to run code checking with coccinelle  "
-        echo "   get it from http://coccinelle.lip6.fr      "
-        echo "   or install from your distribution          "
-        echo
-    fi
-    AM_CONDITIONAL([HAVE_COCCINELLE], [test "$HAVE_COCCINELLE_CONFIG" != "no"])
-
     AC_PATH_PROG(HAVE_PYTHON_CONFIG, python, "no")
     if test "$HAVE_PYTHON_CONFIG" = "no"; then
         echo
@@ -383,6 +372,19 @@
         CFLAGS="$CFLAGS -DIPFW"
     ])
 
+    AC_ARG_ENABLE(coccinelle,
+           AS_HELP_STRING([--disable-coccinelle], [Disable coccinelle QA steps during make check])],,[enable_coccinelle=yes])
+    AS_IF([test "x$enable_coccinelle" = "xyes"], [
+        AC_PATH_PROG(HAVE_COCCINELLE_CONFIG, spatch, "no")
+        if test "$HAVE_COCCINELLE_CONFIG" = "no"; then
+            echo "   Warning! spatch not found, you will not be "
+            echo "   able to run code checking with coccinelle  "
+            echo "   get it from http://coccinelle.lip6.fr      "
+            echo "   or install from your distribution          "
+        fi
+    ])
+    AM_CONDITIONAL([HAVE_COCCINELLE], [test "x$enable_coccinelle" != "xno"])
+
 # libraries
 
     AC_MSG_CHECKING([for Mpipe])
@@ -1641,6 +1643,7 @@ SURICATA_BUILD_CONF="Suricata Configuration:
   Debug validation enabled:                ${enable_debug_validation}
   Profiling enabled:                       ${enable_profiling}
   Profiling locks enabled:                 ${enable_profiling_locks}
+  Coccinelle / spatch:                     ${enable_coccinelle}
 
 Generic build parameters:
   Installation prefix (--prefix):          ${prefix}