From: Vincent Bernat <vincent@bernat.im>
Date: Sun, 16 Aug 2015 10:05:03 +0000 (+0200)
Subject: build: only enable silent rules if they are not disabled
X-Git-Tag: 0.7.17~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=848cc66197c21e12e944e398b028297146eea27a;p=thirdparty%2Flldpd.git

build: only enable silent rules if they are not disabled
---

diff --git a/m4/config_subdirs.m4 b/m4/config_subdirs.m4
index e71762b2..4730f1ab 100644
--- a/m4/config_subdirs.m4
+++ b/m4/config_subdirs.m4
@@ -56,6 +56,12 @@ AC_DEFUN([lldp_CONFIG_SUBDIRS], [
   # different subdirs can have different --enable and --with options.
   ac_sub_configure_args="--disable-option-checking $ac_sub_configure_args"
 
+  # Silent rules
+  case $enable_silent_rules in
+    no)  ac_sub_configure_args="$ac_sub_configure_args --disable-silent-rules" ;;
+    *)   ac_sub_configure_args="$ac_sub_configure_args --enable-silent-rules" ;;
+  esac
+
   # Add additional options
   ac_sub_configure_args="$ac_sub_configure_args $2"
 
diff --git a/m4/libevent.m4 b/m4/libevent.m4
index 8d28955f..257c8cfe 100644
--- a/m4/libevent.m4
+++ b/m4/libevent.m4
@@ -45,8 +45,16 @@ AC_DEFUN([lldp_CHECK_LIBEVENT], [
     LIBEVENT_LDFLAGS="\$(top_builddir)/libevent/libevent.la"
 
     # Call ./configure in libevent
-    lldp_CONFIG_SUBDIRS([libevent],
-       [--disable-libevent-regress --disable-thread-support --disable-openssl --disable-malloc-replacement --disable-debug-mode --enable-function-sections --disable-shared --with-pic --enable-static --enable-silent-rules])
+    libevent_configure_args="$libevent_configure_args --disable-libevent-regress"
+    libevent_configure_args="$libevent_configure_args --disable-thread-support"
+    libevent_configure_args="$libevent_configure_args --disable-openssl"
+    libevent_configure_args="$libevent_configure_args --disable-malloc-replacement"
+    libevent_configure_args="$libevent_configure_args --disable-debug-mode"
+    libevent_configure_args="$libevent_configure_args --enable-function-sections"
+    libevent_configure_args="$libevent_configure_args --disable-shared"
+    libevent_configure_args="$libevent_configure_args --with-pic"
+    libevent_configure_args="$libevent_configure_args --enable-static"
+    lldp_CONFIG_SUBDIRS([libevent], [$libevent_configure_args])
   fi
 
   AM_CONDITIONAL([LIBEVENT_EMBEDDED], [test x"$LIBEVENT_EMBEDDED" != x])