From: Vincent Bernat <vincent@bernat.im>
Date: Sun, 16 Aug 2015 11:57:00 +0000 (+0200)
Subject: build: automatically reuse regular configure args for distcheck
X-Git-Tag: 0.7.17~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8e8d9a270b31b7a174d21357a5d56b22560b62e0;p=thirdparty%2Flldpd.git

build: automatically reuse regular configure args for distcheck
---

diff --git a/.travis/run.sh b/.travis/run.sh
index 07032c60..3cc6bcd2 100755
--- a/.travis/run.sh
+++ b/.travis/run.sh
@@ -27,8 +27,5 @@ if [ x"${RUN_COVERITY}" = x"1" ]; then
 else
     # Regular build
     make all check CFLAGS=-Werror
-    LLDPD_CONFIG_ARGS="$LLDPD_CONFIG_ARGS --with-systemdsystemunitdir=no"
-    LLDPD_CONFIG_ARGS="$LLDPD_CONFIG_ARGS --with-launchddaemonsdir=no"
-    LLDPD_CONFIG_ARGS="$LLDPD_CONFIG_ARGS --with-sysusersdir=no"
-    make distcheck DISTCHECK_CONFIGURE_FLAGS="$LLDPD_CONFIG_ARGS"
+    make distcheck
 fi
diff --git a/Makefile.am b/Makefile.am
index b1727dc4..7d3b0e29 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,7 +34,7 @@ MOSTLYCLEANFILES = $(DX_CLEANFILES)
 
 # systemd and launchd files are not installed in the prefix, don't
 # request them for distcheck
-DISTCHECK_CONFIGURE_FLAGS = \
+DISTCHECK_CONFIGURE_FLAGS = $(CONFIGURE_ARGS) \
         --with-sysusersdir=no \
         --with-systemdsystemunitdir=no \
 	--with-launchddaemonsdir=no