generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-13 10:52:56 +01:00
Code Issues Projects Releases Wiki Activity

Making Android&pyzmq friendly version with avoid-version

Browse Source
This commit is contained in:
Cyril Holweck 2012-07-03 12:20:37 +02:00
parent 1ff5af098a
commit 01919774dc
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure.in
View File

@ -75,8 +75,9 @@ libzmq_werror="yes"
# By default use DSO visibility # By default use DSO visibility
libzmq_dso_visibility="yes" 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_mingw32="no"
libzmq_on_android="no"
# Set some default features required by 0MQ code. # Set some default features required by 0MQ code.
CPPFLAGS="-D_REENTRANT -D_THREAD_SAFE $CPPFLAGS" CPPFLAGS="-D_REENTRANT -D_THREAD_SAFE $CPPFLAGS"
@ -96,6 +97,7 @@ case "${host_os}" in
case "${host_os}" in case "${host_os}" in
*android*) *android*)
AC_DEFINE(ZMQ_HAVE_ANDROID, 1, [Have Android OS]) AC_DEFINE(ZMQ_HAVE_ANDROID, 1, [Have Android OS])
libzmq_on_android="yes"
;; ;;
esac esac
;; ;;
@ -373,6 +375,7 @@ AC_LANG_POP([C++])
AM_CONDITIONAL(BUILD_PGM, test "x$libzmq_pgm_ext" = "xyes") AM_CONDITIONAL(BUILD_PGM, test "x$libzmq_pgm_ext" = "xyes")
AM_CONDITIONAL(ON_MINGW, test "x$libzmq_on_mingw32" = "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. # Checks for library functions.
AC_TYPE_SIGNAL AC_TYPE_SIGNAL

4
src/Makefile.am
View File

@ -140,8 +140,12 @@ libzmq_la_SOURCES = \
if ON_MINGW if ON_MINGW
libzmq_la_LDFLAGS = -no-undefined -avoid-version -version-info @LTVER@ @LIBZMQ_EXTRA_LDFLAGS@ libzmq_la_LDFLAGS = -no-undefined -avoid-version -version-info @LTVER@ @LIBZMQ_EXTRA_LDFLAGS@
else 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@ libzmq_la_LDFLAGS = -version-info @LTVER@ @LIBZMQ_EXTRA_LDFLAGS@
endif endif
endif
libzmq_la_CXXFLAGS = @LIBZMQ_EXTRA_CXXFLAGS@ libzmq_la_CXXFLAGS = @LIBZMQ_EXTRA_CXXFLAGS@