From 4dd6257d9316b44134b4ef4070249531d1a83e77 Mon Sep 17 00:00:00 2001
From: Pieter Hintjens <ph@imatix.com>
Date: Mon, 10 Aug 2015 12:25:19 +0200
Subject: [PATCH 1/3] Problem: source packages lack makefiles for all systems
 except msvc

Solution: specify the necessary EXTRA_DIST

I added a Makefile.am in builds that covers all systems except msvc,
which already has a Makefile.am that does this.

Fixes #1505
---
 Makefile.am        |  2 +-
 builds/Makefile.am | 26 ++++++++++++++++++++++++++
 configure.ac       |  1 +
 3 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 builds/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index bdbc0435..1599d57d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -I config
 
 SUBDIRS = doc
 
-DIST_SUBDIRS = builds/msvc doc
+DIST_SUBDIRS = doc builds builds/msvc
 
 pkgconfig_DATA = src/libzmq.pc
 
diff --git a/builds/Makefile.am b/builds/Makefile.am
new file mode 100644
index 00000000..42f01f33
--- /dev/null
+++ b/builds/Makefile.am
@@ -0,0 +1,26 @@
+#  Specify all build files that have to go into source packages.
+#  msvc directory does its own stuff.
+
+EXTRA_DIST = \
+	zos/makelibzmq \
+	zos/cxxall \
+	zos/README.md \
+	zos/makeclean \
+	zos/platform.hpp \
+	zos/zc++ \
+	zos/test_fork.cpp \
+	zos/maketests \
+	zos/runtests \
+	mingw32/Makefile.mingw32 \
+	mingw32/platform.hpp \
+	cmake/Modules \
+	cmake/Modules/FindAsciiDoc.cmake \
+	cmake/Modules/TestZMQVersion.cmake \
+	cmake/Modules/ZMQSourceRunChecks.cmake \
+	cmake/NSIS.template32.in \
+	cmake/platform.hpp.in \
+	cmake/NSIS.template64.in \
+	valgrind/valgrind.supp \
+	valgrind/vg \
+	nuget/readme.nuget \
+	nuget/libzmq.autopkg
diff --git a/configure.ac b/configure.ac
index 42cf00b4..af8293cd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -560,6 +560,7 @@ AC_CONFIG_FILES([ \
     Makefile \
     src/libzmq.pc \
     doc/Makefile \
+    builds/Makefile \
     builds/msvc/Makefile \
     builds/redhat/zeromq.spec])
 

From c369d9bd36a4d6ac416f53095fb7ad77cd10b27a 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/3] 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 d73e5b2c..321c3fb0 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -18,22 +18,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
 
-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 6bbc6b67f651eb10a9baaa246f63ae32e8bfb1c3 Mon Sep 17 00:00:00 2001
From: Luca Boccassi <luca.boccassi@gmail.com>
Date: Wed, 4 May 2016 11:26:43 +0100
Subject: [PATCH 3/3] Update NEWS for fix #1952

---
 NEWS | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/NEWS b/NEWS
index aa4ca0cd..4155236e 100644
--- a/NEWS
+++ b/NEWS
@@ -25,6 +25,8 @@
 
 * Fixed #114 - cannot unbind with same endpoint with IPv6 enabled.
 
+* Fixed #1952 - CMake scripts not part of release tarballs
+
 
 0MQ version 4.1.4 stable, released on 2015/12/18
 ================================================