Remove local pgm configuration option, cleanup configure.ac, remove unused Makefile.am instances.

Makefile.am

 ACLOCAL_AMFLAGS = -I config
 
-AM_CPPFLAGS = \
-	-I$(top_builddir)/include \
-	-I$(top_srcdir)/include
-
 SUBDIRS = doc
 
-if BUILD_PGM
-SUBDIRS += foreign/openpgm
-endif
-
-DIST_SUBDIRS = builds/msvc doc foreign/openpgm
+DIST_SUBDIRS = builds/msvc doc
 
 pkgconfig_DATA = src/libzmq.pc
 
+AM_CPPFLAGS = \
+	-I$(top_builddir)/include \
+	-I$(top_srcdir)/include
+
+#
+# libraries/binaries
+#
 lib_LTLIBRARIES = libzmq.la
 
 include_HEADERS = \
@@ -231,9 +230,9 @@ endif
 
 libzmq_la_CXXFLAGS = @LIBZMQ_EXTRA_CXXFLAGS@
 
-if BUILD_PGM
-libzmq_la_CPPFLAGS = -I$(top_srcdir)/@pgm_srcdir@/include/
-libzmq_la_LIBADD = $(top_srcdir)/@pgm_srcdir@/libpgm_noinst.la
+if HAVE_PGM
+libzmq_la_CPPFLAGS = ${pgm_CFLAGS}
+libzmq_la_LIBADD = ${pgm_LIBS}
 endif
 
 noinst_PROGRAMS = \
@@ -262,13 +261,14 @@ inproc_lat_SOURCES = perf/inproc_lat.cpp
 inproc_thr_LDADD = libzmq.la
 inproc_thr_SOURCES = perf/inproc_thr.cpp
 
-
-
 bin_PROGRAMS = curve_keygen
 
 curve_keygen_LDADD = libzmq.la
 curve_keygen_SOURCES = tools/curve_keygen.cpp
 
+#
+# tests
+#
 test_apps = \
 	test_system \
 	test_pair_inproc \
@@ -583,7 +583,6 @@ EXTRA_DIST = \
 	autogen.sh	\
 	version.sh	\
 	MAINTAINERS	\
-	foreign/openpgm/@pgm_basename@.tar.gz \
 	src/libzmq.pc.cmake.in \
 	src/libzmq.vers \
 	tools/curve_keygen.cpp
@@ -609,10 +608,6 @@ dist-hook:
 		echo A git clone is required to generate a ChangeLog >&2; \
 	fi
 	-cp $(top_srcdir)/builds/redhat/zeromq.spec $(distdir)/zeromq.spec
-	-rm -rf $(distdir)/foreign/openpgm/build-staging
-
-distclean-local:
-	-rm -rf $(top_srcdir)/foreign/openpgm/build-staging
 
 maintainer-clean-local:
 	-rm -rf $(top_srcdir)/config

doc/Makefile.am

+#
+# documentation
+#
 MAN3 = zmq_bind.3 zmq_unbind.3 zmq_connect.3 zmq_disconnect.3 zmq_close.3 \
     zmq_ctx_new.3 zmq_ctx_term.3 zmq_ctx_get.3 zmq_ctx_set.3 zmq_ctx_shutdown.3 \
     zmq_msg_init.3 zmq_msg_init_data.3 zmq_msg_init_size.3 \
@@ -21,20 +24,17 @@ MAN_TXT = $(MAN3:%.3=%.txt)
 MAN_TXT += $(MAN7:%.7=%.txt)
 MAN_HTML = $(MAN_TXT:%.txt=%.html)
 
-if INSTALL_MAN
-dist_man_MANS = $(MAN_DOC)
-endif
+MAINTAINERCLEANFILES = $(MAN_DOC) $(MAN_HTML)
 
 EXTRA_DIST = asciidoc.conf $(MAN_TXT)
+
 if BUILD_DOC
 EXTRA_DIST += $(MAN_HTML)
-endif
-
-MAINTAINERCLEANFILES = $(MAN_DOC) $(MAN_HTML)
 
-dist-hook : $(MAN_DOC) $(MAN_HTML)
+if INSTALL_MAN
+dist_man_MANS = $(MAN_DOC)
+endif
 
-if BUILD_DOC
 SUFFIXES=.html .txt .xml .3 .7
 
 .txt.html:
@@ -52,3 +52,5 @@ SUFFIXES=.html .txt .xml .3 .7
 zmq_epgm.7: zmq_pgm.7
 	cp $< $@
 endif
+
+dist-hook : $(MAN_DOC) $(MAN_HTML)

foreign/openpgm/Makefile.am

-SUBDIRS = $(pgm_subdir)
-DIST_SUBDIRS =
-# Override Automake's installation targets with the command ":" that does nothing.
-install:; @:
-install-exec:; @:
-install-data:; @:
-uninstall:; @:
-dist:; @;

perf/Makefile.am

-AM_CPPFLAGS = -I$(top_builddir)/include \
-              -I$(top_srcdir)/include
-
-noinst_PROGRAMS = local_lat remote_lat local_thr remote_thr inproc_lat inproc_thr
-
-local_lat_LDADD = $(top_builddir)/src/libzmq.la
-local_lat_SOURCES = local_lat.cpp
-
-remote_lat_LDADD = $(top_builddir)/src/libzmq.la
-remote_lat_SOURCES = remote_lat.cpp
-
-local_thr_LDADD = $(top_builddir)/src/libzmq.la
-local_thr_SOURCES = local_thr.cpp
-
-remote_thr_LDADD = $(top_builddir)/src/libzmq.la
-remote_thr_SOURCES = remote_thr.cpp
-
-inproc_lat_LDADD = $(top_builddir)/src/libzmq.la
-inproc_lat_SOURCES = inproc_lat.cpp
-
-inproc_thr_LDADD = $(top_builddir)/src/libzmq.la
-inproc_thr_SOURCES = inproc_thr.cpp

src/Makefile.am

-lib_LTLIBRARIES = libzmq.la
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libzmq.pc
-
-include_HEADERS = ../include/zmq.h ../include/zmq_utils.h
-
-libzmq_la_SOURCES = \
-    address.hpp \
-    array.hpp \
-    atomic_counter.hpp \
-    atomic_ptr.hpp \
-    blob.hpp \
-    clock.hpp \
-    command.hpp \
-    config.hpp \
-    ctx.hpp \
-    curve_client.hpp \
-    curve_server.hpp \
-    decoder.hpp \
-    devpoll.hpp \
-    dist.hpp \
-    encoder.hpp \
-    epoll.hpp \
-    err.hpp \
-    fd.hpp \
-    fq.hpp \
-    gssapi_mechanism_base.hpp \
-    gssapi_client.hpp \
-    gssapi_server.hpp \
-    i_encoder.hpp \
-    i_decoder.hpp \
-    i_engine.hpp \
-    i_poll_events.hpp \
-    io_object.hpp \
-    io_thread.hpp \
-    ip.hpp \
-    ipc_address.hpp \
-    ipc_connecter.hpp \
-    ipc_listener.hpp \
-    i_engine.hpp \
-    i_poll_events.hpp \
-    kqueue.hpp \
-    lb.hpp \
-    likely.hpp \
-    mailbox.hpp \
-    mechanism.hpp  \
-    metadata.hpp \
-    msg.hpp \
-    mtrie.hpp \
-    mutex.hpp \
-    norm_engine.hpp \
-    null_mechanism.hpp \
-    object.hpp \
-    options.hpp \
-    own.hpp \
-    pgm_receiver.hpp \
-    pgm_sender.hpp \
-    pgm_socket.hpp \
-    pipe.hpp \
-    plain_client.hpp \
-    plain_server.hpp \
-    platform.hpp \
-    poll.hpp \
-    poller.hpp \
-    poller_base.hpp \
-    pair.hpp \
-    proxy.hpp \
-    pub.hpp \
-    pull.hpp \
-    push.hpp \
-    random.hpp \
-    reaper.hpp \
-    rep.hpp \
-    req.hpp \
-    select.hpp \
-    session_base.hpp \
-    signaler.hpp \
-    socket_base.hpp \
-    socks.hpp \
-    socks_connecter.hpp \
-    stdint.hpp \
-    stream.hpp \
-    stream_engine.hpp \
-    sub.hpp \
-    tcp.hpp \
-    tcp_address.hpp \
-    tcp_connecter.hpp \
-    tcp_listener.hpp \
-    thread.hpp \
-    trie.hpp \
-    windows.hpp \
-    wire.hpp \
-    xpub.hpp \
-    router.hpp \
-    dealer.hpp \
-    xsub.hpp \
-    ypipe.hpp \
-    ypipe_base.hpp \
-    yqueue.hpp \
-    address.cpp \
-    clock.cpp \
-    ctx.cpp \
-    curve_client.cpp \
-    curve_server.cpp \
-    devpoll.cpp \
-    dist.cpp \
-    epoll.cpp \
-    err.cpp \
-    fq.cpp \
-    gssapi_mechanism_base.cpp \
-    gssapi_client.cpp \
-    gssapi_server.cpp \
-    io_object.cpp \
-    io_thread.cpp \
-    ip.cpp \
-    ipc_address.cpp \
-    ipc_connecter.cpp \
-    ipc_listener.cpp \
-    kqueue.cpp \
-    lb.cpp \
-    mailbox.cpp \
-    mechanism.cpp \
-    metadata.cpp \
-    msg.cpp \
-    mtrie.cpp \
-    norm_engine.cpp \
-    null_mechanism.cpp \
-    object.cpp \
-    options.cpp \
-    own.cpp \
-    pair.cpp \
-    pgm_receiver.cpp \
-    pgm_sender.cpp \
-    pgm_socket.cpp \
-    pipe.cpp \
-    plain_client.cpp \
-    plain_server.cpp \
-    poll.cpp \
-    poller_base.cpp \
-    pull.cpp \
-    push.cpp \
-    proxy.cpp \
-    reaper.cpp \
-    pub.cpp \
-    random.cpp \
-    rep.cpp \
-    req.cpp \
-    select.cpp \
-    session_base.cpp \
-    signaler.cpp \
-    socket_base.cpp \
-    socks.cpp \
-    socks_connecter.cpp \
-    stream.cpp \
-    stream_engine.cpp \
-    sub.cpp \
-    tcp.cpp \
-    tcp_address.cpp \
-    tcp_connecter.cpp \
-    tcp_listener.cpp \
-    thread.cpp \
-    trie.cpp \
-    xpub.cpp \
-    router.cpp \
-    dealer.cpp \
-    v1_decoder.cpp \
-    v1_encoder.cpp \
-    v1_decoder.hpp \
-    v1_encoder.hpp \
-    v2_decoder.cpp \
-    v2_decoder.hpp \
-    v2_encoder.cpp \
-    v2_encoder.hpp \
-    v2_protocol.hpp \
-    xsub.cpp \
-    zmq.cpp \
-    zmq_utils.cpp \
-    raw_decoder.hpp \
-    raw_decoder.cpp \
-    raw_encoder.hpp \
-    raw_encoder.cpp \
-    ypipe_conflate.hpp \
-    dbuffer.hpp \
-    tipc_address.cpp \
-    tipc_address.hpp \
-    tipc_listener.cpp \
-    tipc_listener.hpp \
-    tipc_connecter.cpp \
-    tipc_connecter.hpp
-
-
-if ON_MINGW
-libzmq_la_LDFLAGS = -no-undefined -avoid-version -version-info @LTVER@ @LIBZMQ_EXTRA_LDFLAGS@
-else
-if ON_ANDROID
-libzmq_la_LDFLAGS = -avoid-version -version-info @LTVER@ @LIBZMQ_EXTRA_LDFLAGS@
-else
-if ON_LINUX
-libzmq_la_LDFLAGS = -version-info @LTVER@ @LIBZMQ_EXTRA_LDFLAGS@ -Wl,--version-script=$(srcdir)/libzmq.vers
-else
-libzmq_la_LDFLAGS = -version-info @LTVER@ @LIBZMQ_EXTRA_LDFLAGS@ -Wl
-endif
-endif
-endif
-
-libzmq_la_CXXFLAGS = @LIBZMQ_EXTRA_CXXFLAGS@
-
-if BUILD_PGM
-libzmq_la_CPPFLAGS = -I$(top_srcdir)/@pgm_srcdir@/include/
-libzmq_la_LIBADD = $(top_srcdir)/@pgm_srcdir@/libpgm_noinst.la
-endif
-
-dist-hook:
-		-rm $(distdir)/platform.hpp
-
-EXTRA_DIST = \
-	libzmq.pc.cmake.in \
-	libzmq.vers

tests/Makefile.am

-AM_CPPFLAGS = -I$(top_builddir)/include \
-              -I$(top_srcdir)/include
-
-LDADD = $(top_builddir)/src/libzmq.la
-
-noinst_PROGRAMS = test_system \
-                  test_pair_inproc \
-                  test_pair_tcp \
-                  test_reqrep_inproc \
-                  test_reqrep_tcp \
-                  test_hwm \
-                  test_hwm_pubsub \
-                  test_reqrep_device \
-                  test_sub_forward \
-                  test_invalid_rep \
-                  test_msg_flags \
-                  test_connect_resolve \
-                  test_immediate \
-                  test_last_endpoint \
-                  test_term_endpoint \
-                  test_srcfd \
-                  test_monitor \
-                  test_router_mandatory \
-                  test_router_mandatory_hwm \
-                  test_router_handover \
-                  test_probe_router \
-                  test_stream \
-                  test_stream_empty \
-                  test_stream_disconnect \
-                  test_stream_timeout \
-                  test_disconnect_inproc \
-                  test_ctx_options \
-                  test_ctx_destroy \
-                  test_security_null \
-                  test_security_plain \
-                  test_security_curve \
-                  test_iov \
-                  test_spec_req \
-                  test_spec_rep \
-                  test_spec_dealer \
-                  test_spec_router \
-                  test_spec_pushpull \
-                  test_req_correlate \
-                  test_req_relaxed \
-                  test_conflate \
-                  test_inproc_connect \
-                  test_issue_566 \
-                  test_proxy \
-                  test_many_sockets \
-                  test_ipc_wildcard \
-                  test_diffserv \
-                  test_connect_rid \
-                  test_bind_src_address \
-                  test_metadata \
-                  test_id2fd \
-                  test_capabilities \
-                  test_xpub_nodrop
-
-if !ON_MINGW
-noinst_PROGRAMS += test_shutdown_stress \
-                   test_pair_ipc \
-                   test_reqrep_ipc \
-                   test_timeo \
-                   test_filter_ipc
-if HAVE_FORK
-noinst_PROGRAMS += test_fork
-endif
-endif
-
-if BUILD_TIPC
-noinst_PROGRAMS += test_connect_delay_tipc \
-                  test_pair_tipc \
-                  test_reqrep_device_tipc \
-                  test_reqrep_tipc \
-                  test_router_mandatory_tipc \
-                  test_shutdown_stress_tipc \
-                  test_sub_forward_tipc \
-                  test_term_endpoint_tipc
-endif
-
-if ON_LINUX
-noinst_PROGRAMS += test_abstract_ipc
-endif
-
-test_system_SOURCES = test_system.cpp
-test_pair_inproc_SOURCES = test_pair_inproc.cpp testutil.hpp
-test_pair_tcp_SOURCES = test_pair_tcp.cpp testutil.hpp
-test_reqrep_inproc_SOURCES = test_reqrep_inproc.cpp testutil.hpp
-test_reqrep_tcp_SOURCES = test_reqrep_tcp.cpp testutil.hpp
-test_hwm_SOURCES = test_hwm.cpp
-test_hwm_pubsub_SOURCES = test_hwm_pubsub.cpp
-test_reqrep_device_SOURCES = test_reqrep_device.cpp
-test_sub_forward_SOURCES = test_sub_forward.cpp
-test_invalid_rep_SOURCES = test_invalid_rep.cpp
-test_msg_flags_SOURCES = test_msg_flags.cpp
-test_connect_resolve_SOURCES = test_connect_resolve.cpp
-test_immediate_SOURCES = test_immediate.cpp
-test_last_endpoint_SOURCES = test_last_endpoint.cpp
-test_term_endpoint_SOURCES = test_term_endpoint.cpp
-test_srcfd_SOURCES = test_srcfd.cpp
-test_monitor_SOURCES = test_monitor.cpp
-test_router_mandatory_SOURCES = test_router_mandatory.cpp
-test_router_mandatory_hwm_SOURCES = test_router_mandatory_hwm.cpp
-test_router_handover_SOURCES = test_router_handover.cpp
-test_probe_router_SOURCES = test_probe_router.cpp
-test_stream_SOURCES = test_stream.cpp
-test_stream_empty_SOURCES = test_stream_empty.cpp
-test_stream_timeout_SOURCES = test_stream_timeout.cpp
-test_stream_disconnect_SOURCES = test_stream_disconnect.cpp
-test_disconnect_inproc_SOURCES = test_disconnect_inproc.cpp
-test_ctx_options_SOURCES = test_ctx_options.cpp
-test_iov_SOURCES = test_iov.cpp
-test_ctx_destroy_SOURCES = test_ctx_destroy.cpp
-test_security_null_SOURCES = test_security_null.cpp
-test_security_plain_SOURCES = test_security_plain.cpp
-test_security_curve_SOURCES = test_security_curve.cpp
-test_spec_req_SOURCES = test_spec_req.cpp
-test_spec_rep_SOURCES = test_spec_rep.cpp
-test_spec_dealer_SOURCES = test_spec_dealer.cpp
-test_spec_router_SOURCES = test_spec_router.cpp
-test_spec_pushpull_SOURCES = test_spec_pushpull.cpp
-test_req_correlate_SOURCES = test_req_correlate.cpp
-test_req_relaxed_SOURCES = test_req_relaxed.cpp
-test_conflate_SOURCES = test_conflate.cpp
-test_inproc_connect_SOURCES = test_inproc_connect.cpp
-test_issue_566_SOURCES = test_issue_566.cpp
-test_proxy_SOURCES = test_proxy.cpp
-test_abstract_ipc_SOURCES = test_abstract_ipc.cpp
-test_many_sockets_SOURCES = test_many_sockets.cpp
-test_ipc_wildcard_SOURCES = test_ipc_wildcard.cpp
-test_diffserv_SOURCES = test_diffserv.cpp
-test_connect_rid_SOURCES = test_connect_rid.cpp
-test_bind_src_address_SOURCES = test_bind_src_address.cpp
-test_metadata_SOURCES = test_metadata.cpp
-test_id2fd_SOURCES = test_id2fd.cpp
-test_capabilities_SOURCES = test_capabilities.cpp
-test_xpub_nodrop_SOURCES = test_xpub_nodrop.cpp
-if !ON_MINGW
-test_shutdown_stress_SOURCES = test_shutdown_stress.cpp
-test_pair_ipc_SOURCES = test_pair_ipc.cpp testutil.hpp
-test_reqrep_ipc_SOURCES = test_reqrep_ipc.cpp testutil.hpp
-test_timeo_SOURCES = test_timeo.cpp
-if HAVE_FORK
-test_fork_SOURCES = test_fork.cpp
-endif
-test_filter_ipc_SOURCES = test_filter_ipc.cpp
-endif
-if BUILD_TIPC
-test_connect_delay_tipc_SOURCES = test_connect_delay_tipc.cpp
-test_pair_tipc_SOURCES = test_pair_tipc.cpp
-test_reqrep_device_tipc_SOURCES = test_reqrep_device_tipc.cpp
-test_reqrep_tipc_SOURCES = test_reqrep_tipc.cpp
-test_router_mandatory_tipc_SOURCES = test_router_mandatory_tipc.cpp
-test_shutdown_stress_tipc_SOURCES = test_shutdown_stress_tipc.cpp
-test_sub_forward_tipc_SOURCES = test_sub_forward_tipc.cpp
-test_term_endpoint_tipc_SOURCES = test_term_endpoint_tipc.cpp
-endif
-
-#  Run the test cases
-TESTS = $(noinst_PROGRAMS)
-XFAIL_TESTS =
-
-if !ON_LINUX
-XFAIL_TESTS += test_abstract_ipc
-endif

tools/Makefile.am

-EXTRA_DIST = curve_keygen.cpp
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-
-bin_PROGRAMS = curve_keygen
-
-curve_keygen_LDADD = $(top_builddir)/src/libzmq.la
-curve_keygen_SOURCES = curve_keygen.cpp
-