Merge branch 'master' of git@github.com:sustrik/zeromq2

7 files changed, 8 insertions, 25 deletions

diff --git a/configure.in b/configure.in
index b95a367..8d2f27d 100644
--- a/configure.in
+++ b/configure.in
@@ -268,7 +268,7 @@ fi
 #  PGM extension
 pgm_ext="no"
 
-pgm_basename="libpgm-2.0.24"
+pgm_basename="libpgm-2.1.26"
 
 AC_SUBST(pgm_basename)
 
diff --git a/devices/zmq_forwarder/Makefile.am b/devices/zmq_forwarder/Makefile.am
index ca29fa5..936a305 100644
--- a/devices/zmq_forwarder/Makefile.am
+++ b/devices/zmq_forwarder/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/bindings/cpp -I$(top_srcdir)/bindings/c
+INCLUDES = -I$(top_srcdir)/include
 
 bin_PROGRAMS = zmq_forwarder
 
diff --git a/devices/zmq_queue/Makefile.am b/devices/zmq_queue/Makefile.am
index 416cb21..39c0c10 100644
--- a/devices/zmq_queue/Makefile.am
+++ b/devices/zmq_queue/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/bindings/cpp -I$(top_srcdir)/bindings/c
+INCLUDES = -I$(top_srcdir)/include
 
 bin_PROGRAMS = zmq_queue
 
diff --git a/devices/zmq_streamer/Makefile.am b/devices/zmq_streamer/Makefile.am
index b6ab8fa..e195a3c 100644
--- a/devices/zmq_streamer/Makefile.am
+++ b/devices/zmq_streamer/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/bindings/cpp -I$(top_srcdir)/bindings/c
+INCLUDES = -I$(top_srcdir)/include
 
 bin_PROGRAMS = zmq_streamer
 
diff --git a/foreign/openpgm/libpgm-2.0.24.tar.gz b/foreign/openpgm/libpgm-2.0.24.tar.gz
deleted file mode 100644
index 6668df2..0000000
--- a/foreign/openpgm/libpgm-2.0.24.tar.gz
+++ /dev/null
diff --git a/foreign/openpgm/libpgm-2.1.26.tar.gz b/foreign/openpgm/libpgm-2.1.26.tar.gz
new file mode 100644
index 0000000..352df68
--- /dev/null
+++ b/foreign/openpgm/libpgm-2.1.26.tar.gz
diff --git a/src/Makefile.am b/src/Makefile.am
index 70ae248..fa97ca3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -181,6 +181,7 @@ if BUILD_PGM
 if ON_MINGW
 libpgm_diff_flags = \
     -D_WIN32_WINNT=0x0501 \
+    -DCONFIG_16BIT_CHECKSUM \
     -DCONFIG_HAVE_IFR_NETMASK \
     -DCONFIG_BIND_INADDR_ANY \
     -DCONFIG_GALOIS_MUL_LUT \
@@ -193,6 +194,7 @@ libpgm_diff_flags = \
 else
 libpgm_diff_flags = \
     -D__need_IOV_MAX \
+    -DCONFIG_16BIT_CHECKSUM \
     -DCONFIG_HAVE_PSELECT \
     -DCONFIG_HAVE_POLL \
     -DCONFIG_HAVE_PPOLL \
@@ -219,36 +221,17 @@ libpgm_diff_flags = \
 endif
 
 libzmq_la_CFLAGS = -I$(top_srcdir)/foreign/openpgm/@pgm_basename@/openpgm/pgm/include/ @LIBZMQ_EXTRA_CXXFLAGS@ \
-    -pipe \
     -Wall \
-    -Wextra \
-    -Wfloat-equal \
-    -Wshadow \
-    -Wunsafe-loop-optimizations \
-    -Wpointer-arith \
-    -Wbad-function-cast \
-    -Wcast-qual \
-    -Wcast-align \
-    -Wwrite-strings \
-    -Waggregate-return \
-    -Wstrict-prototypes \
-    -Wold-style-definition \
-    -Wmissing-prototypes \
-    -Wmissing-declarations \
-    -Wmissing-noreturn \
-    -Wmissing-format-attribute \
-    -Wredundant-decls \
-    -Wnested-externs \
-    -Winline \
     -pedantic \
     -std=gnu99 \
+    -fno-strict-aliasing \
     --param max-inline-insns-single=600 \
     -D_REENTRANT \
     -D_GNU_SOURCE \
     ${libpgm_diff_flags}
 
 libzmq_la_CXXFLAGS = -I$(top_srcdir)/foreign/openpgm/@pgm_basename@/openpgm/pgm/include/ \
-    -Wall @LIBZMQ_EXTRA_CXXFLAGS@ ${libpgm_diff_flags}
+    @LIBZMQ_EXTRA_CXXFLAGS@
 endif
 
 if BUILD_NO_PGM