From: Vincent Bernat <vincent@bernat.im>
Date: Sun, 16 Aug 2015 10:31:45 +0000 (+0200)
Subject: build: run ./configure for libevent even when not needed
X-Git-Tag: 0.7.17~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a069490369d0cdf137ddf131f405e9a1e3d5835e;p=thirdparty%2Flldpd.git

build: run ./configure for libevent even when not needed

We need it for "make dist"...
---

diff --git a/m4/libevent.m4 b/m4/libevent.m4
index 257c8cfe..f7c829f6 100644
--- a/m4/libevent.m4
+++ b/m4/libevent.m4
@@ -43,20 +43,20 @@ AC_DEFUN([lldp_CHECK_LIBEVENT], [
     unset LIBEVENT_LIBS
     LIBEVENT_CFLAGS="-I\$(top_srcdir)/libevent/include -I\$(top_builddir)/libevent/include"
     LIBEVENT_LDFLAGS="\$(top_builddir)/libevent/libevent.la"
-
-    # Call ./configure in libevent
-    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
 
+  # Call ./configure in libevent. Need it for make dist...
+  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])
+
   AM_CONDITIONAL([LIBEVENT_EMBEDDED], [test x"$LIBEVENT_EMBEDDED" != x])
   AC_SUBST([LIBEVENT_LIBS])
   AC_SUBST([LIBEVENT_CFLAGS])