[java-atk-wrapper] Portability fixes for libatk-wrapper

[Ke Wang <kewang src gnome org>]

commit bbf30ecd9eb0313f68cda8065a331dc32bd6dee7
Author: Yaakov Selkowitz <yselkowitz users sourceforge net>
Date:   Fri Oct 15 12:24:25 2010 +0000

    Portability fixes for libatk-wrapper

 jni/src/AtkWrapper.c |    4 ++--
 jni/src/Makefile.am  |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/jni/src/AtkWrapper.c b/jni/src/AtkWrapper.c
index 640b559..d69b43c 100644
--- a/jni/src/AtkWrapper.c
+++ b/jni/src/AtkWrapper.c
@@ -172,8 +172,8 @@ JNIEXPORT jboolean JNICALL Java_org_GNOME_Accessibility_AtkWrapper_initNativeLib
 		printf("GTK_PATH=%s\n", gtk_module_path);
 	}
 
-	const gchar* atk_bridge_file = g_strconcat(gtk_module_path,
-			"/modules/libatk-bridge.so", NULL);
+	gtk_module_path = g_strconcat(gtk_module_path, "/modules", NULL);
+	const gchar* atk_bridge_file = g_module_build_path(gtk_module_path, "atk-bridge");
 
 	if (jaw_debug) {
 		printf("We are going to load %s\n", atk_bridge_file);
diff --git a/jni/src/Makefile.am b/jni/src/Makefile.am
index 3ca6896..19b713d 100644
--- a/jni/src/Makefile.am
+++ b/jni/src/Makefile.am
@@ -26,7 +26,7 @@ libatk_wrapper_la_CPPFLAGS = $(JNI_INCLUDES)\
 			     $(JAW_CFLAGS)\
 			     -DATK_BRIDGE_LIB_PATH=\"$(ATK_BRIDGE_LIB_PATH)\"
 
-libatk_wrapper_la_LDFLAGS = -version-info $(LIB_ATK_WRAPPER_LT_VERSION)
+libatk_wrapper_la_LDFLAGS = -avoid-version -no-undefined
 
 libatk_wrapper_la_LIBADD = $(JAW_LIBS)