dbus configure.in,1.99,1.100 ChangeLog,1.583,1.584

Colin Walters walters at freedesktop.org
Fri Oct 29 12:17:59 PDT 2004


Update of /cvs/dbus/dbus
In directory gabe:/tmp/cvs-serv17228

Modified Files:
	configure.in ChangeLog 
Log Message:
2004-10-29  Colin Walters  <walters at redhat.com>

	Patch from Kristof Vansant <de_lupus at pandora.be>

	* configure.in: Detect Slackware.
	* bus/Makefile.am (SCRIPT_IN_FILES): Add rc.messagebus.in.
	* bus/rc.messagebus.in: New file.


Index: configure.in
===================================================================
RCS file: /cvs/dbus/dbus/configure.in,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -r1.99 -r1.100
--- configure.in	25 Oct 2004 18:48:58 -0000	1.99
+++ configure.in	29 Oct 2004 19:17:57 -0000	1.100
@@ -998,18 +998,27 @@
    operating_system=redhat
 fi
 
+if test -f /etc/slackware-version || test -f $EXPANDED_SYSCONFDIR/slackware-version ; then
+   operating_system=slackware
+fi
+
 #### Sort out init scripts
 
 if test x$with_init_scripts = x; then
     if test xredhat = x$operating_system ; then
         with_init_scripts=redhat
     else
-        with_init_scripts=none
+        if test xslackware = x$operating_system ; then
+        	with_init_scripts=slackware
+	    else
+        	with_init_scripts=none
+        fi
     fi
 fi
 
 AM_CONDITIONAL(DBUS_INIT_SCRIPTS_RED_HAT, test x$with_init_scripts = xredhat)
 
+AM_CONDITIONAL(DBUS_INIT_SCRIPTS_SLACKWARE, test x$with_init_scripts = xslackware)
 
 ##### Set up location for system bus socket
 if ! test -z "$with_system_socket"; then
@@ -1126,6 +1135,7 @@
 bus/system.conf
 bus/session.conf
 bus/messagebus
+bus/rc.messagebus
 bus/dbus-daemon-1.1
 Makefile
 dbus/Makefile

Index: ChangeLog
===================================================================
RCS file: /cvs/dbus/dbus/ChangeLog,v
retrieving revision 1.583
retrieving revision 1.584
diff -u -d -r1.583 -r1.584
--- ChangeLog	29 Oct 2004 18:50:29 -0000	1.583
+++ ChangeLog	29 Oct 2004 19:17:57 -0000	1.584
@@ -1,5 +1,13 @@
 2004-10-29  Colin Walters  <walters at redhat.com>
 
+	Patch from Kristof Vansant <de_lupus at pandora.be>
+
+	* configure.in: Detect Slackware.
+	* bus/Makefile.am (SCRIPT_IN_FILES): Add rc.messagebus.in.
+	* bus/rc.messagebus.in: New file.
+
+2004-10-29  Colin Walters  <walters at redhat.com>
+
 	* tools/dbus-monitor.c (filter_func): Return
 	DBUS_HANDLER_RESULT_HANDLED in filter function
 	for now.  See:



More information about the dbus-commit mailing list