diff options
| author | Martin Sustrik <sustrik@250bpm.com> | 2010-02-16 18:03:41 +0100 |
|---|---|---|
| committer | Martin Sustrik <sustrik@250bpm.com> | 2010-02-16 18:03:41 +0100 |
| commit | 2ddce205350f11dacd8d8550f7d4e6e088c7fbcd (patch) | |
| tree | 26cb415aaacd70e8252646861ec070f6afde14f7 /src | |
| parent | 43620b3d35e3f3a6e49046fdc0426651bf58dedb (diff) | |
| parent | a2f9899f6a1fad3f9c73fc7599445bdde0b95ec4 (diff) | |
Merge branch 'master' of git@github.com:sustrik/zeromq2
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 12 | ||||
| -rw-r--r-- | src/ip.cpp | 12 |
2 files changed, 19 insertions, 5 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index f19c0f6..4146f68 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -15,7 +15,7 @@ include_HEADERS = ../bindings/c/zmq.h endif endif -if BUILD_PGM2 +if BUILD_PGM pgm_sources = ../foreign/openpgm/@pgm_basename@/openpgm/pgm/packet.c \ ../foreign/openpgm/@pgm_basename@/openpgm/pgm/time.c \ ../foreign/openpgm/@pgm_basename@/openpgm/pgm/if.c \ @@ -49,6 +49,12 @@ pgm_sources = ../foreign/openpgm/@pgm_basename@/openpgm/pgm/packet.c \ ../foreign/openpgm/@pgm_basename@/openpgm/pgm/log.c \ ../foreign/openpgm/@pgm_basename@/openpgm/pgm/sockaddr.c \ ../foreign/openpgm/@pgm_basename@/openpgm/pgm/version.c + +../foreign/openpgm/@pgm_basename@/openpgm/pgm/version.c: ../foreign/openpgm/@pgm_basename@/openpgm/pgm/version_generator.py + python ../foreign/openpgm/@pgm_basename@/openpgm/pgm/version_generator.py > $@ + +../foreign/openpgm/@pgm_basename@/openpgm/pgm/galois_tables.c: ../foreign/openpgm/@pgm_basename@/openpgm/pgm/galois_generator.pl + perl ../foreign/openpgm/@pgm_basename@/openpgm/pgm/galois_generator.pl > $@ endif nodist_libzmq_la_SOURCES = $(pgm_sources) @@ -173,9 +179,9 @@ libzmq_la_SOURCES = app_thread.hpp \ zmq_init.cpp \ zmq_listener.cpp -libzmq_la_LDFLAGS = -version-info @LTVER@ @LIBZMQ_EXTRA_LDFLAFS@ +libzmq_la_LDFLAGS = -version-info @LTVER@ @LIBZMQ_EXTRA_LDFLAGS@ -if BUILD_PGM2 +if BUILD_PGM if ON_MINGW libpgm_diff_flags = \ @@ -239,7 +239,11 @@ int zmq::resolve_ip_interface (sockaddr_storage* addr_, socklen_t *addr_len_, // Restrict hostname/service to literals to avoid any DNS lookups or // service-name irregularity due to indeterminate socktype. - req.ai_flags = AI_PASSIVE | AI_NUMERICHOST | AI_NUMERICSERV; +#if defined ZMQ_HAVE_OSX + req.ai_flags = AI_PASSIVE | AI_NUMERICHOST; +#else + req.ai_flags = AI_PASSIVE | AI_NUMERICHOST | AI_NUMERICSERV; +#endif // Resolve the literal address. Some of the error info is lost in case // of error, however, there's no way to report EAI errors via errno. @@ -288,7 +292,11 @@ int zmq::resolve_ip_hostname (sockaddr_storage *addr_, socklen_t *addr_len_, // Avoid named services due to unclear socktype, and don't pick IPv6 // addresses if we don't have a local IPv6 address configured. - req.ai_flags = AI_NUMERICSERV | AI_ADDRCONFIG; +#if defined ZMQ_HAVE_OSX + req.ai_flags = AI_ADDRCONFIG; +#else + req.ai_flags = AI_NUMERICSERV | AI_ADDRCONFIG; +#endif // Resolve host name. Some of the error info is lost in case of error, // however, there's no way to report EAI errors via errno. |