generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-11-01 21:13:13 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Martin Sustrik
2010-05-12 12:45:38 +02:00
parent 714a8d50a0 9fbb9141a8
commit 8e5ac100c9
7 changed files with 8 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.in
View File

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

2
devices/zmq_forwarder/Makefile.am
View File

@@ -1,4 +1,4 @@
INCLUDES = -I$(top_srcdir)/bindings/cpp -I$(top_srcdir)/bindings/c
INCLUDES = -I$(top_srcdir)/include
bin_PROGRAMS = zmq_forwarder

2
devices/zmq_queue/Makefile.am
View File

@@ -1,4 +1,4 @@
INCLUDES = -I$(top_srcdir)/bindings/cpp -I$(top_srcdir)/bindings/c
INCLUDES = -I$(top_srcdir)/include
bin_PROGRAMS = zmq_queue

2
devices/zmq_streamer/Makefile.am
View File

@@ -1,4 +1,4 @@
INCLUDES = -I$(top_srcdir)/bindings/cpp -I$(top_srcdir)/bindings/c
INCLUDES = -I$(top_srcdir)/include
bin_PROGRAMS = zmq_streamer

BIN
foreign/openpgm/libpgm-2.0.24.tar.gz
View File

Binary file not shown.

BIN
foreign/openpgm/libpgm-2.1.26.tar.gz Normal file
View File

Binary file not shown.

25
src/Makefile.am
View File

@@ -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