Permalink
Browse files

Making Android&pyzmq friendly version with avoid-version

  • Loading branch information...
1 parent 1ff5af0 commit 01919774dc3935d86ea80acf5c47479bf5de7b68 @cyrilh cyrilh committed Jul 3, 2012
Showing with 8 additions and 1 deletion.
  1. +4 −1 configure.in
  2. +4 −0 src/Makefile.am
View
@@ -75,8 +75,9 @@ libzmq_werror="yes"
# By default use DSO visibility
libzmq_dso_visibility="yes"
-# Whether we are on mingw or not.
+# Whether we are on mingw or android or not.
libzmq_on_mingw32="no"
+libzmq_on_android="no"
# Set some default features required by 0MQ code.
CPPFLAGS="-D_REENTRANT -D_THREAD_SAFE $CPPFLAGS"
@@ -96,6 +97,7 @@ case "${host_os}" in
case "${host_os}" in
*android*)
AC_DEFINE(ZMQ_HAVE_ANDROID, 1, [Have Android OS])
+ libzmq_on_android="yes"
;;
esac
;;
@@ -373,6 +375,7 @@ AC_LANG_POP([C++])
AM_CONDITIONAL(BUILD_PGM, test "x$libzmq_pgm_ext" = "xyes")
AM_CONDITIONAL(ON_MINGW, test "x$libzmq_on_mingw32" = "xyes")
+AM_CONDITIONAL(ON_ANDROID, test "x$libzmq_on_android" = "xyes")
# Checks for library functions.
AC_TYPE_SIGNAL
View
@@ -140,8 +140,12 @@ libzmq_la_SOURCES = \
if ON_MINGW
libzmq_la_LDFLAGS = -no-undefined -avoid-version -version-info @LTVER@ @LIBZMQ_EXTRA_LDFLAGS@
else
+if ON_ANDROID
+libzmq_la_LDFLAGS = -avoid-version -version-info @LTVER@ @LIBZMQ_EXTRA_LDFLAGS@
+else
libzmq_la_LDFLAGS = -version-info @LTVER@ @LIBZMQ_EXTRA_LDFLAGS@
endif
+endif
libzmq_la_CXXFLAGS = @LIBZMQ_EXTRA_CXXFLAGS@

0 comments on commit 0191977

Please sign in to comment.