[packages/apcupsd.git] / apcupsd-configure.patch

diff -urN apcupsd-3.10.13.orig/autoconf/acconfig.h apcupsd-3.10.13.new/autoconf/acconfig.h
--- apcupsd-3.10.13.orig/autoconf/acconfig.h	2004-04-16 15:18:42.000000000 +0200
+++ apcupsd-3.10.13.new/autoconf/acconfig.h	2004-05-22 15:54:12.854409808 +0200
@@ -97,6 +97,10 @@
 /* Define the default "log" files directory. */
 #undef LOGDIR
 
+/* Define the default "status" files directory. */
+#undef STATDIR
+
+
 /* Define the default serial port lock directory */
 #undef LOCKDIR
 
--- apcupsd-3.10.13.orig/autoconf/configure.in	2004-04-16 20:14:57.000000000 +0200
+++ apcupsd-3.10.13.new/autoconf/configure.in	2004-05-22 19:09:30.116115272 +0200
@@ -1188,16 +1188,25 @@
 # Find the default directory to put the root-mode PID file in
 for PIDDIR in "/var/run" "/etc/apcupsd"
 do
-	if test -d $PIDDIR 
+	if test -d $PIDDIR
 	then
 		break;
 	fi
 done
 
-# Find the default directory to put the apcupsd.events and apcupsd.status files
+# Find the default directory to put the apcupsd.events file
 for LOGDIR in "/var/log" "/etc/apcupsd"
 do
-	if test -d $LOGDIR 
+	if test -d $LOGDIR
+	then
+		break;
+	fi
+done
+
+# Find the default directory to put the apcupsd.status file
+for STATDIR in "/var/log" "/etc/apcupsd" "/var/lib/apcupsd"
+do
+	if test -d $STATDIR
 	then
 		break;
 	fi
@@ -1497,11 +1506,18 @@
 )
 # now allow user to specify LOGDIR
 AC_ARG_WITH(log-dir,
-    [AC_HELP_STRING([--with-log-dir=DIR], [Specify EVENTS and STATUS directory (default is OS dependent)])],
+    [AC_HELP_STRING([--with-log-dir=DIR], [Specify EVENTS directory (default is OS dependent)])],
     [
 	LOGDIR="$withval";
     ]
 )
+# now allow user to specify STATDIR
+AC_ARG_WITH(stat-dir,
+    [AC_HELP_STRING([--with-stat-dir=DIR], [Specify STATUS directory (default is OS dependent)])],
+    [
+	STATDIR="$withval";
+    ]
+)
 # now allow user to specify LOCKDIR
 AC_ARG_WITH(lock-dir,
     [  --with-lock-dir=DIR     Specify serial port lock directory (default is OS dependent)],
@@ -1575,6 +1591,8 @@
 AC_SUBST(PIDDIR)
 AC_DEFINE_UNQUOTED(LOGDIR, "$LOGDIR")
 AC_SUBST(LOGDIR)
+AC_DEFINE_UNQUOTED(STATDIR, "$STATDIR")
+AC_SUBST(STATDIR)
 AC_DEFINE_UNQUOTED(NOLOGDIR, "$nologdir")
 AC_SUBST(nologdir)
 AC_DEFINE_UNQUOTED(PWRFAILDIR, "$PWRFAILDIR")
@@ -1735,7 +1753,8 @@
   Install man files:	      ${mandir}
   Nologin file in:	      ${nologdir}
   PID directory:	      ${PIDDIR}
-  LOG dir (events, status)    ${LOGDIR}
+  LOG dir (events)            ${LOGDIR}
+  STATUS dir (status)         ${STATDIR}
   LOCK dir (for serial port)  ${LOCKDIR}
   Power Fail dir	      ${PWRFAILDIR}
   Compiler:		      ${CC} ${CCVERSION}
--- apcupsd-3.10.13.orig/platforms/etc/apcupsd.conf.in	2003-11-26 16:54:47.000000000 +0100
+++ apcupsd-3.10.13.new/platforms/etc/apcupsd.conf.in	2004-05-22 19:11:36.654878456 +0200
@@ -217,7 +217,7 @@
 STATTIME 0
 #
 # Location of STATUS file (written to only if STATTIME is non-zero)
-STATFILE @LOGDIR@/apcupsd.status
+STATFILE @STATDIR@/apcupsd.status
 #
 #
 # LOGSTATS [ on | off ] on enables, off disables
Commit	Line	Data
	1	diff -urN apcupsd-3.10.13.orig/autoconf/acconfig.h apcupsd-3.10.13.new/autoconf/acconfig.h
	2	--- apcupsd-3.10.13.orig/autoconf/acconfig.h 2004-04-16 15:18:42.000000000 +0200
	3	+++ apcupsd-3.10.13.new/autoconf/acconfig.h 2004-05-22 15:54:12.854409808 +0200
	4	@@ -97,6 +97,10 @@
	5	/* Define the default "log" files directory. */
	6	#undef LOGDIR
	7
	8	+/* Define the default "status" files directory. */
	9	+#undef STATDIR
	10	+
	11	+
	12	/* Define the default serial port lock directory */
	13	#undef LOCKDIR
	14
	15	--- apcupsd-3.10.13.orig/autoconf/configure.in 2004-04-16 20:14:57.000000000 +0200
	16	+++ apcupsd-3.10.13.new/autoconf/configure.in 2004-05-22 19:09:30.116115272 +0200
	17	@@ -1188,16 +1188,25 @@
	18	# Find the default directory to put the root-mode PID file in
	19	for PIDDIR in "/var/run" "/etc/apcupsd"
	20	do
	21	- if test -d $PIDDIR
	22	+ if test -d $PIDDIR
	23	then
	24	break;
	25	fi
	26	done
	27
	28	-# Find the default directory to put the apcupsd.events and apcupsd.status files
	29	+# Find the default directory to put the apcupsd.events file
	30	for LOGDIR in "/var/log" "/etc/apcupsd"
	31	do
	32	- if test -d $LOGDIR
	33	+ if test -d $LOGDIR
	34	+ then
	35	+ break;
	36	+ fi
	37	+done
	38	+
	39	+# Find the default directory to put the apcupsd.status file
	40	+for STATDIR in "/var/log" "/etc/apcupsd" "/var/lib/apcupsd"
	41	+do
	42	+ if test -d $STATDIR
	43	then
	44	break;
	45	fi
	46	@@ -1497,11 +1506,18 @@
	47	)
	48	# now allow user to specify LOGDIR
	49	AC_ARG_WITH(log-dir,
	50	- [AC_HELP_STRING([--with-log-dir=DIR], [Specify EVENTS and STATUS directory (default is OS dependent)])],
	51	+ [AC_HELP_STRING([--with-log-dir=DIR], [Specify EVENTS directory (default is OS dependent)])],
	52	[
	53	LOGDIR="$withval";
	54	]
	55	)
	56	+# now allow user to specify STATDIR
	57	+AC_ARG_WITH(stat-dir,
	58	+ [AC_HELP_STRING([--with-stat-dir=DIR], [Specify STATUS directory (default is OS dependent)])],
	59	+ [
	60	+ STATDIR="$withval";
	61	+ ]
	62	+)
	63	# now allow user to specify LOCKDIR
	64	AC_ARG_WITH(lock-dir,
	65	[ --with-lock-dir=DIR Specify serial port lock directory (default is OS dependent)],
	66	@@ -1575,6 +1591,8 @@
	67	AC_SUBST(PIDDIR)
	68	AC_DEFINE_UNQUOTED(LOGDIR, "$LOGDIR")
	69	AC_SUBST(LOGDIR)
	70	+AC_DEFINE_UNQUOTED(STATDIR, "$STATDIR")
	71	+AC_SUBST(STATDIR)
	72	AC_DEFINE_UNQUOTED(NOLOGDIR, "$nologdir")
	73	AC_SUBST(nologdir)
	74	AC_DEFINE_UNQUOTED(PWRFAILDIR, "$PWRFAILDIR")
	75	@@ -1735,7 +1753,8 @@
	76	Install man files: ${mandir}
	77	Nologin file in: ${nologdir}
	78	PID directory: ${PIDDIR}
	79	- LOG dir (events, status) ${LOGDIR}
	80	+ LOG dir (events) ${LOGDIR}
	81	+ STATUS dir (status) ${STATDIR}
	82	LOCK dir (for serial port) ${LOCKDIR}
	83	Power Fail dir ${PWRFAILDIR}
	84	Compiler: ${CC} ${CCVERSION}
	85	--- apcupsd-3.10.13.orig/platforms/etc/apcupsd.conf.in 2003-11-26 16:54:47.000000000 +0100
	86	+++ apcupsd-3.10.13.new/platforms/etc/apcupsd.conf.in 2004-05-22 19:11:36.654878456 +0200
	87	@@ -217,7 +217,7 @@
	88	STATTIME 0
	89	#
	90	# Location of STATUS file (written to only if STATTIME is non-zero)
	91	-STATFILE @LOGDIR@/apcupsd.status
	92	+STATFILE @STATDIR@/apcupsd.status
	93	#
	94	#
	95	# LOGSTATS [ on \| off ] on enables, off disables