summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn (J5) Palmieri <johnp@redhat.com>2006-08-17 18:46:00 +0000
committerJohn (J5) Palmieri <johnp@redhat.com>2006-08-17 18:46:00 +0000
commitda5ff2dcb7a73225887fb33e8c086a69c85e53fd (patch)
tree4f9dd7f722b72b0aacbee45ab5af1bca6e1cb8ca
parentfee32fcda399682644364aab51dd9d97d5cc649f (diff)
* configure.in: use instead of
to determine where to store the pid since the init scripts manipulate the pid file (patch from Marcelo Ricardo Leitner <marcelo dot leitner at terra dot com dot br>.
-rw-r--r--ChangeLog7
-rw-r--r--configure.in2
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index fb4256f7..20a10a84 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-08-17 John (J5) Palmieri <johnp@redhat.com>
+
+ * configure.in: use $with_init_scripts instead of $operating_system
+ to determine where to store the pid since the init scripts manipulate
+ the pid file (patch from Marcelo Ricardo Leitner
+ <marcelo dot leitner at terra dot com dot br>.
+
2006-08-16 John (J5) Palmieri <johnp@redhat.com>
* dbus/dbus-threads.c: Add static DBusList *uninitialized_mutex_list and
diff --git a/configure.in b/configure.in
index ffaf0199..b6a4743d 100644
--- a/configure.in
+++ b/configure.in
@@ -952,7 +952,7 @@ AC_DEFINE_UNQUOTED(DBUS_SYSTEM_BUS_DEFAULT_ADDRESS, "$DBUS_SYSTEM_BUS_DEFAULT_AD
#### Set up the pid file
if ! test -z "$with_system_pid_file"; then
DBUS_SYSTEM_PID_FILE=$with_system_pid_file
-elif test x$operating_system = xredhat ; then
+elif test x$with_init_scripts = xredhat ; then
DBUS_SYSTEM_PID_FILE=${EXPANDED_LOCALSTATEDIR}/run/messagebus.pid
else
DBUS_SYSTEM_PID_FILE=${EXPANDED_LOCALSTATEDIR}/run/dbus/pid