From: Jason Ish <jason.ish@oisf.net>
Date: Fri, 11 Oct 2019 17:11:05 +0000 (-0600)
Subject: suricata-update: don't install if requirements not met
X-Git-Tag: suricata-5.0.0~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=03da49bfaa62a6901ab29058b3e991b2d4ae10ec;p=thirdparty%2Fsuricata.git

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 c1c81c2276..b7fbbb0c55 100644
--- 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 b69fc2edde..dd61cc8558 100644
--- 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])