Merge pull request #1069 from donaldsharp/rfc_plist

[mirror_frr.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 5f47ca7fb92a1d36633a9cf51a07912eba637845..2faaa7fc8e04bc557ac776366c311365e8365305 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -882,6 +882,7 @@ case "$host_os" in
     AC_DEFINE(KAME,1,KAME IPv6)
     ;;
 esac
+AM_CONDITIONAL(SOLARIS, test "${SOLARIS}" = "solaris")
 
 AC_SYS_LARGEFILE
 
@@ -1299,12 +1300,7 @@ AM_CONDITIONAL(RIPNGD, test "${enable_ripngd}" != "no")
 AM_CONDITIONAL(BABELD, test "${enable_babeld}" != "no")
 AM_CONDITIONAL(OSPF6D, test "${enable_ospf6d}" != "no")
 AM_CONDITIONAL(ISISD, test "${enable_isisd}" != "no")
-
-case "${enable_pimd}" in
-  "no" ) PIMD="";;
-  *    ) PIMD="pimd";;
-esac
-AM_CONDITIONAL(PIMD, test "x$PIMD" = "xpimd")
+AM_CONDITIONAL(PIMD, test "${enable_pimd}" != "no")
 
 if test "${enable_bgp_announce}" = "no";then
   AC_DEFINE(DISABLE_BGP_ANNOUNCE,1,Disable BGP installation to zebra)
@@ -1338,9 +1334,6 @@ AC_SUBST(RFPTEST)
 AC_SUBST(LIBRFP)
 AC_SUBST(RFPINC)
 AC_SUBST(BGPD)
-AC_SUBST(WATCHFRR)
-AC_SUBST(ISISD)
-AC_SUBST(PIMD)
 AC_SUBST(SOLARIS)
 AC_SUBST(VTYSH)
 AC_SUBST(CURSES)
@@ -1813,12 +1806,10 @@ AC_CACHE_VAL(ac_cv_htonl_works,
 AC_MSG_RESULT($ac_cv_htonl_works)
 
 AC_CONFIG_FILES([Makefile
-         bgpd/Makefile watchfrr/Makefile
+         bgpd/Makefile
          vtysh/Makefile
          doc/Makefile tests/Makefile
          bgpd/rfp-example/rfptest/Makefile bgpd/rfp-example/librfp/Makefile
-         pimd/Makefile
-         tools/Makefile
          redhat/frr.spec
          snapcraft/snapcraft.yaml
          lib/version.h