From 22ea387f268641f3614177d05f99269472f2562c Mon Sep 17 00:00:00 2001 From: Ryan Hagelstrom Date: Fri, 30 Jun 2017 14:18:58 -0500 Subject: [PATCH] config: No need to test these if enabled. Plays havoc with make distribution. Signed-off-by: Ryan Hagelstrom --- configure.ac | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index 03951503c1..4cfa829f2a 100755 --- a/configure.ac +++ b/configure.ac @@ -1969,10 +1969,11 @@ AC_CACHE_VAL(ac_cv_htonl_works, ) AC_MSG_RESULT($ac_cv_htonl_works) -AC_CONFIG_FILES([Makefile lib/Makefile qpb/Makefile zebra/Makefile ripd/Makefile +AC_CONFIG_FILES([Makefile lib/Makefile qpb/Makefile zebra/Makefile ripd/Makefile ripngd/Makefile bgpd/Makefile ospfd/Makefile watchfrr/Makefile ospf6d/Makefile ldpd/Makefile isisd/Makefile vtysh/Makefile doc/Makefile ospfclient/Makefile tests/Makefile m4/Makefile + bgpd/rfp-example/rfptest/Makefile bgpd/rfp-example/librfp/Makefile babeld/Makefile pimd/Makefile eigrpd/Makefile @@ -1982,7 +1983,7 @@ AC_CONFIG_FILES([Makefile lib/Makefile qpb/Makefile zebra/Makefile ripd/Makefile pkgsrc/Makefile python/Makefile fpm/Makefile - redhat/frr.spec + redhat/frr.spec snapcraft/Makefile snapcraft/snapcraft.yaml lib/version.h @@ -2007,13 +2008,6 @@ AC_CONFIG_FILES([Makefile lib/Makefile qpb/Makefile zebra/Makefile ripd/Makefile pkgsrc/ripd.sh pkgsrc/ripngd.sh pkgsrc/zebra.sh pkgsrc/eigrpd.sh]) -if test "${enable_bgp_vnc}" != "no"; then - if test "${with_rfp_path}" = "bgpd/rfp-example" ; then - AC_CONFIG_FILES([bgpd/rfp-example/rfptest/Makefile bgpd/rfp-example/librfp/Makefile]) - else - AC_CONFIG_FILES([${with_rfp_path}/rfptest/Makefile ${with_rfp_path}/librfp/Makefile]) - fi -fi AC_CONFIG_FILES([solaris/Makefile]) -- 2.39.5