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

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])

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

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

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
 

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 \

src/app_thread.cpp

@@ -20,7 +20,7 @@
 #include <new>
 #include <algorithm>
 
-#include "../bindings/c/zmq.h"
+#include "../include/zmq.h"
 
 #include "platform.hpp"
 

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"

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"

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"

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"

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"
 

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"

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"

src/msg_content.hpp

@@ -22,7 +22,7 @@
 
 #include <stddef.h>
 
-#include "../bindings/c/zmq.h"
+#include "../include/zmq.h"
 
 #include "atomic_counter.hpp"
 

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"

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"

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"
 

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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>

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"

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"