Skip to content

Commit

Permalink
Merge pull request #190 from pmienk/version3
Browse files Browse the repository at this point in the history
Regenerate artifacts.
  • Loading branch information
pmienk authored Sep 19, 2018
2 parents 3f3762a + 128be13 commit 1c90579
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
16 changes: 8 additions & 8 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -122,17 +122,17 @@ AC_MSG_RESULT([$enable_isystem])

# Check dependencies.
#==============================================================================
# Require Boost of at least version 1.57.0 and output ${boost_CPPFLAGS/LDFLAGS}.
# Require Boost of at least version 1.62.0 and output ${boost_CPPFLAGS/LDFLAGS}.
#------------------------------------------------------------------------------
AS_CASE([${CC}], [*],
[AX_BOOST_BASE([1.57.0],
[AX_BOOST_BASE([1.62.0],
[AC_SUBST([boost_CPPFLAGS], [${BOOST_CPPFLAGS}])
AC_SUBST([boost_ISYS_CPPFLAGS], [`echo ${BOOST_CPPFLAGS} | $SED s/^-I/-isystem/g | $SED s/' -I'/' -isystem'/g`])
AC_SUBST([boost_LDFLAGS], [${BOOST_LDFLAGS}])
AC_MSG_NOTICE([boost_CPPFLAGS : ${boost_CPPFLAGS}])
AC_MSG_NOTICE([boost_ISYS_CPPFLAGS : ${boost_ISYS_CPPFLAGS}])
AC_MSG_NOTICE([boost_LDFLAGS : ${boost_LDFLAGS}])],
[AC_MSG_ERROR([Boost 1.57.0 or later is required but was not found.])])])
[AC_MSG_ERROR([Boost 1.62.0 or later is required but was not found.])])])

AS_CASE([${enable_isystem}],[yes],
[AC_SUBST([boost_BUILD_CPPFLAGS], [${boost_ISYS_CPPFLAGS}])],
Expand All @@ -146,14 +146,14 @@ AS_CASE([${with_tests}], [yes],
AC_MSG_NOTICE([boost_unit_test_framework_LIBS : ${boost_unit_test_framework_LIBS}])],
[AC_SUBST([boost_unit_test_framework_LIBS], [])])

# Require zmq of at least version 4.2.0 and output ${zmq_CPPFLAGS/LIBS/PKG}.
# Require zmq of at least version 4.2.5 and output ${zmq_CPPFLAGS/LIBS/PKG}.
#------------------------------------------------------------------------------
PKG_CHECK_MODULES([zmq], [libzmq >= 4.2.0],
[zmq_INCLUDEDIR="`$PKG_CONFIG --variable=includedir "libzmq >= 4.2.0" 2>/dev/null`"
zmq_OTHER_CFLAGS="`$PKG_CONFIG --cflags-only-other "libzmq >= 4.2.0" 2>/dev/null`"],
PKG_CHECK_MODULES([zmq], [libzmq >= 4.2.5],
[zmq_INCLUDEDIR="`$PKG_CONFIG --variable=includedir "libzmq >= 4.2.5" 2>/dev/null`"
zmq_OTHER_CFLAGS="`$PKG_CONFIG --cflags-only-other "libzmq >= 4.2.5" 2>/dev/null`"],
[zmq_INCLUDEDIR=""
zmq_OTHER_CFLAGS=""])
AC_SUBST([zmq_PKG], ['libzmq >= 4.2.0'])
AC_SUBST([zmq_PKG], ['libzmq >= 4.2.5'])
AC_SUBST([zmq_CPPFLAGS], [${zmq_CFLAGS}])
AS_IF([test x${zmq_INCLUDEDIR} != "x"],
[AC_SUBST([zmq_ISYS_CPPFLAGS], ["-isystem${zmq_INCLUDEDIR} ${zmq_OTHER_CFLAGS}"])],
Expand Down
8 changes: 4 additions & 4 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@ BUILD_DIR="build-libbitcoin-protocol"

# ZMQ archive.
#------------------------------------------------------------------------------
ZMQ_URL="https://github.com/zeromq/libzmq/releases/download/v4.2.0/zeromq-4.2.0.tar.gz"
ZMQ_ARCHIVE="zeromq-4.2.0.tar.gz"
ZMQ_URL="https://github.com/zeromq/libzmq/releases/download/v4.2.5/zeromq-4.2.5.tar.gz"
ZMQ_ARCHIVE="zeromq-4.2.5.tar.gz"

# Boost archive.
#------------------------------------------------------------------------------
BOOST_URL="http://downloads.sourceforge.net/project/boost/boost/1.57.0/boost_1_57_0.tar.bz2"
BOOST_ARCHIVE="boost_1_57_0.tar.bz2"
BOOST_URL="http://downloads.sourceforge.net/project/boost/boost/1.62.0/boost_1_62_0.tar.bz2"
BOOST_ARCHIVE="boost_1_62_0.tar.bz2"


# Define utility functions.
Expand Down
2 changes: 1 addition & 1 deletion libbitcoin-protocol.pc.in
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Version: @PACKAGE_VERSION@
#==============================================================================
# Dependencies that publish package configuration.
#------------------------------------------------------------------------------
Requires: libzmq >= 4.2.0 libbitcoin >= 3.4.0
Requires: libzmq >= 4.2.5 libbitcoin >= 3.4.0

# Include directory and any other required compiler flags.
#------------------------------------------------------------------------------
Expand Down

0 comments on commit 1c90579

Please sign in to comment.