From: Renato Westphal <renato@opensourcerouting.org>
Date: Fri, 16 Nov 2018 22:41:16 +0000 (-0200)
Subject: build: fix detection of the confd binary
X-Git-Tag: frr-7.1-dev~154^2~5
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=76ca535697e7adc08edee7b028dbb6b93352c385;p=matthieu%2Ffrr.git

build: fix detection of the confd binary

The confd binary must be searched in the path given by the user and not
in the system standard directories. This is necessary because, the way
confd is distributed, multiple installations of confd (from different
versions) are possible. Users must choose at configure time which confd
installation they want to use.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
---

diff --git a/configure.ac b/configure.ac
index c925509faf..09d57ab0f2 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1627,7 +1627,7 @@ dnl ---------------
 dnl confd
 dnl ---------------
 if test "$enable_confd" != "" -a "$enable_confd" != "no"; then
-   AC_CHECK_PROG([CONFD], [confd], [confd], [/bin/false])
+   AC_CHECK_PROG([CONFD], [confd], [confd], [/bin/false], "${enable_confd}/bin")
    if test "x$CONFD" = "x/bin/false"; then
       AC_MSG_ERROR([confd was not found on your system.])]
    fi