2004-12-22 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
* {configure.ac,Makefile.am}: Build watchquagga by default.
diff --git a/ChangeLog b/ChangeLog
index 897c952..20a63a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-12-22 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
+
+ * {configure.ac,Makefile.am}: Build watchquagga by default.
+
2004-12-21 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
* NEWS: Note addition of watchquagga.
diff --git a/Makefile.am b/Makefile.am
index dbc0807..4a1a4bf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,10 @@
## Process this file with automake to produce Makefile.in.
SUBDIRS = lib @ZEBRA@ @BGPD@ @RIPD@ @RIPNGD@ @OSPFD@ @OSPF6D@ \
- @ISISD@ @VTYSH@ @OSPFCLIENT@ doc m4 @pkgsrcdir@ redhat
+ @ISISD@ @WATCHQUAGGA@ @VTYSH@ @OSPFCLIENT@ doc m4 @pkgsrcdir@ redhat
DIST_SUBDIRS = lib zebra bgpd ripd ripngd ospfd ospf6d \
- isisd vtysh ospfclient doc m4 pkgsrc redhat tests
+ isisd watchquagga vtysh ospfclient doc m4 pkgsrc redhat tests
EXTRA_DIST = aclocal.m4 SERVICES TODO REPORTING-BUGS vtysh/Makefile.in \
vtysh/Makefile.am update-autotools \
diff --git a/configure.ac b/configure.ac
index 18be8ac..a514591 100755
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@
## Copyright (c) 1996, 97, 98, 99, 2000 Kunihiro Ishiguro <kunihiro@zebra.org>
## Portions Copyright (c) 2003 Paul Jakma <paul@dishone.st>
##
-## $Id: configure.ac,v 1.77 2004/11/19 06:41:49 hasso Exp $
+## $Id: configure.ac,v 1.78 2004/12/22 14:03:52 ajs Exp $
AC_PREREQ(2.53)
AC_INIT(Quagga, 0.97.3, [http://bugzilla.quagga.net])
@@ -108,6 +108,8 @@
[ --disable-ospfd do not build ospfd])
AC_ARG_ENABLE(ospf6d,
[ --disable-ospf6d do not build ospf6d])
+AC_ARG_ENABLE(watchquagga,
+[ --disable-watchquagga do not build watchquagga])
AC_ARG_ENABLE(isisd,
[ --enable-isisd build isisd])
AC_ARG_ENABLE(bgp-announce,
@@ -750,6 +752,12 @@
OSPFD="ospfd"
fi
+if test "${enable_watchquagga}" = "no";then
+ WATCHQUAGGA=""
+else
+ WATCHQUAGGA="watchquagga"
+fi
+
OSPFCLIENT=""
if test "${enable_opaque_lsa}" = "yes"; then
if test "${enable_ospfapi}" != "no";then
@@ -790,6 +798,7 @@
AC_SUBST(RIPNGD)
AC_SUBST(OSPFD)
AC_SUBST(OSPF6D)
+AC_SUBST(WATCHQUAGGA)
AC_SUBST(ISISD)
AC_SUBST(VTYSH)
AC_SUBST(INCLUDES)
@@ -1116,6 +1125,7 @@
AC_DEFINE_UNQUOTED(PATH_OSPFD_PID, "$quagga_statedir/ospfd.pid",ospfd PID)
AC_DEFINE_UNQUOTED(PATH_OSPF6D_PID, "$quagga_statedir/ospf6d.pid",ospf6d PID)
AC_DEFINE_UNQUOTED(PATH_ISISD_PID, "$quagga_statedir/isisd.pid",isisd PID)
+AC_DEFINE_UNQUOTED(PATH_WATCHQUAGGA_PID, "$quagga_statedir/watchquagga.pid",watchquagga PID)
AC_DEFINE_UNQUOTED(ZEBRA_SERV_PATH, "$quagga_statedir/zserv.api",zebra api socket)
AC_DEFINE_UNQUOTED(ZEBRA_VTYSH_PATH, "$quagga_statedir/zebra.vty",zebra vty socket)
AC_DEFINE_UNQUOTED(RIP_VTYSH_PATH, "$quagga_statedir/ripd.vty",rip vty socket)
@@ -1145,7 +1155,7 @@
AC_MSG_RESULT($ac_cv_htonl_works)
AC_CONFIG_FILES([Makefile lib/Makefile zebra/Makefile ripd/Makefile
- ripngd/Makefile bgpd/Makefile ospfd/Makefile
+ ripngd/Makefile bgpd/Makefile ospfd/Makefile watchquagga/Makefile
ospf6d/Makefile isisd/Makefile vtysh/Makefile doc/Makefile
ospfclient/Makefile tests/Makefile m4/Makefile redhat/Makefile
pkgsrc/Makefile