SF.net SVN: openvrml:[3714] trunk

[<br...@us...>]

Revision: 3714
          http://openvrml.svn.sourceforge.net/openvrml/?rev=3714&view=rev
Author:   braden
Date:     2008-10-05 04:27:46 +0000 (Sun, 05 Oct 2008)

Log Message:
-----------
If we set the absolute path of session_bus_servicesdir, the resulting Automake code is not DESTDIR-aware.  While we could take care of this in install-local, it's probably safe to hard-code a relative path for this.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/configure.ac
    trunk/src/Makefile.am

Property Changed:
----------------
    trunk/
    trunk/src/libopenvrml/openvrml/bad_url.cpp
    trunk/src/libopenvrml/openvrml/scene.cpp
    trunk/src/libopenvrml/openvrml/scene.h
    trunk/src/libopenvrml/openvrml/script.cpp


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/local:3677-3689
/branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688
   + /branches/0.17:3713
/branches/local:3677-3689
/branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-10-04 04:43:41 UTC (rev 3713)
+++ trunk/ChangeLog	2008-10-05 04:27:46 UTC (rev 3714)
@@ -1,3 +1,14 @@
+2008-10-04 Braden McDaniel  <br...@en...>
+
+	If we set the absolute path of session_bus_servicesdir, the
+	resulting Automake code is not DESTDIR-aware.  While we could take
+	care of this in install-local, it's probably safe to hard-code a
+	relative path for this.
+
+	* configure.ac: Don't AC_SUBST session_bus_servicesdir.
+	* src/Makefile.am: Hard code the relative path of
+	session_bus_servicesdir.
+
 2008-10-03 Braden McDaniel  <br...@en...>
 
 	* src/Makefile.am

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2008-10-04 04:43:41 UTC (rev 3713)
+++ trunk/configure.ac	2008-10-05 04:27:46 UTC (rev 3714)
@@ -168,8 +168,6 @@
 PKG_CHECK_MODULES([DBUS_G], [dbus-glib-1 glib-2.0 >= 2.6], ,
                   [have_dbus_glib=no])
 AC_PATH_PROG([DBUS_BINDING_TOOL], [dbus-binding-tool])
-session_bus_servicesdir=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1`
-AC_SUBST([session_bus_servicesdir])
 
 #
 # openvrml-player uses GtkBuilder, which was introduced in GTK+ 2.12.

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2008-10-04 04:43:41 UTC (rev 3713)
+++ trunk/src/Makefile.am	2008-10-05 04:27:46 UTC (rev 3714)
@@ -637,6 +637,7 @@
 
 if ENABLE_XEMBED
 libexec_PROGRAMS = openvrml-xembed/openvrml-xembed
+session_bus_servicesdir = $(datadir)/dbus-1/services
 session_bus_services_DATA = openvrml-xembed/org.openvrml.BrowserControl.service
 BUILT_SOURCES += \
         openvrml-xembed/browser-server-glue.h \


Property changes on: trunk/src/libopenvrml/openvrml/bad_url.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713


Property changes on: trunk/src/libopenvrml/openvrml/scene.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713


Property changes on: trunk/src/libopenvrml/openvrml/scene.h
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /branches/0.17/src/libopenvrml/openvrml/scene.h:3713


Property changes on: trunk/src/libopenvrml/openvrml/script.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.