From: Vincent Bernat <vincent@bernat.im>
Date: Sun, 16 Aug 2015 13:02:36 +0000 (+0200)
Subject: build: make --with-embedded-libevent a tri-state switch
X-Git-Tag: 0.7.17~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=696f7f6fe839c3bc7fa90213e4f03d344be472a5;p=thirdparty%2Flldpd.git

build: make --with-embedded-libevent a tri-state switch

It defaults to auto (same as before) but not embedding libevent can be
enforced with `--without-embedded-libevent`.
---

diff --git a/m4/libevent.m4 b/m4/libevent.m4
index f7c829f6..275e5a56 100644
--- a/m4/libevent.m4
+++ b/m4/libevent.m4
@@ -7,8 +7,8 @@ AC_DEFUN([lldp_CHECK_LIBEVENT], [
   AC_ARG_WITH([embedded-libevent],
     AS_HELP_STRING(
       [--with-embedded-libevent],
-      [Force the use of embedded libevent @<:@default=no@:>@]
-  ))
+      [Use embedded libevent @<:@default=auto@:>@]
+  ), [], [with_embedded_libevent=auto])
   if test x"$with_embedded_libevent" = x"yes"; then
      LIBEVENT_EMBEDDED=1
   else
@@ -27,15 +27,23 @@ AC_DEFUN([lldp_CHECK_LIBEVENT], [
        [
          AC_MSG_RESULT([yes])
        ], [
-         AC_MSG_RESULT([no, using shipped libevent])
-         LIBEVENT_EMBEDDED=1
+         if test x"$with_embedded_libevent" = x"auto"; then
+           AC_MSG_RESULT([no, using shipped libevent])
+           LIBEVENT_EMBEDDED=1
+         else
+           AC_MSG_ERROR([*** unusable system libevent])
+         fi
        ])
        CFLAGS="$_save_CFLAGS"
        LIBS="$_save_LIBS"
     ], [
-      # No appropriate version, let's use the shipped copy
-      AC_MSG_NOTICE([using shipped libevent])
-      LIBEVENT_EMBEDDED=1
+      # No appropriate version, let's use the shipped copy if possible
+      if test x"$with_embedded_libevent" = x"auto"; then
+        AC_MSG_NOTICE([using shipped libevent])
+        LIBEVENT_EMBEDDED=1
+      else
+        AC_MSG_ERROR([*** libevent not found])
+      fi
     ])
   fi