[java-atk-wrapper] Use -avoid-version only when target_os is cygwin



commit 3b22e56ba2ea3bc67152aba924c5ed20baf299ef
Author: Ke Wang <ke wang sun com>
Date:   Mon Nov 8 16:09:36 2010 +0800

    Use -avoid-version only when target_os is cygwin

 configure.ac        |   10 ++++++++++
 jni/src/Makefile.am |    2 +-
 2 files changed, 11 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 8bdc97d..bf3ce58 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,6 +43,16 @@ PKG_CHECK_MODULES(JAW, [
 ATK_BRIDGE_LIB_PATH="`pkg-config --variable=libdir gtk+-2.0`/gtk-2.0"
 AC_SUBST(ATK_BRIDGE_LIB_PATH)
 
+case "${target_os}" in
+cygwin*)
+       LIB_ATK_WRAPPER_LD_FLAGS="-avoid-version -no-undefined"
+       ;;
+*)
+       LIB_ATK_WRAPPER_LD_FLAGS="-version-info $LIB_ATK_WRAPPER_LT_VERSION -no-undefined"
+       ;;
+esac
+AC_SUBST(LIB_ATK_WRAPPER_LD_FLAGS)
+
 # java wrapper
 
 JAVA_REQUIRED=1.5
diff --git a/jni/src/Makefile.am b/jni/src/Makefile.am
index 19b713d..40c0b9e 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 = -avoid-version -no-undefined
+libatk_wrapper_la_LDFLAGS = $(LIB_ATK_WRAPPER_LD_FLAGS)
 
 libatk_wrapper_la_LIBADD = $(JAW_LIBS)
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]