From 2d9e7b57f978b1b20a4be76abc22d7cfbd778851 Mon Sep 17 00:00:00 2001
From: Luca Boccassi <luca.boccassi@gmail.com>
Date: Mon, 22 Feb 2016 13:44:46 +0000
Subject: [PATCH 1/4] Problem: make dist does not tar up macros.hpp

Solution: add it to Makefile.am file list
---
 Makefile.am | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile.am b/Makefile.am
index 4bd07831..c4b86bef 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -85,6 +85,7 @@ src_libzmq_la_SOURCES = \
 	src/lb.cpp \
 	src/lb.hpp \
 	src/likely.hpp \
+	src/macros.hpp \
 	src/mailbox.cpp \
 	src/mailbox.hpp \
 	src/mailbox_safe.cpp \

From 4366d7edf9f2ab88fdb59ec0668dd6c13cbc483f Mon Sep 17 00:00:00 2001
From: Luca Boccassi <luca.boccassi@gmail.com>
Date: Sun, 6 Mar 2016 18:32:30 +0000
Subject: [PATCH 2/4] Problem: doc/Makefile.am ignores --without-docs

Solution: add the document files to the MAN_DOC and MAN_HTML targets
in doc/Makefile.am only if BUILD_DOC and INSTALL_MAN are set,
otherwise leave the targets empty to avoid errors in make distcheck.
---
 doc/Makefile.am | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 20340fcb..5c32954e 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -23,22 +23,26 @@ MAN3 = zmq_bind.3 zmq_unbind.3 zmq_connect.3 zmq_disconnect.3 zmq_close.3 \
 MAN7 = zmq.7 zmq_tcp.7 zmq_pgm.7 zmq_inproc.7 zmq_ipc.7 \
     zmq_null.7 zmq_plain.7 zmq_curve.7 zmq_tipc.7 zmq_vmci.7
 
-MAN_DOC = $(MAN1) $(MAN3) $(MAN7)
+MAN_DOC =
 
 MAN_TXT = $(MAN3:%.3=%.txt)
 MAN_TXT += $(MAN7:%.7=%.txt)
-MAN_HTML = $(MAN_TXT:%.txt=%.html)
+MAN_HTML =
 
-MAINTAINERCLEANFILES = $(MAN_DOC) $(MAN_HTML)
+MAINTAINERCLEANFILES =
 
 EXTRA_DIST = asciidoc.conf $(MAN_TXT)
 
 if INSTALL_MAN
+MAN_DOC += $(MAN1) $(MAN3) $(MAN7)
 dist_man_MANS = $(MAN_DOC)
+MAINTAINERCLEANFILES += $(MAN_DOC)
 endif
 
 if BUILD_DOC
+MAN_HTML += $(MAN_TXT:%.txt=%.html)
 EXTRA_DIST += $(MAN_HTML)
+MAINTAINERCLEANFILES += $(MAN_HTML)
 
 SUFFIXES=.html .txt .xml .3 .7
 

From ff1ebf6ff00abcdae1894499a574146fc84de0e1 Mon Sep 17 00:00:00 2001
From: Luca Boccassi <luca.boccassi@gmail.com>
Date: Sun, 6 Mar 2016 18:04:12 +0000
Subject: [PATCH 3/4] Problem: ci_build.sh make check is overly complex

Solution: simply run make VERBOSE=1 check instead of manually
checking for return value and cat'ing the log file. With VERBOSE, on
error the log file will be automatically printed.
---
 ci_build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci_build.sh b/ci_build.sh
index 2e55d2e1..acab6bce 100755
--- a/ci_build.sh
+++ b/ci_build.sh
@@ -28,7 +28,7 @@ if [ $BUILD_TYPE == "default" ]; then
         ./autogen.sh &&
         ./configure "${CONFIG_OPTS[@]}" &&
         make &&
-        ( if make check; then true; else cat test-suite.log; exit 1; fi ) &&
+        make VERBOSE=1 check &&
         make install
     ) || exit 1
 else

From 6024dd5dfa981e667bb150e9bcdcab58cdf0bcd0 Mon Sep 17 00:00:00 2001
From: Luca Boccassi <luca.boccassi@gmail.com>
Date: Sun, 6 Mar 2016 18:05:28 +0000
Subject: [PATCH 4/4] Problem: ci_build does not fully test build system

Solution: run make dist-check, which will run additional tests,
including making sure that the library is installable and the
distributable tarball is buildable, along with the usual make and
make check.
---
 ci_build.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/ci_build.sh b/ci_build.sh
index acab6bce..9e9f834a 100755
--- a/ci_build.sh
+++ b/ci_build.sh
@@ -27,9 +27,8 @@ if [ $BUILD_TYPE == "default" ]; then
     (
         ./autogen.sh &&
         ./configure "${CONFIG_OPTS[@]}" &&
-        make &&
-        make VERBOSE=1 check &&
-        make install
+        export DISTCHECK_CONFIGURE_FLAGS="${CONFIG_OPTS[@]}" &&
+        make VERBOSE=1 distcheck
     ) || exit 1
 else
     cd ./builds/${BUILD_TYPE} && ./ci_build.sh