Commit 92e15aa1 authored by Stefano Rivera's avatar Stefano Rivera

Import pyzmq_15.1.0.orig.tar.gz

parent 6fd511ad
......@@ -19,3 +19,4 @@ MANIFEST
.tox
examples/security/public_keys
examples/security/private_keys
wheelhouse
......@@ -4,45 +4,51 @@ cache:
apt
pip
python:
- 2.6
- 2.7
- 3.2
- 3.3
- 3.4
- 3.5
- pypy
env:
- ZMQ=
- ZMQ=bundled
- ZMQ=master
before_install:
- sudo add-apt-repository -y ppa:shnatsel/dnscrypt
- sudo apt-get update
- if [[ $ZMQ != 'bundled' ]]; then sudo apt-get install -qq libzmq3-dev libsodium-dev; fi
- if [[ $TRAVIS_PYTHON_VERSION != 'pypy' ]]; then pip install -q cython --install-option='--no-cython-compile'; fi
- if [[ $ZMQ == 'master' ]]; then git clone --depth 1 https://github.com/zeromq/libzmq; fi
- if [[ $ZMQ == 'master' ]]; then sh -c 'cd libzmq; sh autogen.sh; ./configure; make -j; sudo make install; sudo ldconfig'; fi
- pip install -q --use-mirrors nose
- 'if [[ $ZMQ != bundled ]]; then sudo apt-get install -y -qq libzmq3-dev libsodium-dev; fi'
- 'if [[ $TRAVIS_PYTHON_VERSION != pypy* ]]; then wget https://github.com/minrk/travis-wheels/archive/master.zip -O wheels.zip && unzip wheels.zip; fi'
- 'if [[ $TRAVIS_PYTHON_VERSION != pypy* ]]; then pip install -q -f travis-wheels-master/wheelhouse cython; fi'
- 'if [[ ! -z "$ZMQ" && $ZMQ != bundled ]]; then wget https://github.com/zeromq/$ZMQ/archive/master.zip -O libzmq.zip && unzip libzmq.zip; fi'
- 'if [[ ! -z "$ZMQ" && $ZMQ != bundled ]]; then sh -c "set -x; cd $ZMQ-master; sh autogen.sh; ./configure; make -j; sudo make install; sudo ldconfig"; fi'
- 'if [[ $TRAVIS_PYTHON_VERSION = 2.7 ]]; then pip install -q -f travis-wheels-master/wheelhouse gevent; fi'
- pip install -q -f file://travis-wheels-master/wheelhouse nose tornado
install:
- if [[ $ZMQ == 'master' ]]; then export ZMQ=/usr/local; fi
- 'if [[ ! -z "$ZMQ" && $ZMQ != bundled ]]; then export ZMQ=/usr/local; fi'
- python setup.py build_ext --inplace --zmq=$ZMQ
matrix:
exclude:
- python: 2.6
env: ZMQ=bundled
include:
- python: 3.5
env: ZMQ=libzmq
- python: 3.4
env: ZMQ=zeromq4-x
- python: 3.4
env: ZMQ=zeromq4-1
- python: 3.4
env: ZMQ=zeromq3-x
- python: 2.6
env: ZMQ=master
env: ZMQ=
- python: 3.2
env: ZMQ=bundled
- python: 3.2
env: ZMQ=master
env: ZMQ=
- python: 3.3
env: ZMQ=
- python: pypy3
env: ZMQ=
- python: nightly
env: ZMQ=
- python: nightly
env: ZMQ=bundled
- python: 3.3
env: ZMQ=master
allow_failures:
- env: ZMQ=master
- env: ZMQ=libzmq
- python: nightly
script: python setup.py test
......@@ -162,4 +162,20 @@ General Public License ever published by the Free Software Foundation.
whether future versions of the GNU Lesser General Public License shall
apply, that proxy's public statement of acceptance of any version is
permanent authorization for you to choose that version for the
Library.
\ No newline at end of file
Library.
--------------------------------------------------------------------------------
SPECIAL EXCEPTION GRANTED BY COPYRIGHT HOLDERS
As a special exception, copyright holders give you permission to link this
library with independent modules to produce an executable, regardless of
the license terms of these independent modules, and to copy and distribute
the resulting executable under terms of your choice, provided that you also
meet, for each linked independent module, the terms and conditions of
the license of that module. An independent module is a module which is not
derived from or based on this library. If you modify this library, you must
extend this exception to your version of the library.
Note: this exception relieves you of any obligations under sections 4 and 5
of this license, and section 6 of the GNU General Public License.
......@@ -13,6 +13,7 @@ include tox.ini
include .travis.yml
graft docs
graft tools
prune docs/build
prune docs/gh-pages
......
......@@ -10,7 +10,7 @@ The Cython backend used by CPython supports libzmq ≥ 2.1.4 (including 3.2.x an
but the CFFI backend used by PyPy only supports libzmq ≥ 3.2.2 (including 4.x).
For a summary of changes to pyzmq, see our
[changelog](http://zeromq.github.io/pyzmq/changelog.html).
[changelog](https://pyzmq.readthedocs.org/en/latest/changelog.html).
### ØMQ 3.x, 4.x
......@@ -34,7 +34,7 @@ Python version of every example. We also have some information on our
## Downloading
Unless you specifically want to develop PyZMQ, we recommend downloading
the PyZMQ source code, eggs, or wheels from
the PyZMQ source code or wheels from
[PyPI](http://pypi.python.org/pypi/pyzmq). On Windows, you can get `.exe` installers
from [Christoph Gohlke](http://www.lfd.uci.edu/~gohlke/pythonlibs/#pyzmq).
......@@ -46,15 +46,18 @@ version 0.16 or later.
For more detail on building pyzmq, see [our Wiki](https://github.com/zeromq/pyzmq/wiki/Building-and-Installing-PyZMQ).
We build eggs and wheels for OS X and Windows, so you can get a binary on those platforms with either:
We build wheels for OS X and Windows, so you can get a binary on those platforms with:
pip install pyzmq
or
but compiling from source with `pip install pyzmq` should work in most environments.
Especially on OS X, make sure you are using the latest pip (≥ 6), or it may not find the right wheels.
easy_install pyzmq
If the wheel doesn't work for some reason, or you want to force pyzmq to be compiled
(this is often preferable if you already have libzmq installed and configured the way you want it),
you can force installation with:
but compiling from source with `pip install pyzmq` should work in most environments.
pip install --no-use-wheel pyzmq
When compiling pyzmq (e.g. installing with pip on Linux),
it is generally recommended that zeromq be installed separately,
......@@ -69,7 +72,7 @@ via homebrew, apt, yum, etc:
If this is not available, pyzmq will *try* to build libzmq as a Python Extension,
though this is not guaranteed to work.
To build pyzmq from the git repo (including release tags) requires Cython.
Building pyzmq from the git repo (including release tags on GitHub) requires Cython.
## Old versions
......
......@@ -15,6 +15,7 @@ import stat
import sys
import tarfile
from glob import glob
import hashlib
from subprocess import Popen, PIPE
try:
......@@ -32,13 +33,15 @@ pjoin = os.path.join
# Constants
#-----------------------------------------------------------------------------
bundled_version = (4,0,5)
bundled_version = (4,1,2)
libzmq = "zeromq-%i.%i.%i.tar.gz" % (bundled_version)
libzmq_url = "http://download.zeromq.org/" + libzmq
libzmq_checksum = "sha256:f9162ead6d68521e5154d871bac304f88857308bb02366b81bb588497a345927"
libsodium_version = (1,0,0)
libsodium_version = (1,0,3)
libsodium = "libsodium-%i.%i.%i.tar.gz" % (libsodium_version)
libsodium_url = "https://github.com/jedisct1/libsodium/releases/download/%i.%i.%i/" % libsodium_version + libsodium
libsodium_checksum = "sha256:cbcfc63cc90c05d18a20f229a62c7e7054a73731d0aa858c0517152c549b1288"
HERE = os.path.dirname(__file__)
ROOT = os.path.dirname(HERE)
......@@ -56,18 +59,41 @@ def localpath(*args):
plist = [ROOT] + list(args)
return os.path.abspath(pjoin(*plist))
def fetch_archive(savedir, url, fname, force=False):
def checksum_file(scheme, path):
"""Return the checksum (hex digest) of a file"""
h = getattr(hashlib, scheme)()
with open(path, 'rb') as f:
chunk = f.read(65535)
while chunk:
h.update(chunk)
chunk = f.read(65535)
return h.hexdigest()
def fetch_archive(savedir, url, fname, checksum, force=False):
"""download an archive to a specific location"""
dest = pjoin(savedir, fname)
scheme, digest_ref = checksum.split(':')
if os.path.exists(dest) and not force:
info("already have %s" % fname)
return dest
info("already have %s" % dest)
digest = checksum_file(scheme, fname)
if digest == digest_ref:
return dest
else:
warn("but checksum %s != %s, redownloading." % (digest, digest_ref))
os.remove(fname)
info("fetching %s into %s" % (url, savedir))
if not os.path.exists(savedir):
os.makedirs(savedir)
req = urlopen(url)
with open(dest, 'wb') as f:
f.write(req.read())
digest = checksum_file(scheme, dest)
if digest != digest_ref:
fatal("%s %s mismatch:\nExpected: %s\nActual : %s" % (
dest, scheme, digest_ref, digest))
return dest
#-----------------------------------------------------------------------------
......@@ -80,8 +106,8 @@ def fetch_libsodium(savedir):
if os.path.exists(dest):
info("already have %s" % dest)
return
fname = fetch_archive(savedir, libsodium_url, libsodium)
tf = tarfile.open(fname)
path = fetch_archive(savedir, libsodium_url, fname=libsodium, checksum=libsodium_checksum)
tf = tarfile.open(path)
with_version = pjoin(savedir, tf.firstmember.path)
tf.extractall(savedir)
tf.close()
......@@ -111,8 +137,8 @@ def fetch_libzmq(savedir):
if os.path.exists(dest):
info("already have %s" % dest)
return
fname = fetch_archive(savedir, libzmq_url, libzmq)
tf = tarfile.open(fname)
path = fetch_archive(savedir, libzmq_url, fname=libzmq, checksum=libzmq_checksum)
tf = tarfile.open(path)
with_version = pjoin(savedir, tf.firstmember.path)
tf.extractall(savedir)
tf.close()
......
......@@ -55,7 +55,7 @@ def v_str(v_tuple):
"""turn (2,0,1) into '2.0.1'."""
return ".".join(str(x) for x in v_tuple)
def get_eargs():
def get_env_args():
""" Look for options in environment vars """
settings = {}
......@@ -116,6 +116,7 @@ def config_from_prefix(prefix):
settings['zmq_prefix'] = prefix
settings['libzmq_extension'] = False
settings['no_libzmq_extension'] = True
settings['allow_legacy_libzmq'] = True # explicit zmq prefix allows legacy
return settings
def merge(into, d):
......@@ -142,6 +143,7 @@ def discover_settings(conf_base=None):
'libzmq_extension': False,
'no_libzmq_extension': False,
'skip_check_zmq': False,
'allow_legacy_libzmq': False,
'build_ext': {},
'bdist_egg': {},
}
......@@ -152,6 +154,6 @@ def discover_settings(conf_base=None):
# lowest priority
merge(settings, load_config('config', conf_base))
merge(settings, get_cfg_args())
merge(settings, get_eargs())
merge(settings, get_env_args())
return settings
......@@ -10,6 +10,14 @@
/* Define to 1 if you have the `clock_gettime' function. */
/* #undef HAVE_CLOCK_GETTIME */
/* Define to 1 if you have the declaration of `LOCAL_PEERCRED', and to 0 if
you don't. */
#define HAVE_DECL_LOCAL_PEERCRED 0
/* Define to 1 if you have the declaration of `SO_PEERCRED', and to 0 if you
don't. */
#define HAVE_DECL_SO_PEERCRED 0
/* Define to 1 if you have the <dlfcn.h> header file. */
#define HAVE_DLFCN_H 1
......@@ -37,6 +45,9 @@
/* Define to 1 if you have the <inttypes.h> header file. */
#define HAVE_INTTYPES_H 1
/* Define to 1 if you have the `gssapi_krb5' library (-lgssapi_krb5). */
/* #undef HAVE_LIBGSSAPI_KRB5 */
/* Define to 1 if you have the `iphlpapi' library (-liphlpapi). */
/* #undef HAVE_LIBIPHLPAPI */
......@@ -55,8 +66,8 @@
/* Define to 1 if you have the `socket' library (-lsocket). */
/* #undef HAVE_LIBSOCKET */
/* Define to 1 if you have the `sodium' library (-lsodium). */
/* #undef HAVE_LIBSODIUM */
/* The libsodium library is to be used. */
#define HAVE_LIBSODIUM 1
/* Define to 1 if you have the `ws2_32' library (-lws2_32). */
/* #undef HAVE_LIBWS2_32 */
......@@ -134,9 +145,6 @@
*/
#define LT_OBJDIR ".libs/"
/* Define to 1 if your C compiler doesn't accept -c and -o together. */
/* #undef NO_MINUS_C_MINUS_O */
/* Name of package */
#define PACKAGE "zeromq"
......@@ -147,7 +155,7 @@
#define PACKAGE_NAME "zeromq"
/* Define to the full name and version of this package. */
#define PACKAGE_STRING "zeromq 4.0.4"
#define PACKAGE_STRING "zeromq 4.1.1"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "zeromq"
......@@ -156,7 +164,7 @@
#define PACKAGE_URL ""
/* Define to the version of this package. */
#define PACKAGE_VERSION "4.0.4"
#define PACKAGE_VERSION "4.1.1"
/* Define as the return type of signal handlers (`int' or `void'). */
#define RETSIGTYPE void
......@@ -168,7 +176,10 @@
#define TIME_WITH_SYS_TIME 1
/* Version number of package */
#define VERSION "4.0.4"
#define VERSION "4.1.1"
/* Enable militant API assertions */
/* #undef ZMQ_ACT_MILITANT */
/* Force to use mutexes */
/* #undef ZMQ_FORCE_MUTEXES */
......@@ -197,12 +208,18 @@
/* Have Linux OS */
/* #undef ZMQ_HAVE_LINUX */
/* Have LOCAL_PEERCRED socket option */
/* #undef ZMQ_HAVE_LOCAL_PEERCRED */
/* Have MinGW32 */
/* #undef ZMQ_HAVE_MINGW32 */
/* Have NetBSD OS */
/* #undef ZMQ_HAVE_NETBSD */
/* Have NORM protocol extension */
/* #undef ZMQ_HAVE_NORM */
/* Have OpenBSD OS */
/* #undef ZMQ_HAVE_OPENBSD */
......@@ -224,6 +241,9 @@
/* Whether SO_KEEPALIVE is supported. */
#define ZMQ_HAVE_SO_KEEPALIVE 1
/* Have SO_PEERCRED socket option */
/* #undef ZMQ_HAVE_SO_PEERCRED */
/* Whether TCP_KEEPALIVE is supported. */
#define ZMQ_HAVE_TCP_KEEPALIVE 1
......@@ -236,6 +256,9 @@
/* Whether TCP_KEEPINTVL is supported. */
/* #undef ZMQ_HAVE_TCP_KEEPINTVL */
/* Have TIPC support */
/* #undef ZMQ_HAVE_TIPC */
/* Have uio.h header. */
#define ZMQ_HAVE_UIO 1
......
......@@ -10,6 +10,14 @@
/* Define to 1 if you have the `clock_gettime' function. */
#define HAVE_CLOCK_GETTIME 1
/* Define to 1 if you have the declaration of `LOCAL_PEERCRED', and to 0 if
you don't. */
#define HAVE_DECL_LOCAL_PEERCRED 0
/* Define to 1 if you have the declaration of `SO_PEERCRED', and to 0 if you
don't. */
#define HAVE_DECL_SO_PEERCRED 0
/* Define to 1 if you have the <dlfcn.h> header file. */
#define HAVE_DLFCN_H 1
......@@ -37,6 +45,9 @@
/* Define to 1 if you have the <inttypes.h> header file. */
#define HAVE_INTTYPES_H 1
/* Define to 1 if you have the `gssapi_krb5' library (-lgssapi_krb5). */
/* #undef HAVE_LIBGSSAPI_KRB5 */
/* Define to 1 if you have the `iphlpapi' library (-liphlpapi). */
/* #undef HAVE_LIBIPHLPAPI */
......@@ -55,8 +66,8 @@
/* Define to 1 if you have the `socket' library (-lsocket). */
/* #undef HAVE_LIBSOCKET */
/* Define to 1 if you have the `sodium' library (-lsodium). */
/* #undef HAVE_LIBSODIUM */
/* The libsodium library is to be used. */
#define HAVE_LIBSODIUM 1
/* Define to 1 if you have the `ws2_32' library (-lws2_32). */
/* #undef HAVE_LIBWS2_32 */
......@@ -134,9 +145,6 @@
*/
#define LT_OBJDIR ".libs/"
/* Define to 1 if your C compiler doesn't accept -c and -o together. */
/* #undef NO_MINUS_C_MINUS_O */
/* Name of package */
#define PACKAGE "zeromq"
......@@ -147,7 +155,7 @@
#define PACKAGE_NAME "zeromq"
/* Define to the full name and version of this package. */
#define PACKAGE_STRING "zeromq 4.0.4"
#define PACKAGE_STRING "zeromq 4.1.1"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "zeromq"
......@@ -156,7 +164,7 @@
#define PACKAGE_URL ""
/* Define to the version of this package. */
#define PACKAGE_VERSION "4.0.4"
#define PACKAGE_VERSION "4.1.1"
/* Define as the return type of signal handlers (`int' or `void'). */
#define RETSIGTYPE void
......@@ -168,7 +176,10 @@
#define TIME_WITH_SYS_TIME 1
/* Version number of package */
#define VERSION "4.0.4"
#define VERSION "4.1.1"
/* Enable militant API assertions */
/* #undef ZMQ_ACT_MILITANT */
/* Force to use mutexes */
/* #undef ZMQ_FORCE_MUTEXES */
......@@ -197,12 +208,18 @@
/* Have Linux OS */
/* #undef ZMQ_HAVE_LINUX */
/* Have LOCAL_PEERCRED socket option */
/* #undef ZMQ_HAVE_LOCAL_PEERCRED */
/* Have MinGW32 */
/* #undef ZMQ_HAVE_MINGW32 */
/* Have NetBSD OS */
/* #undef ZMQ_HAVE_NETBSD */
/* Have NORM protocol extension */
/* #undef ZMQ_HAVE_NORM */
/* Have OpenBSD OS */
/* #undef ZMQ_HAVE_OPENBSD */
......@@ -224,6 +241,9 @@
/* Whether SO_KEEPALIVE is supported. */
#define ZMQ_HAVE_SO_KEEPALIVE 1
/* Have SO_PEERCRED socket option */
/* #undef ZMQ_HAVE_SO_PEERCRED */
/* Whether TCP_KEEPALIVE is supported. */
/* #undef ZMQ_HAVE_TCP_KEEPALIVE */
......@@ -236,6 +256,9 @@
/* Whether TCP_KEEPINTVL is supported. */
#define ZMQ_HAVE_TCP_KEEPINTVL 1
/* Have TIPC support */
/* #undef ZMQ_HAVE_TIPC */
/* Have uio.h header. */
#define ZMQ_HAVE_UIO 1
......
/* src/platform.hpp. Generated from platform.hpp.in by configure. */
/* src/platform.hpp.in. Generated from configure.in by autoheader. */
/* src/platform.hpp.in. Generated from configure.ac by autoheader. */
/* Define to 1 if you have the <alloca.h> header file. */
#define HAVE_ALLOCA_H 1
......@@ -10,6 +10,14 @@
/* Define to 1 if you have the `clock_gettime' function. */
#define HAVE_CLOCK_GETTIME 1
/* Define to 1 if you have the declaration of `LOCAL_PEERCRED', and to 0 if
you don't. */
#define HAVE_DECL_LOCAL_PEERCRED 0
/* Define to 1 if you have the declaration of `SO_PEERCRED', and to 0 if you
don't. */
#define HAVE_DECL_SO_PEERCRED 1
/* Define to 1 if you have the <dlfcn.h> header file. */
#define HAVE_DLFCN_H 1
......@@ -34,6 +42,9 @@
/* Define to 1 if you have the <inttypes.h> header file. */
#define HAVE_INTTYPES_H 1
/* Define to 1 if you have the `gssapi_krb5' library (-lgssapi_krb5). */
/* #undef HAVE_LIBGSSAPI_KRB5 */
/* Define to 1 if you have the `iphlpapi' library (-liphlpapi). */
/* #undef HAVE_LIBIPHLPAPI */
......@@ -52,6 +63,9 @@
/* Define to 1 if you have the `socket' library (-lsocket). */
/* #undef HAVE_LIBSOCKET */
/* The libsodium library is to be used. */
/* #undef HAVE_LIBSODIUM */
/* Define to 1 if you have the `ws2_32' library (-lws2_32). */
/* #undef HAVE_LIBWS2_32 */
......@@ -128,9 +142,6 @@
*/
#define LT_OBJDIR ".libs/"
/* Define to 1 if your C compiler doesn't accept -c and -o together. */
/* #undef NO_MINUS_C_MINUS_O */
/* Name of package */
#define PACKAGE "zeromq"
......@@ -141,7 +152,7 @@
#define PACKAGE_NAME "zeromq"
/* Define to the full name and version of this package. */
#define PACKAGE_STRING "zeromq 3.2.1"
#define PACKAGE_STRING "zeromq 4.1.1"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "zeromq"
......@@ -150,7 +161,7 @@
#define PACKAGE_URL ""
/* Define to the version of this package. */
#define PACKAGE_VERSION "3.2.1"
#define PACKAGE_VERSION "4.1.1"
/* Define as the return type of signal handlers (`int' or `void'). */
#define RETSIGTYPE void
......@@ -162,7 +173,10 @@
#define TIME_WITH_SYS_TIME 1
/* Version number of package */
#define VERSION "3.2.1"
#define VERSION "4.1.1"
/* Enable militant API assertions */
/* #undef ZMQ_ACT_MILITANT */
/* Force to use mutexes */
/* #undef ZMQ_FORCE_MUTEXES */
......@@ -191,12 +205,18 @@
/* Have Linux OS */
#define ZMQ_HAVE_LINUX 1
/* Have LOCAL_PEERCRED socket option */
/* #undef ZMQ_HAVE_LOCAL_PEERCRED */
/* Have MinGW32 */
/* #undef ZMQ_HAVE_MINGW32 */
/* Have NetBSD OS */
/* #undef ZMQ_HAVE_NETBSD */
/* Have NORM protocol extension */
/* #undef ZMQ_HAVE_NORM */
/* Have OpenBSD OS */
/* #undef ZMQ_HAVE_OPENBSD */
......@@ -229,6 +249,8 @@
/* Whether TCP_KEEPINTVL is supported. */
/* #undef ZMQ_HAVE_TCP_KEEPINTVL */
/* Have TIPC support */
/* #undef ZMQ_HAVE_TIPC */
/* Have uio.h header. */
#define ZMQ_HAVE_UIO 1
......
......@@ -10,6 +10,14 @@
/* Define to 1 if you have the `clock_gettime' function. */
#define HAVE_CLOCK_GETTIME 1
/* Define to 1 if you have the declaration of `LOCAL_PEERCRED', and to 0 if
you don't. */
#define HAVE_DECL_LOCAL_PEERCRED 0
/* Define to 1 if you have the declaration of `SO_PEERCRED', and to 0 if you
don't. */
#define HAVE_DECL_SO_PEERCRED 1
/* Define to 1 if you have the <dlfcn.h> header file. */
#define HAVE_DLFCN_H 1
......@@ -37,6 +45,9 @@
/* Define to 1 if you have the <inttypes.h> header file. */
#define HAVE_INTTYPES_H 1
/* Define to 1 if you have the `gssapi_krb5' library (-lgssapi_krb5). */
/* #undef HAVE_LIBGSSAPI_KRB5 */
/* Define to 1 if you have the `iphlpapi' library (-liphlpapi). */
/* #undef HAVE_LIBIPHLPAPI */
......@@ -55,7 +66,7 @@
/* Define to 1 if you have the `socket' library (-lsocket). */
/* #undef HAVE_LIBSOCKET */
/* Define to 1 if you have the `sodium' library (-lsodium). */
/* The libsodium library is to be used. */
/* #undef HAVE_LIBSODIUM */
/* Define to 1 if you have the `ws2_32' library (-lws2_32). */
......@@ -134,9 +145,6 @@
*/
#define LT_OBJDIR ".libs/"
/* Define to 1 if your C compiler doesn't accept -c and -o together. */
/* #undef NO_MINUS_C_MINUS_O */
/* Name of package */
#define PACKAGE "zeromq"
......@@ -147,7 +155,7 @@
#define PACKAGE_NAME "zeromq"
/* Define to the full name and version of this package. */
#define PACKAGE_STRING "zeromq 4.0.4"
#define PACKAGE_STRING "zeromq 4.1.1"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "zeromq"
......@@ -156,7 +164,7 @@
#define PACKAGE_URL ""
/* Define to the version of this package. */
#define PACKAGE_VERSION "4.0.4"
#define PACKAGE_VERSION "4.1.1"
/* Define as the return type of signal handlers (`int' or `void'). */
#define RETSIGTYPE void
......@@ -168,7 +176,10 @@
#define TIME_WITH_SYS_TIME 1
/* Version number of package */
#define VERSION "4.0.4"
#define VERSION "4.1.1"
/* Enable militant API assertions */
/* #undef ZMQ_ACT_MILITANT */
/* Force to use mutexes */
/* #undef ZMQ_FORCE_MUTEXES */
......@@ -197,12 +208,18 @@
/* Have Linux OS */
#define ZMQ_HAVE_LINUX 1
/* Have LOCAL_PEERCRED socket option */
/* #undef ZMQ_HAVE_LOCAL_PEERCRED */
/* Have MinGW32 */
/* #undef ZMQ_HAVE_MINGW32 */
/* Have NetBSD OS */
/* #undef ZMQ_HAVE_NETBSD */
/* Have NORM protocol extension */
/* #undef ZMQ_HAVE_NORM */
/* Have OpenBSD OS */
/* #undef ZMQ_HAVE_OPENBSD */
......@@ -224,6 +241,9 @@
/* Whether SO_KEEPALIVE is supported. */
#define ZMQ_HAVE_SO_KEEPALIVE 1
/* Have SO_PEERCRED socket option */
#define ZMQ_HAVE_SO_PEERCRED 1
/* Whether TCP_KEEPALIVE is supported. */
/* #undef ZMQ_HAVE_TCP_KEEPALIVE */
......@@ -236,6 +256,9 @@
/* Whether TCP_KEEPINTVL is supported. */
#define ZMQ_HAVE_TCP_KEEPINTVL 1
/* Have TIPC support */
/* #undef ZMQ_HAVE_TIPC */
/* Have uio.h header. */
#define ZMQ_HAVE_UIO 1
......
#ifndef _stdint_h__
#define _stdint_h__
#include "../../bundled/zeromq/src/stdint.hpp"