build: automatically reuse regular configure args for distcheck

diff --git a/.travis/run.sh b/.travis/run.sh
index 07032c6021e5698624a30b8370895c5d83efc4d8..3cc6bcd2712c4a90aca88da65b5c79bf3e0ef5bd 100755 (executable)
--- 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 b1727dc46e30be1a3882f59e157f69ee038f4e6f..7d3b0e29259a1b24d835cf4c6355f33193adb07b 100644 (file)
--- 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