2004-12-22 Andrew J. Schorr <ajschorr@alumni.princeton.edu>

	* watchquagga.c: Get PATH_WATCHQUAGGA_PID from config.h.

diff --git a/watchquagga/ChangeLog b/watchquagga/ChangeLog
index 0272655b1c462a594eb4c55dcb643daf8c09e680..91541221a8e3b8a31f4617376a7751ecd62a781a 100644 (file)
--- a/watchquagga/ChangeLog
+++ b/watchquagga/ChangeLog
@@ -1,3 +1,7 @@
+2004-12-22 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
+
+       * watchquagga.c: Get PATH_WATCHQUAGGA_PID from config.h.
+
 2004-12-21 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
 
        * .cvsignore: Added.

diff --git a/watchquagga/watchquagga.c b/watchquagga/watchquagga.c
index c9b2cad8ac544b4edade9961cb5eaa811e847919..194b807a5feee9ec3d2dde411a1683f168065a21 100644 (file)
--- a/watchquagga/watchquagga.c
+++ b/watchquagga/watchquagga.c
@@ -1,5 +1,5 @@
 /*
-    $Id: watchquagga.c,v 1.1 2004/12/22 02:56:59 ajs Exp $
+    $Id: watchquagga.c,v 1.2 2004/12/22 14:08:13 ajs Exp $
 
     Monitor status of quagga daemons and restart if necessary.
 
@@ -35,6 +35,10 @@
 #include <sys/wait.h>
 
 /* Quagga headers: */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <thread.h>
 #include <log.h>
 #include <sigevent.h>
@@ -54,7 +58,11 @@
 #define DEFAULT_LOGLEVEL       LOG_INFO
 #define DEFAULT_MIN_RESTART    60
 #define DEFAULT_MAX_RESTART    600
+#ifdef PATH_WATCHQUAGGA_PID
+#define DEFAULT_PIDFILE                PATH_WATCHQUAGGA_PID
+#else
 #define DEFAULT_PIDFILE                STATEDIR "/watchquagga.pid"
+#endif
 
 #define PING_TOKEN     "PING"