From 310e11017602341b0cb1399aafc0556b5ab6bfb3 Mon Sep 17 00:00:00 2001 From: Thomas Ries Date: Sat, 8 Nov 2008 15:27:31 +0000 Subject: [PATCH] - honor PTHREAD_LDFLAGS from environment --- ChangeLog | 1 + config.h.in | 3 +++ configure.in | 15 +++++++++++++++ src/siproxd.h | 3 --- 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3c540b7..4d1c6a6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ ===== 01-Aug-2008: - SIP DSCP value configurable 08-Nov-2008: - check & define if SOL_IP not existing (some *BSDs) + - honor PTHREAD_LDFLAGS from environment 0.7.1 ===== diff --git a/config.h.in b/config.h.in index e2b3dc1..d9c51ba 100644 --- a/config.h.in +++ b/config.h.in @@ -241,6 +241,9 @@ /* will search for config file here */ #undef SIPROXDCONFPATH +/* SOL_IP for setsockopt() */ +#undef SOL_IP + /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS diff --git a/configure.in b/configure.in index a8e1360..b26dbe5 100644 --- a/configure.in +++ b/configure.in @@ -333,6 +333,21 @@ AC_HEADER_TIME AC_STRUCT_TM +dnl +dnl Check for Constants that may be non-existing on some platforms +dnl +dnl SOL_IP (used in setsockopt) +AC_CHECK_DECL(SOL_IP, + , + AC_MSG_RESULT(SOL_IP is not available - creating DEFINE to IPPROTO_IP) + AC_DEFINE(SOL_IP,IPPROTO_IP,[SOL_IP for setsockopt()]), + [[$ac_includes_default] + [#ifdef HAVE_NETDB_H] + [#include ] + [#endif]] +) + + dnl dnl check for typedef socklen (not available on SUSE 5.3 for example) dnl diff --git a/src/siproxd.h b/src/siproxd.h index b5f72f1..ebb9b10 100644 --- a/src/siproxd.h +++ b/src/siproxd.h @@ -332,9 +332,6 @@ int unload_plugins(void); #define satoi atoi /* used in libosips MSG_TEST_CODE macro ... */ #endif -#if !defined(SOL_IP) -#define SOL_IP IPPROTO_IP -#endif /* * Macro that limits the frequency of this particular code