diff options
author | Martin Sustrik <sustrik@250bpm.com> | 2010-05-12 12:45:38 +0200 |
---|---|---|
committer | Martin Sustrik <sustrik@250bpm.com> | 2010-05-12 12:45:38 +0200 |
commit | 8e5ac100c95e02ef60aa827b4199002f324617ed (patch) | |
tree | 76e0131064617658b44177c27dfe330c4e7b267d /src | |
parent | 714a8d50a03e773320a02247847c58020c96e867 (diff) | |
parent | 9fbb9141a8895ac83e8051ac568223a9e57a278d (diff) |
Merge branch 'master' of git@github.com:sustrik/zeromq2
Diffstat (limited to 'src')
-rw-r--r-- | src/Makefile.am | 25 |
1 files changed, 4 insertions, 21 deletions
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 |