From 01919774dc3935d86ea80acf5c47479bf5de7b68 Mon Sep 17 00:00:00 2001 From: Cyril Holweck Date: Tue, 3 Jul 2012 12:20:37 +0200 Subject: [PATCH] Making Android&pyzmq friendly version with avoid-version --- configure.in | 5 ++++- src/Makefile.am | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/configure.in b/configure.in index 71520151..60416ff5 100644 --- a/configure.in +++ b/configure.in @@ -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 diff --git a/src/Makefile.am b/src/Makefile.am index fc00d9ee..5adac699 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -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@