diff options
| author | Mike Gorse <mgorse@novell.com> | 2009-11-06 14:45:49 -0500 |
|---|---|---|
| committer | Mike Gorse <mgorse@novell.com> | 2009-11-06 14:45:49 -0500 |
| commit | 23e1fbe67ae5d62868e64aa60b6807c6bc120f6a (patch) | |
| tree | 6c304af3176321780db1adcae1657775445142b5 | |
| parent | b81654c1ff0e2602963d8cdec23f910458486801 (diff) | |
| parent | beccc6ec73af048833f1b95b4b7e6e29cfabce13 (diff) | |
| download | at-spi2-atk-23e1fbe67ae5d62868e64aa60b6807c6bc120f6a.tar.gz | |
Merge branch 'master' into mgorse
| -rw-r--r-- | atk-adaptor/Makefile.am | 8 | ||||
| -rw-r--r-- | atk-adaptor/atk-bridge.desktop.in | 2 | ||||
| -rw-r--r-- | common/Makefile.am | 20 | ||||
| -rw-r--r-- | configure.ac | 8 |
4 files changed, 22 insertions, 16 deletions
diff --git a/atk-adaptor/Makefile.am b/atk-adaptor/Makefile.am index 129f491..5d89a2d 100644 --- a/atk-adaptor/Makefile.am +++ b/atk-adaptor/Makefile.am @@ -1,4 +1,8 @@ -gtkmoduledir = $(libdir)/$(GTK_MODULE_DIR) +if RELOCATE + gtkmoduledir = $(libdir)/gtk-2.0/modules/at-spi-dbus/modules +else + gtkmoduledir = $(libdir)/gtk-2.0/modules +endif gtkmodule_LTLIBRARIES = libatk-bridge.la libatk_bridge_la_CFLAGS = $(DBUS_GLIB_CFLAGS) \ @@ -46,6 +50,7 @@ libatk_bridge_la_SOURCES = \ tree-adaptor.h \ value-adaptor.c +if RELOCATE gtkpathdir = $(gtkmoduledir)/.. gnomeautostartdir = $(datadir)/gnome/autostart gnomeautostart_DATA = atk-bridge.desktop @@ -55,3 +60,4 @@ CLEANFILES = $(gnome_autostart_DATA) %.desktop: %.desktop.in Makefile.am sed -e "s,\@gtkpathdir\@,$(gtkpathdir)," \ < $< > $@ +endif diff --git a/atk-adaptor/atk-bridge.desktop.in b/atk-adaptor/atk-bridge.desktop.in index 016a2d3..851d1ca 100644 --- a/atk-adaptor/atk-bridge.desktop.in +++ b/atk-adaptor/atk-bridge.desktop.in @@ -4,5 +4,5 @@ Name=GNOME D-Bus atk-bridge locator Comment=Sets GTK_PATH for gnome-session to pick up D-Bus atk-bridge module Exec=dbus-send --session --dest="org.gnome.SessionManager" /org/gnome/SessionManager org.gnome.SessionManager.Setenv string:"GTK_PATH" string:"@gtkpathdir@" OnlyShowIn=GNOME; -AutostartCondition=GNOME /desktop/gnome/interface/atspi-dbus +AutostartCondition=GNOME /desktop/gnome/interface/at-spi-dbus X-GNOME-Autostart-Phase=Initialization diff --git a/common/Makefile.am b/common/Makefile.am index 283b8dc..cbf5671 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -8,16 +8,16 @@ libspicommon_la_CFLAGS = $(DBUS_GLIB_CFLAGS)\ libspicommon_la_LIBADD = $(DBUS_GLIB_LIBS) -spicommonincludedir = $(includedir)/at-spi-1.0/libspi - -spicommoninclude_HEADERS = \ - bitarray.h \ - event-types.h \ - generated-types.h \ - keymasks.h \ - spi-dbus.h \ - spi-stateset.h \ - spi-types.h +#spicommonincludedir = $(includedir)/at-spi-1.0/libspi +# +#spicommoninclude_HEADERS = \ +# bitarray.h \ +# event-types.h \ +# generated-types.h \ +# keymasks.h \ +# spi-dbus.h \ +# spi-stateset.h \ +# spi-types.h #BUILT_SOURCES = generated-types.h #CLEANFILES = generated-types.h diff --git a/configure.ac b/configure.ac index 05388f8..81e2af0 100644 --- a/configure.ac +++ b/configure.ac @@ -78,11 +78,11 @@ if test -z "$DEFAULT_ATSPI_INTROSPECTION_PATH"; then DEFAULT_ATSPI_INTROSPECTION_PATH=dbus fi -AC_ARG_VAR([GTK_MODULE_DIR], - [Where to place the atk-adaptor gtk module]) -if test -z "$GTK_MODULE_DIR"; then - GTK_MODULE_DIR=gtk-2.0/modules +AC_ARG_ENABLE(relocate, [ --enable-relocate Relocate to coexist with CORBA [default=no]], enable_relocate="$enableval", enable_relocate=no) +if test x$enable_relocate = xyes ; then + AC_DEFINE(RELOCATE, , [Relocate to coexist with CORBA]) fi +AM_CONDITIONAL(RELOCATE, test x$enable_relocate = xyes) #libtool option to strip symbols starting with cspi LIBTOOL_EXPORT_OPTIONS='-export-symbols-regex "^[[^cspi]].*"' |