]> git.puffer.fish Git - mirror/frr.git/commitdiff
build: fix detection of the confd binary
authorRenato Westphal <renato@opensourcerouting.org>
Fri, 16 Nov 2018 22:41:16 +0000 (20:41 -0200)
committerRenato Westphal <renato@opensourcerouting.org>
Mon, 26 Nov 2018 15:07:42 +0000 (13:07 -0200)
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>
configure.ac

index c925509fafac96f46bf451f13aa3f9ae425b06dd..09d57ab0f294fdcd6a19b406e4eb21f89bc87166 100755 (executable)
@@ -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