diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2017-08-04 16:13:29 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2017-08-04 19:09:11 +0200 |
| commit | 30237d294fcb522e3be0df3a5625178db6f47a32 (patch) | |
| tree | 8447ae64a257378808081e27cca355a9694a05cd /configure.ac | |
| parent | doc: work around weird texinfo bug (diff) | |
| download | frr-30237d294fcb522e3be0df3a5625178db6f47a32.tar.xz frr-30237d294fcb522e3be0df3a5625178db6f47a32.zip | |
build: non-recursive ldpd
This also fixes a build problem where using #include
"ldpd/ldp_vty_cmds_clippy.c" results in the Makefile dependency tracking
having both
ldp_vty_cmds.c: ldp_vty_cmds_clippy.c
ldp_vty_cmds.c: ../ldpd/ldp_vty_cmds_clippy.c
(because, if it's included as "ldpd/..", it uses the "-I.." include path
in gcc, so the gcc -MD dependency output is "../ldpd/...")
... all of which causes the build to try to build it twice (at the same
time) and fail rather stupidly.
With a non-recursive build, the two paths are identical and everything
just works.
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'configure.ac')
| -rwxr-xr-x | configure.ac | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 7403047b6..0cae5e582 100755 --- a/configure.ac +++ b/configure.ac @@ -1253,14 +1253,11 @@ AM_CONDITIONAL(BGPD, test "x$BGPD" = "xbgpd") AM_CONDITIONAL(RIPD, test "${enable_ripd}" != "no") AM_CONDITIONAL(OSPFD, test "${enable_ospfd}" != "no") +AM_CONDITIONAL(LDPD, test "${enable_ldpd}" != "no") -if test "${enable_ldpd}" = "no";then - LDPD="" -else - LDPD="ldpd" +AS_IF([test "${enable_ldpd}" != "no"], [ AC_DEFINE(HAVE_LDPD, 1, ldpd) -fi -AM_CONDITIONAL(LDPD, test "x$LDPD" = "xldpd") +]) NHRPD="" case "$host_os" in @@ -1352,7 +1349,6 @@ AC_SUBST(LIBRFP) AC_SUBST(RFPINC) AC_SUBST(BABELD) AC_SUBST(BGPD) -AC_SUBST(LDPD) AC_SUBST(EIGRPD) AC_SUBST(WATCHFRR) AC_SUBST(ISISD) @@ -1805,7 +1801,7 @@ AC_MSG_RESULT($ac_cv_htonl_works) AC_CONFIG_FILES([Makefile bgpd/Makefile watchfrr/Makefile - ldpd/Makefile vtysh/Makefile + vtysh/Makefile doc/Makefile tests/Makefile bgpd/rfp-example/rfptest/Makefile bgpd/rfp-example/librfp/Makefile babeld/Makefile |