Tiny corrections to autotools config: wrong --with-czmq handler

Made all the *.h files fo to a $(includedir)/zre folder upon install
Includes czmq.h on top of zre.h

Author: Victor Perron

C/configure.in

@@ -78,7 +78,9 @@ if test "x$czmq_search_libzmq" = "xyes"; then
     fi
 fi
 
-AC_CHECK_LIB(zmq, zmq_init, ,[AC_MSG_ERROR([cannot link with -lzmq, install libzmq.])])
+AC_CHECK_LIB(zmq, zmq_init,
+							LIBS="-lzmq $LIBS",
+						 [AC_MSG_ERROR([cannot link with -lzmq, install libzmq.])])
 
 AC_MSG_CHECKING([whether libzmq installation works])
 AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <zmq.h>],
@@ -89,7 +91,7 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <zmq.h>],
 
 # libczmq integration
 AC_ARG_WITH([libczmq],
-            [AS_HELP_STRING([--with-czmq],
+            [AS_HELP_STRING([--with-libczmq],
                             [Specify libczmq prefix])],
             [zre_search_libczmq="yes"],
             [])
@@ -103,7 +105,9 @@ if test "x$zre_search_libczmq" = "xyes"; then
     fi
 fi
 
-AC_CHECK_LIB(czmq, zctx_test, ,[AC_MSG_ERROR([cannot link with -lczmq, install libczmq.])])
+AC_CHECK_LIB(czmq, zctx_test, 
+							LIBS="-lczmq $LIBS",
+						 [AC_MSG_ERROR([cannot link with -lczmq, install libczmq.])])
 
 AC_MSG_CHECKING([whether libczmq installation works])
 AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <czmq.h>],

C/include/zre.h

@@ -27,6 +27,9 @@
 #ifndef __ZRE_H_INCLUDED__
 #define __ZRE_H_INCLUDED__
 
+#include <czmq.h>
+
+
 #define ZRE_VERSION_MAJOR 0
 #define ZRE_VERSION_MINOR 2
 #define ZRE_VERSION_PATCH 0

C/src/Makefile.am

@@ -3,8 +3,17 @@ lib_LTLIBRARIES = libzre.la
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libzre.pc
 
-include_HEADERS = \
-    ../include/zre.h
+libzre_la_includedir = $(includedir)/zre
+libzre_la_include_HEADERS = \
+    ../include/zre.h \
+		../include/zre_udp.h \
+		../include/zre_msg.h \
+		../include/zre_peer.h \
+		../include/zre_group.h \
+		../include/zre_log.h \
+		../include/zre_log_msg.h \
+		../include/zre_interface.h
+
 
 libzre_la_SOURCES = \
     zre_interface.c \