3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-03-10 16:06:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3325 from jcourreges/platforms-conditionals-cleanup

Browse Source 
Platforms conditionals cleanup
This commit is contained in:
Luca Boccassi 2018-12-07 20:31:53 +00:00 committed by GitHub
commit aaaec894d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Makefile.am
View File

@ -291,27 +291,9 @@ src_libzmq_la_LDFLAGS = \
-version-info @LTVER@ \ -version-info @LTVER@ \
@LIBZMQ_EXTRA_LDFLAGS@ @LIBZMQ_EXTRA_LDFLAGS@
else else
if ON_LINUX
src_libzmq_la_LDFLAGS = \ src_libzmq_la_LDFLAGS = \
-version-info @LTVER@ \ -version-info @LTVER@ \
@LIBZMQ_EXTRA_LDFLAGS@ @LIBZMQ_EXTRA_LDFLAGS@
else
if ON_GNU
src_libzmq_la_LDFLAGS = \
-version-info @LTVER@ \
@LIBZMQ_EXTRA_LDFLAGS@
else
if ON_DEBIAN_KFREEBSD
src_libzmq_la_LDFLAGS = \
-version-info @LTVER@ \
@LIBZMQ_EXTRA_LDFLAGS@
else
src_libzmq_la_LDFLAGS = \
-version-info @LTVER@ \
@LIBZMQ_EXTRA_LDFLAGS@
endif
endif
endif
endif endif
endif endif
endif endif

8
configure.ac
View File

@ -167,7 +167,6 @@ libzmq_on_cygwin="no"
libzmq_on_android="no" libzmq_on_android="no"
libzmq_on_linux="no" libzmq_on_linux="no"
libzmq_on_gnu="no" libzmq_on_gnu="no"
libzmq_on_debian_kfreebsd="no"
# Set some default features required by ZeroMQ code # Set some default features required by ZeroMQ code
CPPFLAGS="-D_REENTRANT -D_THREAD_SAFE $CPPFLAGS" CPPFLAGS="-D_REENTRANT -D_THREAD_SAFE $CPPFLAGS"
@ -222,12 +221,6 @@ case "${host_os}" in
;; ;;
*freebsd*) *freebsd*)
# Define on FreeBSD to enable all library features # Define on FreeBSD to enable all library features
case "${host_os}" in
# On Debian/kFreeBSD with gnu set the --version-script flag
kfreebsd*-gnu*)
libzmq_on_debian_kfreebsd="yes"
;;
esac
CPPFLAGS="-D__BSD_VISIBLE $CPPFLAGS" CPPFLAGS="-D__BSD_VISIBLE $CPPFLAGS"
AC_DEFINE(ZMQ_HAVE_FREEBSD, 1, [Have FreeBSD OS]) AC_DEFINE(ZMQ_HAVE_FREEBSD, 1, [Have FreeBSD OS])
;; ;;
@ -633,7 +626,6 @@ AM_CONDITIONAL(ON_CYGWIN, test "x$libzmq_on_cygwin" = "xyes")
AM_CONDITIONAL(ON_ANDROID, test "x$libzmq_on_android" = "xyes") AM_CONDITIONAL(ON_ANDROID, test "x$libzmq_on_android" = "xyes")
AM_CONDITIONAL(ON_LINUX, test "x$libzmq_on_linux" = "xyes") AM_CONDITIONAL(ON_LINUX, test "x$libzmq_on_linux" = "xyes")
AM_CONDITIONAL(ON_GNU, test "x$libzmq_on_gnu" = "xyes") AM_CONDITIONAL(ON_GNU, test "x$libzmq_on_gnu" = "xyes")
AM_CONDITIONAL(ON_DEBIAN_KFREEBSD, test "x$libzmq_on_debian_kfreebsd" = "xyes")
# Check for __atomic_Xxx compiler intrinsics # Check for __atomic_Xxx compiler intrinsics
AC_LANG_PUSH([C++]) AC_LANG_PUSH([C++])