From 817c89a78ea7b773046b010ca129fd1206e1c8f0 Mon Sep 17 00:00:00 2001 From: malosek Date: Mon, 15 Feb 2010 19:42:05 +0100 Subject: removed first dummy run of PKG_CHECK_EXISTS --- configure.in | 5 ----- 1 file changed, 5 deletions(-) diff --git a/configure.in b/configure.in index 6b788c7..23db758 100644 --- a/configure.in +++ b/configure.in @@ -233,11 +233,6 @@ AC_LANG(C++) # Optional stuff AC_CHECK_PROG(have_pkg_config, pkg-config, yes, no) -if test "x$have_pkg_config" != "xno"; then - # First instance of PKG_CHECK_ has to be executed - PKG_CHECK_EXISTS([dummy_pkg], [], []) -fi - # Checks for typedefs, structures, and compiler characteristics. AC_HEADER_STDBOOL AC_C_CONST -- cgit v1.2.3 From 7778010d76e6da534307ca3f0a3506d3d7f0ec5d Mon Sep 17 00:00:00 2001 From: Martin Sustrik Date: Mon, 15 Feb 2010 19:58:47 +0100 Subject: care taken of the fact that AI_NUMERICSERV is not defined on OSX 10.5 --- src/ip.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/ip.cpp b/src/ip.cpp index 595689f..0fb2adf 100644 --- a/src/ip.cpp +++ b/src/ip.cpp @@ -239,7 +239,11 @@ int zmq::resolve_ip_interface (sockaddr_storage* addr_, socklen_t *addr_len_, // Restrict hostname/service to literals to avoid any DNS lookups or // service-name irregularity due to indeterminate socktype. - req.ai_flags = AI_PASSIVE | AI_NUMERICHOST | AI_NUMERICSERV; +#if defined ZMQ_HAVE_OSX + req.ai_flags = AI_PASSIVE | AI_NUMERICHOST; +#else + req.ai_flags = AI_PASSIVE | AI_NUMERICHOST | AI_NUMERICSERV; +#endif // Resolve the literal address. Some of the error info is lost in case // of error, however, there's no way to report EAI errors via errno. @@ -289,6 +293,11 @@ int zmq::resolve_ip_hostname (sockaddr_storage *addr_, socklen_t *addr_len_, // Avoid named services due to unclear socktype, and don't pick IPv6 // addresses if we don't have a local IPv6 address configured. req.ai_flags = AI_NUMERICSERV | AI_ADDRCONFIG; +#if defined ZMQ_HAVE_OSX + req.ai_flags = AI_ADDRCONFIG; +#else + req.ai_flags = AI_NUMERICSERV | AI_ADDRCONFIG; +#endif // Resolve host name. Some of the error info is lost in case of error, // however, there's no way to report EAI errors via errno. -- cgit v1.2.3 From 5041b0bc0bce43e5b6d8b6c6264141d33f3c2a7c Mon Sep 17 00:00:00 2001 From: Martin Sustrik Date: Mon, 15 Feb 2010 20:35:00 +0100 Subject: fixing the previous commit :( --- src/ip.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/ip.cpp b/src/ip.cpp index 0fb2adf..822e359 100644 --- a/src/ip.cpp +++ b/src/ip.cpp @@ -292,7 +292,6 @@ int zmq::resolve_ip_hostname (sockaddr_storage *addr_, socklen_t *addr_len_, // Avoid named services due to unclear socktype, and don't pick IPv6 // addresses if we don't have a local IPv6 address configured. - req.ai_flags = AI_NUMERICSERV | AI_ADDRCONFIG; #if defined ZMQ_HAVE_OSX req.ai_flags = AI_ADDRCONFIG; #else -- cgit v1.2.3 From f96f53c9687b5a032ef45ce42154a7f944492eec Mon Sep 17 00:00:00 2001 From: Martin Sustrik Date: Mon, 15 Feb 2010 21:03:11 +0100 Subject: ZMQ_POLLERR placeholder added to zmq.h --- bindings/c/zmq.h | 1 + 1 file changed, 1 insertion(+) diff --git a/bindings/c/zmq.h b/bindings/c/zmq.h index d5fb4f4..c6d4692 100644 --- a/bindings/c/zmq.h +++ b/bindings/c/zmq.h @@ -195,6 +195,7 @@ ZMQ_EXPORT int zmq_recv (void *s, zmq_msg_t *msg, int flags); #define ZMQ_POLLIN 1 #define ZMQ_POLLOUT 2 +#define ZMQ_POLLERR 4 typedef struct { -- cgit v1.2.3 From 94c74d5c18183b49507d633c7b06713841cfcb03 Mon Sep 17 00:00:00 2001 From: Martin Sustrik Date: Mon, 15 Feb 2010 21:04:34 +0100 Subject: Brian Granger added to credits list --- AUTHORS | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS b/AUTHORS index 83003c7..24e980b 100644 --- a/AUTHORS +++ b/AUTHORS @@ -33,6 +33,7 @@ Aamir Mohammad Alexander Majorov Bernd Schumacher Brett Cameron +Brian Granger Carsten Dinkelmann David Bahi Dirk Eddelbuettel -- cgit v1.2.3 From 0ded6c1973596436d7e5c54cfb89ada4d6c7473d Mon Sep 17 00:00:00 2001 From: Martin Lucina Date: Mon, 15 Feb 2010 22:17:18 +0100 Subject: Multiple fixes to --with-pgm Disallow build --with-pgm on non-x86/AMB64 CPUs Check correctly for all dependencies required by --with-pgm Don't assume tar has -j Reorder --with-pgm checks --- configure.in | 70 ++++++++++++++++++++++++++++++++++++------------------------ 1 file changed, 42 insertions(+), 28 deletions(-) diff --git a/configure.in b/configure.in index 23db758..ea9cb33 100644 --- a/configure.in +++ b/configure.in @@ -445,39 +445,60 @@ if test "x$with_pgm2_ext" != "xno"; then pgm_basename=${pgm2_basename} - # Test if we have pkg-config - if test "x$have_pkg_config" != "xyes"; then - AC_MSG_ERROR([To run configure with --with-pgm2 option, pkg-config has to be installed.]); - fi - - case "${host_os}" in - *linux*) - LIBZMQ_EXTRA_CXXFLAGS="${LIBZMQ_EXTRA_CXXFLAGS} -Wno-variadic-macros -Wno-long-long " + AC_MSG_CHECKING([if the PGM extension is supported on this platform]) + # OpenPGM is only supported by the vendor on x86 and AMD64 platforms... + case "${host_cpu}" in + i*86|x86_64) + # Supported + ;; + *) + AC_MSG_ERROR([the PGM extension is not supported on the ${host_cpu} platform.]) ;; - *mingw32*) + esac + + # ... and on Linux/Windows/Solaris systems. + case "${host_os}" in + *linux*|*mingw32*|*solaris*) LIBZMQ_EXTRA_CXXFLAGS="${LIBZMQ_EXTRA_CXXFLAGS} -Wno-variadic-macros -Wno-long-long " ;; *) - AC_MSG_ERROR([PGM extesion is not supported on this platform $host.]) + AC_MSG_ERROR([the PGM extension is not supported on system ${host_os}.]) ;; esac + AC_MSG_RESULT([yes]) - # Unpack libpgm2 - AC_MSG_CHECKING([Unpacking ${pgm_basename}.tar.bz2]) - - if tar -xjf foreign/openpgm/${pgm_basename}.tar.bz2 -C foreign/openpgm/; then - AC_MSG_RESULT([yes]) - else - AC_MSG_ERROR([Could not unpack foreign/openpgm/${pgm_basename}.tar.bz2 file.]) + # Test if we have pkg-config + if test "x$have_pkg_config" != "xyes"; then + AC_MSG_ERROR([the --with-pgm option requires that pkg-config be installed.]); + fi + + # Check for OpenPGM dependencies + PKG_CHECK_MODULES([GLIB], [glib-2.0 gthread-2.0]) + LIBZMQ_EXTRA_CXXFLAGS="${LIBZMQ_EXTRA_CXXFLAGS} ${GLIB_CFLAGS} " + LIBZMQ_EXTRA_LDFLAGS="${LIBZMQ_EXTRA_LDFLAGS} ${GLIB_LIBS} " + + # Bunzip2, Perl and Python are required duing PGM build + AC_CHECK_PROG(have_bunzip2, bunzip2, yes, no) + if test "x$have_bunzip2" != "xyes"; then + AC_MSG_ERROR([bunzip2 is required for building the PGM extension.]) + fi + AC_CHECK_PROG(have_perl, perl, yes, no) + if test "x$have_perl" != "xyes"; then + AC_MSG_ERROR([perl is required for building the PGM extension.]) fi - if test "x$pyzmq" != "xyes"; then AC_CHECK_PROG(have_python, python, yes, no) if test "x$have_python" != "xyes"; then - AC_MSG_ERROR([Could not find python.]) + AC_MSG_ERROR([python is required for building the PGM extension.]) fi fi + # Unpack libpgm2 + AC_MSG_NOTICE([Unpacking ${pgm_basename}.tar.bz2]) + if ! bunzip2 -c foreign/openpgm/${pgm_basename}.tar.bz2 | tar -xf - -C foreign/openpgm/; then + AC_MSG_ERROR([could not unpack the foreign/openpgm/${pgm_basename}.tar.bz2 file.]) + fi + # Generate galois_tables.c AC_CONFIG_COMMANDS([galois_tables2.c], [perl foreign/openpgm/libpgm-2.0.23rc8/openpgm/pgm/galois_generator.pl > \ @@ -488,15 +509,8 @@ if test "x$with_pgm2_ext" != "xno"; then [python foreign/openpgm/libpgm-2.0.23rc8/openpgm/pgm/version_generator.py > \ foreign/openpgm/libpgm-2.0.23rc8/openpgm/pgm/version.c]) - # Check for OpenPGM nedded libraries. - PKG_CHECK_MODULES([GLIB], [glib-2.0 gthread-2.0]) - - LIBZMQ_EXTRA_CXXFLAGS="${LIBZMQ_EXTRA_CXXFLAGS} ${GLIB_CFLAGS} " - - LIBZMQ_EXTRA_LDFLAFS="${LIBZMQ_EXTRA_LDFLAFS} ${GLIB_LIBS}" - - AC_DEFINE(ZMQ_HAVE_OPENPGM, 1, [Have OpenPGM v1 or v2 extension.]) - AC_DEFINE(ZMQ_HAVE_OPENPGM2, 1, [Have OpenPGM v2 extension.]) + # Success! + AC_DEFINE(ZMQ_HAVE_OPENPGM, 1, [Have OpenPGM extension]) pgm2_ext="yes" else # Fallback for make dist. -- cgit v1.2.3 From 48a90cfb347bc983362ce2bc021591d513d6a5ec Mon Sep 17 00:00:00 2001 From: Martin Lucina Date: Mon, 15 Feb 2010 22:25:01 +0100 Subject: Replace check for sparc with host_cpu --- configure.in | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/configure.in b/configure.in index ea9cb33..37c176e 100644 --- a/configure.in +++ b/configure.in @@ -175,23 +175,14 @@ case "${host_os}" in ;; esac -# Check if we are running at sparc harware -AC_MSG_CHECKING([wheter __sparc__ is defined]) -AC_COMPILE_IFELSE([AC_LANG_PROGRAM( - [[#if defined __sparc__ - //OK we are on sparc - #else - error: we are not on sparc - #endif - ]])], - [sparc=yes], - [sparc=no]) - -AC_MSG_RESULT([$sparc]) - -if test "x$sparc" = "xyes"; then - CPPFLAGS="$CPPFLAGS -mcpu=v9" -fi +# CPU-specific optimizations +case "${host_cpu}" in + *sparc*) + CPPFLAGS="$CPPFLAGS -mcpu=v9" + ;; + *) + ;; +esac # Checks for header files. AC_HEADER_STDC -- cgit v1.2.3 From 5687661ba4a1ecf70e130047dc288cb6cff6f21a Mon Sep 17 00:00:00 2001 From: Martin Lucina Date: Mon, 15 Feb 2010 22:58:45 +0100 Subject: Cleanup messages from configure.in --- configure.in | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/configure.in b/configure.in index 37c176e..4dba42a 100644 --- a/configure.in +++ b/configure.in @@ -96,7 +96,7 @@ case "${host_os}" in AC_DEFINE(ZMQ_HAVE_LINUX, 1, [Have Linux OS]) CPPFLAGS="-D_REENTRANT $CPPFLAGS" AC_CHECK_LIB(uuid, main, , - [AC_MSG_ERROR([Could not link with libuuid, install develop version.])]) + [AC_MSG_ERROR([cannot link with -luuid, install uuid-dev.])]) ;; *solaris*) AC_DEFINE(ZMQ_HAVE_SOLARIS, 1, [Have Solaris OS]) @@ -104,7 +104,7 @@ case "${host_os}" in AC_CHECK_LIB(nsl, main) AC_CHECK_LIB(rt, main) AC_CHECK_LIB(uuid, main, , - [AC_MSG_ERROR([Could not link with libuuid, install develop version.])]) + [AC_MSG_ERROR([cannot link with -luuid, install uuid-dev.])]) CPPFLAGS="-D_REENTRANT -D_PTHREADS $CPPFLAGS" AC_MSG_CHECKING([wheter atomic operations can be used]) AC_COMPILE_IFELSE([AC_LANG_PROGRAM( @@ -161,17 +161,17 @@ case "${host_os}" in AC_DEFINE(ZMQ_HAVE_MINGW32, 1, [Have MinGW32]) AC_CHECK_HEADERS(windows.h) AC_CHECK_LIB(ws2_32, main, , - [AC_MSG_ERROR([Could not link with ws2_32.dll.])]) + [AC_MSG_ERROR([cannot link with ws2_32.dll.])]) AC_CHECK_LIB(Rpcrt4, main, , - [AC_MSG_ERROR([Could not link with Rpcrt4.dll.])]) + [AC_MSG_ERROR([cannot link with Rpcrt4.dll.])]) AC_CHECK_LIB(Iphlpapi, main, , - [AC_MSG_ERROR([Could not link with Iphlpapi.dll.])]) + [AC_MSG_ERROR([cannot link with Iphlpapi.dll.])]) CFLAGS="${CFLAGS} -std=c99" on_mingw32="yes" install_man="no" ;; *) - AC_MSG_ERROR([Not supported os: $host.]) + AC_MSG_ERROR([unsupported system: ${host_os}.]) ;; esac @@ -273,7 +273,7 @@ AC_ARG_WITH([python], [AS_HELP_STRING([--with-python], [build Python language bi if test "x$with_python" != "xno"; then AM_PATH_PYTHON([2.4], , [:]) if test "x$PYTHON" = "x:"; then - AC_MSG_ERROR([To run configure with --with-python option, Python has to be installed.]); + AC_MSG_ERROR([thhe --with-python option requires that python be installled.]); fi if test "x$python_headersdir" != "xno"; then @@ -281,7 +281,7 @@ if test "x$with_python" != "xno"; then PYTHON_SETUP_INCLUDES="${python_headersdir}" AC_CHECK_HEADERS($python_headersdir/Python.h, [] , - [AC_MSG_ERROR([To run configure with --with-python option, Python.h has to be usable.])]) + [AC_MSG_ERROR([the --with-python option requires a usable Python.h.])]) else py_prefix=`$PYTHON -c "import sys; print sys.prefix"` @@ -294,7 +294,7 @@ if test "x$with_python" != "xno"; then fi AC_CHECK_HEADERS($py_prefix/include/python${PYTHON_VERSION}/Python.h, [] , - [AC_MSG_ERROR([To run configure with --with-python option, Python.h has to be usable.])]) + [AC_MSG_ERROR([the --with-python option requires a usable Python.h.])]) fi AC_SUBST(PYTHON_INCLUDES) @@ -324,10 +324,10 @@ fi AC_ARG_WITH([ruby], [AS_HELP_STRING([--with-ruby], [build ruby language binding [default=no]])], [with_ruby=yes], [with_ruby=no]) if test "x$with_ruby" != "xno"; then AC_CHECK_HEADERS([ruby.h], [], - [AC_MSG_ERROR([Could not find Ruby header files, Please specify their location with --with-ruby-headersdir.])]) + [AC_MSG_ERROR([cannot find Ruby header files. Please specify their location with --with-ruby-headersdir.])]) AC_SEARCH_LIBS(ruby_init,[ruby ruby1.8 ruby18],, - [AC_MSG_ERROR([Could not link with Ruby library. Please specify their location with --with-ruby-libdir.])]) + [AC_MSG_ERROR([cannot link with Ruby library. Please specify it's location with --with-ruby-libdir.])]) rbzmq="yes" fi @@ -348,7 +348,7 @@ AC_SUBST([RUBYDIR]) if test "x$pyzmq" = "xyes"; then AC_CHECK_PROG(have_python, python, yes, no) if test "x$have_python" != "xyes"; then - AC_MSG_ERROR([Could not find python.]) + AC_MSG_ERROR([the --with-python option requires that python be installed.]) fi fi @@ -358,28 +358,28 @@ AC_ARG_WITH([java], [AS_HELP_STRING([--with-java], [build Java language binding if test "x$with_java" != "xno"; then AC_PATH_PROG(JAVAC, javac, "no",[$PATH:$JAVA_HOME/bin]) if test "x$JAVAC" = "xno"; then - AC_MSG_ERROR([To run configure with --with-java option, javac has to be on the path.]); + AC_MSG_ERROR([the --with-java option requires that javac be on the path.]); fi AC_PATH_PROG(JAVAH, javah, "no",[$PATH:$JAVA_HOME/bin]) if test "x$JAVAH" = "xno"; then - AC_MSG_ERROR([To run configure with --with-java option, javah has to be on the path.]); + AC_MSG_ERROR([the --with-java option requires that javah be on the path.]); fi AC_PATH_PROG(JAR, jar, "no", [$PATH:$JAVA_HOME/bin]) if test "x$JAR" = "xno"; then - AC_MSG_ERROR([To run configure with --with-java option, jar has to be on the path.]); + AC_MSG_ERROR([the --with-java option requires that jar be on the path.]); fi if test "x$JAVA_HOME" = "x"; then - AC_MSG_ERROR([To run configure with --with-java, please set the JAVA_HOME variable to your JDK environment.]); + AC_MSG_ERROR([the --with-java option requires the JAVA_HOME environment variable be set to your JDK location.]); fi AC_MSG_CHECKING([for jni.h in a $JAVA_HOME/include dir]) if test -f $JAVA_HOME/include/jni.h; then AC_MSG_RESULT([yes]) else - AC_MSG_ERROR([Could not find jni.h in $JAVA_HOME/include directory.]); + AC_MSG_ERROR([cannot find jni.h in the $JAVA_HOME/include directory.]); fi JAVAROOT=./ @@ -425,11 +425,11 @@ AC_ARG_WITH([pgm-examples], [AS_HELP_STRING([--with-pgm-examples], [with_pgm2_examples=yes], [with_pgm2_examples=no]) if test "x$with_pgm2_ext" = "xno" -a "x$with_pgm2_examples" = "xyes"; then - AC_MSG_ERROR([Can not configure --with-pgm2-examples without --with-pgm2.]); + AC_MSG_ERROR([cannot configure --with-pgm2-examples without --with-pgm2.]); fi if test "x$c" = "xno" -a "x$with_pgm2_examples" = "xyes"; then - AC_MSG_ERROR([Can not configure --with-pgm2-examples without --with-c.]); + AC_MSG_ERROR([cannot configure --with-pgm2-examples without --with-c.]); fi if test "x$with_pgm2_ext" != "xno"; then @@ -487,7 +487,7 @@ if test "x$with_pgm2_ext" != "xno"; then # Unpack libpgm2 AC_MSG_NOTICE([Unpacking ${pgm_basename}.tar.bz2]) if ! bunzip2 -c foreign/openpgm/${pgm_basename}.tar.bz2 | tar -xf - -C foreign/openpgm/; then - AC_MSG_ERROR([could not unpack the foreign/openpgm/${pgm_basename}.tar.bz2 file.]) + AC_MSG_ERROR([cannot unpack the foreign/openpgm/${pgm_basename}.tar.bz2 file.]) fi # Generate galois_tables.c @@ -557,12 +557,12 @@ if test "x$with_perf" != "xno"; then if test "x$czmq" = "xno" -a "x$cppzmq" = "xno" -a "x$pyzmq" = "xno" -a \ "x$jzmq" = "xno" -a "x$rbzmq" = "xno"; then - AC_MSG_ERROR([To run configure with --with-perf option chose at least one language binding.]); + AC_MSG_ERROR([the --with-perf option requires at least one language binding.]); fi fi if test "x$with_perf" = "xno" -a "x$with_pgm2_examples" = "xyes"; then - AC_MSG_ERROR([Can not configure --with-pgm2-examples without --with-perf.]); + AC_MSG_ERROR([cannot configure --with-pgm-examples without --with-perf.]); fi # Chat example -- cgit v1.2.3 From 55800cea8c63ea84bd99e4c660ef1fd17a353e32 Mon Sep 17 00:00:00 2001 From: Martin Lucina Date: Mon, 15 Feb 2010 23:02:24 +0100 Subject: Fix typo --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.in b/configure.in index 4dba42a..0a792df 100644 --- a/configure.in +++ b/configure.in @@ -273,7 +273,7 @@ AC_ARG_WITH([python], [AS_HELP_STRING([--with-python], [build Python language bi if test "x$with_python" != "xno"; then AM_PATH_PYTHON([2.4], , [:]) if test "x$PYTHON" = "x:"; then - AC_MSG_ERROR([thhe --with-python option requires that python be installled.]); + AC_MSG_ERROR([the --with-python option requires that python be installled.]); fi if test "x$python_headersdir" != "xno"; then -- cgit v1.2.3 From 635e314643885ce8508ee64632bed7d6228fe8b6 Mon Sep 17 00:00:00 2001 From: Martin Lucina Date: Mon, 15 Feb 2010 23:09:57 +0100 Subject: Clarify python.h messages --- configure.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index 0a792df..9771c13 100644 --- a/configure.in +++ b/configure.in @@ -281,7 +281,7 @@ if test "x$with_python" != "xno"; then PYTHON_SETUP_INCLUDES="${python_headersdir}" AC_CHECK_HEADERS($python_headersdir/Python.h, [] , - [AC_MSG_ERROR([the --with-python option requires a usable Python.h.])]) + [AC_MSG_ERROR([cannot find a usable Python.h in ${python_headersdir}.])]) else py_prefix=`$PYTHON -c "import sys; print sys.prefix"` @@ -294,7 +294,7 @@ if test "x$with_python" != "xno"; then fi AC_CHECK_HEADERS($py_prefix/include/python${PYTHON_VERSION}/Python.h, [] , - [AC_MSG_ERROR([the --with-python option requires a usable Python.h.])]) + [AC_MSG_ERROR([cannot find a usable Python.h in $py_prefix/include/python${PYTHON_VERSION}.])]) fi AC_SUBST(PYTHON_INCLUDES) -- cgit v1.2.3 From 80c820d758aa65d71fbf4a24fd59d11de1f72fa5 Mon Sep 17 00:00:00 2001 From: Martin Lucina Date: Mon, 15 Feb 2010 23:51:05 +0100 Subject: Cleaning up more PGM cruft --- Makefile.am | 3 +++ configure.in | 65 +++++++++++++++++++----------------------------------- perf/c/Makefile.am | 4 ++-- src/Makefile.am | 12 +++++++--- 4 files changed, 37 insertions(+), 47 deletions(-) diff --git a/Makefile.am b/Makefile.am index 8795e14..3adbc96 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,3 +14,6 @@ $(top_srcdir)/foreign/xmlParser/xmlParser.hpp dist-hook: -rm -rf $(distdir)/foreign/openpgm/@pgm2_basename@ +distclean-local: + -rm -rf $(distdir)/foreign/openpgm/@pgm2_basename@ + diff --git a/configure.in b/configure.in index 9771c13..49266c7 100644 --- a/configure.in +++ b/configure.in @@ -62,7 +62,7 @@ AC_CHECK_LIB(stdc++, malloc) LIBZMQ_EXTRA_CXXFLAGS="" # Extra LDFLAGS are appended at the end of LDFLAGS for libzmq. -LIBZMQ_EXTRA_LDFLAFS="" +LIBZMQ_EXTRA_LDFLAGS="" # By default compiling with -pedantic except QNX and OSX. pedantic="yes" @@ -408,33 +408,29 @@ else fi # PGM extension -pgm2_ext="no" +pgm_ext="no" -pgm2_basename="libpgm-2.0.23rc8" +pgm_basename="libpgm-2.0.23rc8" -AC_SUBST(pgm2_basename) - -pgm_basename="" +AC_SUBST(pgm_basename) AC_ARG_WITH([pgm], [AS_HELP_STRING([--with-pgm], [build libzmq with PGM extension [default=no]])], - [with_pgm2_ext=yes], [with_pgm2_ext=no]) + [with_pgm_ext=yes], [with_pgm_ext=no]) AC_ARG_WITH([pgm-examples], [AS_HELP_STRING([--with-pgm-examples], [build PGM examples [default=no]])], - [with_pgm2_examples=yes], [with_pgm2_examples=no]) + [with_pgm_examples=yes], [with_pgm_examples=no]) -if test "x$with_pgm2_ext" = "xno" -a "x$with_pgm2_examples" = "xyes"; then - AC_MSG_ERROR([cannot configure --with-pgm2-examples without --with-pgm2.]); +if test "x$with_pgm_ext" = "xno" -a "x$with_pgm_examples" = "xyes"; then + AC_MSG_ERROR([cannot configure --with-pgm-examples without --with-pgm.]); fi -if test "x$c" = "xno" -a "x$with_pgm2_examples" = "xyes"; then - AC_MSG_ERROR([cannot configure --with-pgm2-examples without --with-c.]); +if test "x$c" = "xno" -a "x$with_pgm_examples" = "xyes"; then + AC_MSG_ERROR([cannot configure --with-pgm-examples without --with-c.]); fi -if test "x$with_pgm2_ext" != "xno"; then - - pgm_basename=${pgm2_basename} +if test "x$with_pgm_ext" != "xno"; then AC_MSG_CHECKING([if the PGM extension is supported on this platform]) # OpenPGM is only supported by the vendor on x86 and AMD64 platforms... @@ -484,39 +480,24 @@ if test "x$with_pgm2_ext" != "xno"; then fi fi - # Unpack libpgm2 + # Unpack libpgm AC_MSG_NOTICE([Unpacking ${pgm_basename}.tar.bz2]) if ! bunzip2 -c foreign/openpgm/${pgm_basename}.tar.bz2 | tar -xf - -C foreign/openpgm/; then AC_MSG_ERROR([cannot unpack the foreign/openpgm/${pgm_basename}.tar.bz2 file.]) fi - # Generate galois_tables.c - AC_CONFIG_COMMANDS([galois_tables2.c], - [perl foreign/openpgm/libpgm-2.0.23rc8/openpgm/pgm/galois_generator.pl > \ - foreign/openpgm/libpgm-2.0.23rc8/openpgm/pgm/galois_tables.c]) - - # Generate version.c - AC_CONFIG_COMMANDS([version2.c], - [python foreign/openpgm/libpgm-2.0.23rc8/openpgm/pgm/version_generator.py > \ - foreign/openpgm/libpgm-2.0.23rc8/openpgm/pgm/version.c]) - # Success! AC_DEFINE(ZMQ_HAVE_OPENPGM, 1, [Have OpenPGM extension]) - pgm2_ext="yes" -else - # Fallback for make dist. - pgm_basename=${pgm2_basename} + pgm_ext="yes" fi -AC_SUBST(pgm_basename) - # If not on QNX nor OSX nor PGM add -pedantic into LIBZMQ_EXTRA_CXXFLAGS. -if test "x$pedantic" = "xyes" -a "x$pgm2_ext" = "xno"; then +if test "x$pedantic" = "xyes" -a "x$pgm_ext" = "xno"; then LIBZMQ_EXTRA_CXXFLAGS="${LIBZMQ_EXTRA_CXXFLAGS} -pedantic" fi -# If not on QNX nor --with-pgm2 add -Werror into LIBZMQ_EXTRA_CXXFLAGS. -if test "x$werror" = "xyes" -a "x$pgm2_ext" = "xno"; then +# If not on QNX nor PGM add -Werror into LIBZMQ_EXTRA_CXXFLAGS. +if test "x$werror" = "xyes" -a "x$pgm_ext" = "xno"; then LIBZMQ_EXTRA_CXXFLAGS="${LIBZMQ_EXTRA_CXXFLAGS} -Werror" fi @@ -561,7 +542,7 @@ if test "x$with_perf" != "xno"; then fi fi -if test "x$with_perf" = "xno" -a "x$with_pgm2_examples" = "xyes"; then +if test "x$with_perf" = "xno" -a "x$with_pgm_examples" = "xyes"; then AC_MSG_ERROR([cannot configure --with-pgm-examples without --with-perf.]); fi @@ -578,15 +559,15 @@ AM_CONDITIONAL(BUILD_PYTHON, test "x$pyzmq" = "xyes") AM_CONDITIONAL(BUILD_RUBY, test "x$rbzmq" = "xyes") AM_CONDITIONAL(BUILD_C, test "x$czmq" = "xyes") AM_CONDITIONAL(BUILD_CPP, test "x$cppzmq" = "xyes") -AM_CONDITIONAL(BUILD_PGM2, test "x$pgm2_ext" = "xyes") -AM_CONDITIONAL(BUILD_NO_PGM, test "x$pgm2_ext" = "xno") +AM_CONDITIONAL(BUILD_PGM, test "x$pgm_ext" = "xyes") +AM_CONDITIONAL(BUILD_NO_PGM, test "x$pgm_ext" = "xno") AM_CONDITIONAL(BUILD_FORWARDER, test "x$forwarder" = "xyes") AM_CONDITIONAL(BUILD_STREAMER, test "x$streamer" = "xyes") AM_CONDITIONAL(BUILD_QUEUE, test "x$queue" = "xyes") AM_CONDITIONAL(BUILD_PERF, test "x$perf" = "xyes") AM_CONDITIONAL(BUILD_CHAT, test "x$chat" = "xyes") AM_CONDITIONAL(ON_MINGW, test "x$on_mingw32" = "xyes") -AM_CONDITIONAL(BUILD_PGM2_EXAMPLES, test "x$with_pgm2_examples" = "xyes") +AM_CONDITIONAL(BUILD_PGM_EXAMPLES, test "x$with_pgm_examples" = "xyes") AM_CONDITIONAL(INSTALL_MAN, test "x$install_man" = "xyes") AM_CONDITIONAL(BUILD_DOC, test "x$build_doc" = "xyes") @@ -595,7 +576,7 @@ AC_SUBST(inttypes) # Subst LIBZMQ_EXTRA_CXXFLAGS & LDFLAGS AC_SUBST(LIBZMQ_EXTRA_CXXFLAGS) -AC_SUBST(LIBZMQ_EXTRA_LDFLAFS) +AC_SUBST(LIBZMQ_EXTRA_LDFLAGS) # Checks for library functions. @@ -643,8 +624,8 @@ AC_MSG_RESULT([ Ruby library install dir: $rubydir]) fi AC_MSG_RESULT([ Transports:]) AC_MSG_RESULT([ tcp: yes]) -AC_MSG_RESULT([ udp: $pgm2_ext]) -AC_MSG_RESULT([ pgm: $pgm2_ext]) +AC_MSG_RESULT([ udp: $pgm_ext]) +AC_MSG_RESULT([ pgm: $pgm_ext]) AC_MSG_RESULT([ inproc: yes]) AC_MSG_RESULT([ Devices:]) AC_MSG_RESULT([ Forwarder: $forwarder]) diff --git a/perf/c/Makefile.am b/perf/c/Makefile.am index 9ab50a5..ec39630 100644 --- a/perf/c/Makefile.am +++ b/perf/c/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = -I$(top_builddir)/bindings/c -if BUILD_PGM2_EXAMPLES +if BUILD_PGM_EXAMPLES PGM_EXAMPLES_BINS = pgmsend pgmrecv endif @@ -22,7 +22,7 @@ remote_thr_LDADD = $(top_builddir)/src/libzmq.la remote_thr_SOURCES = remote_thr.c remote_thr_CXXFLAGS = -Wall -pedantic -Werror -if BUILD_PGM2_EXAMPLES +if BUILD_PGM_EXAMPLES if ON_MINGW pgmexamples_diff_flags = \ diff --git a/src/Makefile.am b/src/Makefile.am index 0ff7bbf..446b1e2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -15,7 +15,7 @@ include_HEADERS = ../bindings/c/zmq.h endif endif -if BUILD_PGM2 +if BUILD_PGM pgm_sources = ../foreign/openpgm/@pgm_basename@/openpgm/pgm/packet.c \ ../foreign/openpgm/@pgm_basename@/openpgm/pgm/time.c \ ../foreign/openpgm/@pgm_basename@/openpgm/pgm/if.c \ @@ -49,6 +49,12 @@ pgm_sources = ../foreign/openpgm/@pgm_basename@/openpgm/pgm/packet.c \ ../foreign/openpgm/@pgm_basename@/openpgm/pgm/log.c \ ../foreign/openpgm/@pgm_basename@/openpgm/pgm/sockaddr.c \ ../foreign/openpgm/@pgm_basename@/openpgm/pgm/version.c + +../foreign/openpgm/@pgm_basename@/openpgm/pgm/version.c: ../foreign/openpgm/@pgm_basename@/openpgm/pgm/version_generator.py + python ../foreign/openpgm/@pgm_basename@/openpgm/pgm/version_generator.py > $@ + +../foreign/openpgm/@pgm_basename@/openpgm/pgm/galois_tables.c: ../foreign/openpgm/@pgm_basename@/openpgm/pgm/galois_generator.pl + perl ../foreign/openpgm/@pgm_basename@/openpgm/pgm/galois_generator.pl > $@ endif nodist_libzmq_la_SOURCES = $(pgm_sources) @@ -171,9 +177,9 @@ libzmq_la_SOURCES = app_thread.hpp \ zmq_init.cpp \ zmq_listener.cpp -libzmq_la_LDFLAGS = -version-info @LTVER@ @LIBZMQ_EXTRA_LDFLAFS@ +libzmq_la_LDFLAGS = -version-info @LTVER@ @LIBZMQ_EXTRA_LDFLAGS@ -if BUILD_PGM2 +if BUILD_PGM if ON_MINGW libpgm_diff_flags = \ -- cgit v1.2.3 From b09eeeb2fac380da1e3455cdf97278850842e1c8 Mon Sep 17 00:00:00 2001 From: Martin Lucina Date: Mon, 15 Feb 2010 23:52:08 +0100 Subject: Update gitignore --- .gitignore | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 1c68975..c391b4e 100644 --- a/.gitignore +++ b/.gitignore @@ -17,7 +17,7 @@ autom4te.cache *.pdf *.ps .* -src/platform.hpp +src/platform.hpp* src/stamp-h1 devices/zmq_forwarder/zmq_forwarder devices/zmq_queue/zmq_queue @@ -37,3 +37,7 @@ doc/*.3 doc/*.7 doc/*.html doc/*.xml +bindings/python/setup.py +src/libzmq.pc +foreign/openpgm/* +!foreign/openpgm/*.tar.bz2 -- cgit v1.2.3 From df0c18ca17aa0dcd0e9f3737666a794b943f0982 Mon Sep 17 00:00:00 2001 From: Martin Lucina Date: Mon, 15 Feb 2010 23:54:49 +0100 Subject: Missed one instance of pgm2 --- Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 3adbc96..86c2d7a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,12 +8,12 @@ SUBDIRS = src doc $(DIR_PERF) devices bindings examples DIST_SUBDIRS = src doc perf devices bindings examples EXTRA_DIST = \ -$(top_srcdir)/foreign/openpgm/@pgm2_basename@.tar.bz2 \ +$(top_srcdir)/foreign/openpgm/@pgm_basename@.tar.bz2 \ $(top_srcdir)/foreign/xmlParser/xmlParser.cpp \ $(top_srcdir)/foreign/xmlParser/xmlParser.hpp dist-hook: - -rm -rf $(distdir)/foreign/openpgm/@pgm2_basename@ + -rm -rf $(distdir)/foreign/openpgm/@pgm_basename@ distclean-local: - -rm -rf $(distdir)/foreign/openpgm/@pgm2_basename@ + -rm -rf $(distdir)/foreign/openpgm/@pgm_basename@ -- cgit v1.2.3 From 8e9b78af271ae54882abf3010260d1e80ddd70f2 Mon Sep 17 00:00:00 2001 From: Martin Lucina Date: Mon, 15 Feb 2010 23:59:35 +0100 Subject: Correct path for pgm distclean --- Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 86c2d7a..51f6128 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,6 +14,6 @@ $(top_srcdir)/foreign/xmlParser/xmlParser.hpp dist-hook: -rm -rf $(distdir)/foreign/openpgm/@pgm_basename@ -distclean-local: - -rm -rf $(distdir)/foreign/openpgm/@pgm_basename@ +clean-local: + -rm -rf $(top_srcdir)/foreign/openpgm/@pgm_basename@ -- cgit v1.2.3 From afb526f31a82b8697b5f7e73e50b14705a3a74b2 Mon Sep 17 00:00:00 2001 From: Martin Lucina Date: Tue, 16 Feb 2010 00:11:38 +0100 Subject: Fix 'make dist' to work with no special magic --- bindings/java/Makefile.am | 13 +++++++------ perf/c/Makefile.am | 4 ++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/bindings/java/Makefile.am b/bindings/java/Makefile.am index 1ce32ac..e3d678f 100644 --- a/bindings/java/Makefile.am +++ b/bindings/java/Makefile.am @@ -17,19 +17,20 @@ dist_noinst_JAVA = \ lib_LTLIBRARIES = libjzmq.la libjzmq_la_SOURCES = \ Context.cpp \ - org_zmq_Context.h \ - Socket.cpp \ - org_zmq_Socket.h + Socket.cpp +nodist_libjzmq_la_SOURCES = \ + org_zmq_Context.h \ + org_zmq_Socket.h libjzmq_la_CXXFLAGS = @JAVA_INCLUDE@ -I$(top_srcdir)/bindings/c -Wall libjzmq_la_LDFLAGS = -version-info @JLTVER@ libjzmq_la_LIBADD = $(top_builddir)/src/libzmq.la BUILT_SOURCES = \ - org/zmq/Context.class \ - org_zmq_Context.h \ + org/zmq/Context.class \ + org_zmq_Context.h \ org/zmq/Socket.class \ - org_zmq_Socket.h + org_zmq_Socket.h CLEANFILES = \ org/zmq/Context.class \ diff --git a/perf/c/Makefile.am b/perf/c/Makefile.am index ec39630..c6d8d8a 100644 --- a/perf/c/Makefile.am +++ b/perf/c/Makefile.am @@ -64,7 +64,7 @@ pgmexamples_diff_flags = \ -DG_LOG_DOMAIN='"Pgm"' endif -pgmsend_SOURCES = ../../foreign/openpgm/@pgm_basename@/openpgm/pgm/examples/pgmsend.c +nodist_pgmsend_SOURCES = ../../foreign/openpgm/@pgm_basename@/openpgm/pgm/examples/pgmsend.c pgmsend_LDADD = $(top_builddir)/src/libzmq.la pgmsend_CFLAGS = -I$(top_srcdir)/foreign/openpgm/@pgm_basename@/openpgm/pgm/include/ -Wall @LIBZMQ_EXTRA_CXXFLAGS@ \ -pipe \ @@ -95,7 +95,7 @@ pgmsend_CFLAGS = -I$(top_srcdir)/foreign/openpgm/@pgm_basename@/openpgm/pgm/incl -D_GNU_SOURCE \ ${pgmexamples_diff_flags} -pgmrecv_SOURCES = ../../foreign/openpgm/@pgm_basename@/openpgm/pgm/examples/pgmrecv.c +nodist_pgmrecv_SOURCES = ../../foreign/openpgm/@pgm_basename@/openpgm/pgm/examples/pgmrecv.c pgmrecv_LDADD = $(top_builddir)/src/libzmq.la pgmrecv_CFLAGS = -I$(top_srcdir)/foreign/openpgm/@pgm_basename@/openpgm/pgm/include/ -Wall @LIBZMQ_EXTRA_CXXFLAGS@ \ -pipe \ -- cgit v1.2.3 From a2f9899f6a1fad3f9c73fc7599445bdde0b95ec4 Mon Sep 17 00:00:00 2001 From: Martin Sustrik Date: Tue, 16 Feb 2010 17:50:36 +0100 Subject: missing COPYING file added --- .gitignore | 1 - COPYING | 674 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ doc/zmq_poll.txt | 3 +- 3 files changed, 676 insertions(+), 2 deletions(-) create mode 100644 COPYING diff --git a/.gitignore b/.gitignore index c391b4e..9a09d34 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -COPYING INSTALL Makefile Makefile.in diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..b6f3fd5 --- /dev/null +++ b/COPYING @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/doc/zmq_poll.txt b/doc/zmq_poll.txt index 8e386bc..9969d0f 100644 --- a/doc/zmq_poll.txt +++ b/doc/zmq_poll.txt @@ -49,7 +49,8 @@ infinite timeout. RETURN VALUE ------------ -Function returns number of items signaled or -1 in the case of error. +Function returns number of items signaled, 0 in the case of timeout or -1 +in the case of error. ERRORS -- cgit v1.2.3