[pyatspi2] BGO#641869: Remove --enable-relocate option
- From: Mike Gorse <mgorse src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pyatspi2] BGO#641869: Remove --enable-relocate option
- Date: Tue, 22 Feb 2011 18:13:11 +0000 (UTC)
commit 237a82939cee1aa47c8cb1a433bb2be85ca43449
Author: Mike Gorse <mgorse novell com>
Date: Thu Feb 10 11:38:47 2011 -0600
BGO#641869: Remove --enable-relocate option
configure.ac | 6 ------
pyatspi/Makefile.am | 4 ----
pyatspi/busutils/Makefile.am | 4 ----
tests/pyatspi/Makefile.am | 4 ----
4 files changed, 0 insertions(+), 18 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 3b0ec12..ec1191b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -76,12 +76,6 @@ fi
AC_PATH_XTRA
-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)
-
AC_CONFIG_FILES([Makefile
tests/Makefile
tests/dummyatk/Makefile
diff --git a/pyatspi/Makefile.am b/pyatspi/Makefile.am
index e1ae1e2..0163a5f 100644
--- a/pyatspi/Makefile.am
+++ b/pyatspi/Makefile.am
@@ -1,9 +1,5 @@
SUBDIRS=busutils
-if RELOCATE
-pyatspidir = $(pythondir)/pyatspi_dbus
-else
pyatspidir = $(pythondir)/pyatspi
-endif
pyatspi_PYTHON = \
Accessibility.py \
diff --git a/pyatspi/busutils/Makefile.am b/pyatspi/busutils/Makefile.am
index f396281..5e8a0ab 100644
--- a/pyatspi/busutils/Makefile.am
+++ b/pyatspi/busutils/Makefile.am
@@ -1,8 +1,4 @@
-if RELOCATE
-pyatspidir = $(pythondir)/pyatspi_dbus
-else
pyatspidir = $(pythondir)/pyatspi
-endif
busutilsdir = $(pyatspidir)/busutils
diff --git a/tests/pyatspi/Makefile.am b/tests/pyatspi/Makefile.am
index 2514536..cb705ba 100644
--- a/tests/pyatspi/Makefile.am
+++ b/tests/pyatspi/Makefile.am
@@ -1,9 +1,5 @@
if SET_GTK_MODULE
-if RELOCATE
-gtk_module_dir = $(libdir)/$(GTK_MODULE_DIR)/at-spi-dbus/modules
-else
gtk_module_dir = $(libdir)/$(GTK_MODULE_DIR)
-endif
else
gtk_module_dir = $(GTK_MODULE_DIR)
endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]