suricata-update: don't install if requirements not met

Don't try to run suricata-update if its not installed.

The 'make install-rules' target would try to run suricata-update
when it was detected that it was bundled, but didn't consider
if suricata-update was actually installed.

diff --git a/Makefile.am b/Makefile.am
index c1c81c22765f2ef45cb789139d1a9bb13d5b5b78..b7fbbb0c55c097e13f1c0677403039435bd8e7f2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,7 +31,7 @@ install-conf:
        install -m 770 -d "$(DESTDIR)$(e_localstatedir)"
 
 install-rules:
-if HAVE_SURICATA_UPDATE
+if INSTALL_SURICATA_UPDATE
        LD_LIBRARY_PATH=$(libdir) $(DESTDIR)$(bindir)/suricata-update \
                --suricata $(DESTDIR)$(bindir)/suricata \
                --suricata-conf $(DESTDIR)$(sysconfdir)/suricata/suricata.yaml \

diff --git a/configure.ac b/configure.ac
index b69fc2eddeaedd9eff7339db1b2de338b63eb91e..dd61cc8558aa69a2158f8bcd05d685ad08795aa5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1517,8 +1517,6 @@
       AC_CHECK_FILE([$srcdir/suricata-update/setup.py], [
           have_suricata_update="yes"], [])
     fi
-    AM_CONDITIONAL([HAVE_SURICATA_UPDATE],
-        [test "x$have_suricata_update" != "xno"])
 
     if test "$have_suricata_update" = "yes"; then
         if test "$have_python_yaml" != "yes"; then
@@ -1560,6 +1558,9 @@
         install_suricata_update="yes"
     fi
 
+    AM_CONDITIONAL([INSTALL_SURICATA_UPDATE],
+        [test "x$install_suricata_update" = "xyes"])
+
   # libhtp
     AC_ARG_ENABLE(non-bundled-htp,
            AS_HELP_STRING([--enable-non-bundled-htp], [Enable the use of an already installed version of htp]),[enable_non_bundled_htp=$enableval],[enable_non_bundled_htp=no])