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

35 files changed, 34 insertions, 80 deletions

diff --git a/configure.in b/configure.in
index afee13d..f630398 100644
--- a/configure.in
+++ b/configure.in
@@ -286,24 +286,6 @@ if test "x$HAVE_INTTYPES_H" = "xyes"; then
     inttypes="1"
 fi
 
-# c 
-czmq="no"
-AC_ARG_WITH([c], [AS_HELP_STRING([--with-c], 
-    [build c language binding [default=no]])], [c=yes], [c=no])
-
-if test "x$c" != "xno"; then
-    czmq="yes" 
-fi
-
-# c++
-cppzmq="no"
-AC_ARG_WITH([cpp], [AS_HELP_STRING([--with-cpp], 
-    [build c++ language binding [default=no]])], [cpp=yes], [cpp=no])
-
-if test "x$cpp" != "xno"; then
-    cppzmq="yes" 
-fi
-    
 #  PGM extension
 pgm_ext="no"
 
@@ -323,10 +305,6 @@ 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_pgm_examples" = "xyes"; then
-    AC_MSG_ERROR([cannot configure --with-pgm-examples without --with-c.]);
-fi
-
 if test "x$with_pgm_ext" != "xno"; then
 
     AC_MSG_CHECKING([if the PGM extension is supported on this platform])
@@ -430,18 +408,12 @@ AC_ARG_WITH([perf], [AS_HELP_STRING([--with-perf],
 
 if test "x$with_perf" != "xno"; then
     perf="yes"
-
-    if test "x$czmq" = "xno" -a "x$cppzmq" = "xno"; then
-        AC_MSG_ERROR([the --with-perf option requires at least one language binding.]);
-    fi
 fi
 
 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
 
-AM_CONDITIONAL(BUILD_C, test "x$czmq" = "xyes")
-AM_CONDITIONAL(BUILD_CPP, test "x$cppzmq" = "xyes")
 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")
@@ -493,8 +465,8 @@ AC_MSG_RESULT([ ******************************************************** ])
 AC_MSG_RESULT([])
 AC_MSG_RESULT([ 0MQ install dir: $prefix])
 AC_MSG_RESULT([   Language bindings:])
-AC_MSG_RESULT([     C: $czmq])
-AC_MSG_RESULT([     C++: $cppzmq])
+AC_MSG_RESULT([     C: yes])
+AC_MSG_RESULT([     C++: yes])
 AC_MSG_RESULT([   Transports:])
 AC_MSG_RESULT([     tcp: yes])
 AC_MSG_RESULT([     pgm (epgm): $pgm_ext])
diff --git a/bindings/c/zmq.h b/include/zmq.h
index 7d8d8ad..7d8d8ad 100644
--- a/bindings/c/zmq.h
+++ b/include/zmq.h
diff --git a/bindings/cpp/zmq.hpp b/include/zmq.hpp
index 3ddc043..3ddc043 100644
--- a/bindings/cpp/zmq.hpp
+++ b/include/zmq.hpp
diff --git a/perf/Makefile.am b/perf/Makefile.am
index 87c4833..7e87d68 100644
--- a/perf/Makefile.am
+++ b/perf/Makefile.am
@@ -1,10 +1,2 @@
-if BUILD_C
-PERF_DIR_C = c
-endif
-
-if BUILD_CPP
-PERF_DIR_CPP = cpp
-endif
-
-SUBDIRS = $(PERF_DIR_C) $(PERF_DIR_CPP)
+SUBDIRS = c cpp
 DIST_SUBDIRS = c cpp
diff --git a/perf/c/Makefile.am b/perf/c/Makefile.am
index c6d8d8a..d48dcee 100644
--- a/perf/c/Makefile.am
+++ b/perf/c/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_builddir)/bindings/c
+INCLUDES = -I$(top_builddir)/include
 
 if BUILD_PGM_EXAMPLES
 PGM_EXAMPLES_BINS = pgmsend pgmrecv
diff --git a/perf/cpp/Makefile.am b/perf/cpp/Makefile.am
index 65ffe68..37b970c 100644
--- a/perf/cpp/Makefile.am
+++ b/perf/cpp/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/bindings/cpp -I$(top_srcdir)/bindings/c
+INCLUDES = -I$(top_srcdir)/include
 
 noinst_PROGRAMS = local_lat remote_lat local_thr remote_thr
 
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"