Restructure language bindings

C and C++ headers moved from bindings/ to include/, bindings/ removed
--with-c and --with-cpp options to configure removed, C and C++ now built
and installed by default

29 files changed, 29 insertions, 39 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index eeb33d6..26106d8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,17 +3,7 @@ lib_LTLIBRARIES = libzmq.la
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libzmq.pc
 
-if BUILD_CPP
-include_HEADERS = ../bindings/cpp/zmq.hpp ../bindings/c/zmq.h
-endif
-
-if BUILD_C
-if BUILD_CPP
-
-else
-include_HEADERS = ../bindings/c/zmq.h
-endif
-endif
+include_HEADERS = ../include/zmq.h ../include/zmq.hpp
 
 if BUILD_PGM
 pgm_sources = ../foreign/openpgm/@pgm_basename@/openpgm/pgm/packet.c \
diff --git a/src/app_thread.cpp b/src/app_thread.cpp
index eff0cf7..61e49e5 100644
--- a/src/app_thread.cpp
+++ b/src/app_thread.cpp
@@ -20,7 +20,7 @@
 #include <new>
 #include <algorithm>
 
-#include "../bindings/c/zmq.h"
+#include "../include/zmq.h"
 
 #include "platform.hpp"
 
diff --git a/src/dispatcher.cpp b/src/dispatcher.cpp
index 4233278..a49b598 100644
--- a/src/dispatcher.cpp
+++ b/src/dispatcher.cpp
@@ -19,7 +19,7 @@
 
 #include <new>
 
-#include "../bindings/c/zmq.h"
+#include "../include/zmq.h"
 
 #include "dispatcher.hpp"
 #include "socket_base.hpp"
diff --git a/src/downstream.cpp b/src/downstream.cpp
index 3431264..7ff88f1 100644
--- a/src/downstream.cpp
+++ b/src/downstream.cpp
@@ -17,7 +17,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "../bindings/c/zmq.h"
+#include "../include/zmq.h"
 
 #include "downstream.hpp"
 #include "err.hpp"
diff --git a/src/err.cpp b/src/err.cpp
index 0ff6335..17a9689 100644
--- a/src/err.cpp
+++ b/src/err.cpp
@@ -17,7 +17,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "../bindings/c/zmq.h"
+#include "../include/zmq.h"
 
 #include "err.hpp"
 #include "platform.hpp"
diff --git a/src/fq.cpp b/src/fq.cpp
index 1836058..a7e93ce 100644
--- a/src/fq.cpp
+++ b/src/fq.cpp
@@ -17,7 +17,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "../bindings/c/zmq.h"
+#include "../include/zmq.h"
 
 #include "fq.hpp"
 #include "pipe.hpp"
diff --git a/src/i_inout.hpp b/src/i_inout.hpp
index c11137d..21d1838 100644
--- a/src/i_inout.hpp
+++ b/src/i_inout.hpp
@@ -20,7 +20,7 @@
 #ifndef __ZMQ_I_INOUT_HPP_INCLUDED__
 #define __ZMQ_I_INOUT_HPP_INCLUDED__
 
-#include "../bindings/c/zmq.h"
+#include "../include/zmq.h"
 
 #include "stdint.hpp"
 
diff --git a/src/io_thread.cpp b/src/io_thread.cpp
index 2e1237b..ff45478 100644
--- a/src/io_thread.cpp
+++ b/src/io_thread.cpp
@@ -19,7 +19,7 @@
 
 #include <new>
 
-#include "../bindings/c/zmq.h"
+#include "../include/zmq.h"
 
 #include "io_thread.hpp"
 #include "command.hpp"
diff --git a/src/lb.cpp b/src/lb.cpp
index e1628db..4743ac6 100644
--- a/src/lb.cpp
+++ b/src/lb.cpp
@@ -17,7 +17,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "../bindings/c/zmq.h"
+#include "../include/zmq.h"
 
 #include "lb.hpp"
 #include "pipe.hpp"
diff --git a/src/msg_content.hpp b/src/msg_content.hpp
index 3daf0e6..d409d45 100644
--- a/src/msg_content.hpp
+++ b/src/msg_content.hpp
@@ -22,7 +22,7 @@
 
 #include <stddef.h>
 
-#include "../bindings/c/zmq.h"
+#include "../include/zmq.h"
 
 #include "atomic_counter.hpp"
 
diff --git a/src/options.cpp b/src/options.cpp
index f78d8de..c0d5339 100644
--- a/src/options.cpp
+++ b/src/options.cpp
@@ -17,7 +17,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "../bindings/c/zmq.h"
+#include "../include/zmq.h"
 
 #include "options.hpp"
 #include "err.hpp"
diff --git a/src/p2p.cpp b/src/p2p.cpp
index ca7a8f5..334cfcc 100644
--- a/src/p2p.cpp
+++ b/src/p2p.cpp
@@ -17,7 +17,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "../bindings/c/zmq.h"
+#include "../include/zmq.h"
 
 #include "p2p.hpp"
 #include "err.hpp"
diff --git a/src/pipe.cpp b/src/pipe.cpp
index f4582f2..da019c1 100644
--- a/src/pipe.cpp
+++ b/src/pipe.cpp
@@ -17,7 +17,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "../bindings/c/zmq.h"
+#include "../include/zmq.h"
 
 #include "pipe.hpp"
 
diff --git a/src/pipe.hpp b/src/pipe.hpp
index 771081c..df3d0b1 100644
--- a/src/pipe.hpp
+++ b/src/pipe.hpp
@@ -20,7 +20,7 @@
 #ifndef __ZMQ_PIPE_HPP_INCLUDED__
 #define __ZMQ_PIPE_HPP_INCLUDED__
 
-#include "../bindings/c/zmq.h"
+#include "../include/zmq.h"
 
 #include "stdint.hpp"
 #include "i_endpoint.hpp"
diff --git a/src/pub.cpp b/src/pub.cpp
index 342b1d2..643e29e 100644
--- a/src/pub.cpp
+++ b/src/pub.cpp
@@ -17,7 +17,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "../bindings/c/zmq.h"
+#include "../include/zmq.h"
 
 #include "pub.hpp"
 #include "err.hpp"
diff --git a/src/rep.cpp b/src/rep.cpp
index 5e813df..4e69fa3 100644
--- a/src/rep.cpp
+++ b/src/rep.cpp
@@ -17,7 +17,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "../bindings/c/zmq.h"
+#include "../include/zmq.h"
 
 #include "rep.hpp"
 #include "err.hpp"
diff --git a/src/req.cpp b/src/req.cpp
index 833db9a..5c067b3 100644
--- a/src/req.cpp
+++ b/src/req.cpp
@@ -17,7 +17,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "../bindings/c/zmq.h"
+#include "../include/zmq.h"
 
 #include "req.hpp"
 #include "err.hpp"
diff --git a/src/socket_base.cpp b/src/socket_base.cpp
index f17a578..50b4152 100644
--- a/src/socket_base.cpp
+++ b/src/socket_base.cpp
@@ -21,7 +21,7 @@
 #include <string>
 #include <algorithm>
 
-#include "../bindings/c/zmq.h"
+#include "../include/zmq.h"
 
 #include "socket_base.hpp"
 #include "app_thread.hpp"
diff --git a/src/socket_base.hpp b/src/socket_base.hpp
index 5327acc..31c241b 100644
--- a/src/socket_base.hpp
+++ b/src/socket_base.hpp
@@ -24,7 +24,7 @@
 #include <map>
 #include <vector>
 
-#include "../bindings/c/zmq.h"
+#include "../include/zmq.h"
 
 #include "i_endpoint.hpp"
 #include "object.hpp"
diff --git a/src/sub.cpp b/src/sub.cpp
index 29ac951..fb00bfb 100644
--- a/src/sub.cpp
+++ b/src/sub.cpp
@@ -19,7 +19,7 @@
 
 #include <string.h>
 
-#include "../bindings/c/zmq.h"
+#include "../include/zmq.h"
 
 #include "sub.hpp"
 #include "err.hpp"
diff --git a/src/sub.hpp b/src/sub.hpp
index 8234b77..670aa79 100644
--- a/src/sub.hpp
+++ b/src/sub.hpp
@@ -20,7 +20,7 @@
 #ifndef __ZMQ_SUB_HPP_INCLUDED__
 #define __ZMQ_SUB_HPP_INCLUDED__
 
-#include "../bindings/c/zmq.h"
+#include "../include/zmq.h"
 
 #include "prefix_tree.hpp"
 #include "socket_base.hpp"
diff --git a/src/tcp_connecter.cpp b/src/tcp_connecter.cpp
index 06214e2..1286187 100644
--- a/src/tcp_connecter.cpp
+++ b/src/tcp_connecter.cpp
@@ -21,7 +21,7 @@
 
 #include <string>
 
-#include "../bindings/c/zmq.h"
+#include "../include/zmq.h"
 
 #include "tcp_connecter.hpp"
 #include "platform.hpp"
diff --git a/src/tcp_listener.cpp b/src/tcp_listener.cpp
index db12c7a..fdcdf17 100644
--- a/src/tcp_listener.cpp
+++ b/src/tcp_listener.cpp
@@ -19,7 +19,7 @@
 
 #include <string.h>
 
-#include "../bindings/c/zmq.h"
+#include "../include/zmq.h"
 
 #include "tcp_listener.hpp"
 #include "platform.hpp"
diff --git a/src/upstream.cpp b/src/upstream.cpp
index d7238b9..7ff1157 100644
--- a/src/upstream.cpp
+++ b/src/upstream.cpp
@@ -17,7 +17,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "../bindings/c/zmq.h"
+#include "../include/zmq.h"
 
 #include "upstream.hpp"
 #include "err.hpp"
diff --git a/src/xrep.cpp b/src/xrep.cpp
index 6fa6bfa..df74302 100644
--- a/src/xrep.cpp
+++ b/src/xrep.cpp
@@ -17,7 +17,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "../bindings/c/zmq.h"
+#include "../include/zmq.h"
 
 #include "xrep.hpp"
 #include "err.hpp"
diff --git a/src/xreq.cpp b/src/xreq.cpp
index dda924c..12c3dd6 100644
--- a/src/xreq.cpp
+++ b/src/xreq.cpp
@@ -17,7 +17,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "../bindings/c/zmq.h"
+#include "../include/zmq.h"
 
 #include "xreq.hpp"
 #include "err.hpp"
diff --git a/src/zmq.cpp b/src/zmq.cpp
index 8540e06..a9430d4 100644
--- a/src/zmq.cpp
+++ b/src/zmq.cpp
@@ -17,7 +17,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "../bindings/c/zmq.h"
+#include "../include/zmq.h"
 
 #include <string.h>
 #include <errno.h>
diff --git a/src/zmq_decoder.hpp b/src/zmq_decoder.hpp
index 5a9580a..2efed2a 100644
--- a/src/zmq_decoder.hpp
+++ b/src/zmq_decoder.hpp
@@ -20,7 +20,7 @@
 #ifndef __ZMQ_ZMQ_DECODER_HPP_INCLUDED__
 #define __ZMQ_ZMQ_DECODER_HPP_INCLUDED__
 
-#include "../bindings/c/zmq.h"
+#include "../include/zmq.h"
 
 #include "decoder.hpp"
 #include "blob.hpp"
diff --git a/src/zmq_encoder.hpp b/src/zmq_encoder.hpp
index 953012b..a3bc4ac 100644
--- a/src/zmq_encoder.hpp
+++ b/src/zmq_encoder.hpp
@@ -20,7 +20,7 @@
 #ifndef __ZMQ_ZMQ_ENCODER_HPP_INCLUDED__
 #define __ZMQ_ZMQ_ENCODER_HPP_INCLUDED__
 
-#include "../bindings/c/zmq.h"
+#include "../include/zmq.h"
 
 #include "encoder.hpp"