From 627a65e9e16867bcb252597c79bded60dff9681b Mon Sep 17 00:00:00 2001
From: Willie Walker <william.walker@sun.com>
Date: Tue, 3 Nov 2009 13:02:12 -0500
Subject: [PATCH] Only install *.desktop file if GTK_MODULE_DIR is used for
 relocating

---
 atk-adaptor/Makefile.am | 2 ++
 configure.ac            | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/atk-adaptor/Makefile.am b/atk-adaptor/Makefile.am
index 129f491..d21176b 100644
--- a/atk-adaptor/Makefile.am
+++ b/atk-adaptor/Makefile.am
@@ -46,6 +46,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 +56,4 @@ CLEANFILES = $(gnome_autostart_DATA)
 %.desktop: %.desktop.in Makefile.am
 	sed -e "s,\@gtkpathdir\@,$(gtkpathdir)," \
 	< $< > $@
+endif
diff --git a/configure.ac b/configure.ac
index 05388f8..f9df83a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -82,6 +82,9 @@ 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
+          AM_CONDITIONAL(RELOCATE, false)
+else
+          AM_CONDITIONAL(RELOCATE, true)
 fi
 
 #libtool option to strip symbols starting with cspi
-- 
2.7.4