[java-atk-wrapper] Added code to determine whether to load 32 or 64-bit version of atk-bridge

[Ke Wang <kewang src gnome org>]

commit a791d0393335d5b4a0df1ddc00463c3e66f410b9
Author: Ke Wang <ke wang sun com>
Date:   Thu Jul 2 17:52:48 2009 +0800

    Added code to determine whether to load 32 or 64-bit version of atk-bridge

 configure.in         |    3 +++
 jni/src/AtkWrapper.c |    2 +-
 jni/src/Makefile.am  |    3 ++-
 3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/configure.in b/configure.in
index 509353c..400216f 100644
--- a/configure.in
+++ b/configure.in
@@ -33,6 +33,9 @@ PKG_CHECK_MODULES(JAW, [
 	gmodule-2.0
 ])
 
+ATK_BRIDGE_LIB_NAME="`pkg-config --variable=libdir gtk+-2.0`/gtk-2.0/modules/libatk-bridge.so"
+AC_SUBST(ATK_BRIDGE_LIB_NAME)
+
 # java wrapper
 
 JAVA_REQUIRED=1.5
diff --git a/jni/src/AtkWrapper.c b/jni/src/AtkWrapper.c
index 6bacdb7..ad17ede 100644
--- a/jni/src/AtkWrapper.c
+++ b/jni/src/AtkWrapper.c
@@ -46,7 +46,7 @@ gpointer jni_main_loop(gpointer data) {
 	}
 
 	GModule *module;
-	module = g_module_open("/usr/lib/gtk-2.0/modules/libatk-bridge.so", G_MODULE_BIND_LAZY);
+	module = g_module_open(ATK_BRIDGE_LIB_NAME, G_MODULE_BIND_LAZY);
 	if (!module) {
 		return NULL;
 	}
diff --git a/jni/src/Makefile.am b/jni/src/Makefile.am
index 5732bbc..6cd7a6c 100644
--- a/jni/src/Makefile.am
+++ b/jni/src/Makefile.am
@@ -24,7 +24,8 @@ noinst_HEADERS = jni_AtkWrapper.h \
 		  jawutil.h
 
 libatk_wrapper_la_CPPFLAGS = $(JNI_INCLUDES)\
-			     $(JAW_CFLAGS)
+			     $(JAW_CFLAGS)\
+			     -DATK_BRIDGE_LIB_NAME=\"$(ATK_BRIDGE_LIB_NAME)\"
 
 libatk_wrapper_la_LDFLAGS = -version-info $(LIB_ATK_WRAPPER_LT_VERSION)