diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-12-04 04:52:24 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-12-04 04:52:24 +0000 |
commit | e3cfc784ddb1ac4599fefdf7ca6266093e36b3ea (patch) | |
tree | 02f06e81b33992843d9cfe15d5ce96bb651e43ec /configure | |
parent | dc26f23367bdc4a8b56dbb47ded722cc45a86406 (diff) |
OS X does not define MSG_NOSIGNAL, but it does have a socket option SO_NOSIGPIPE.
(closes issue #16178)
Reported by: oej
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@232950 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 162 |
1 files changed, 160 insertions, 2 deletions
@@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 227580 . +# From configure.ac Revision: 232164 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for asterisk 1.6. # @@ -1076,6 +1076,8 @@ CONFIG_GMIME EDITLINE_LIB PBX_H323 PBX_IXJUSER +PBX_MSG_NOSIGNAL +PBX_SO_NOSIGPIPE CONFIG_SDL CONFIG_GTK PKGCONFIG @@ -43333,6 +43335,160 @@ fi +# Used in res/res_pktccops + + if test "x${PBX_MSG_NOSIGNAL}" != "x1"; then + { echo "$as_me:$LINENO: checking for MSG_NOSIGNAL in sys/socket.h" >&5 +echo $ECHO_N "checking for MSG_NOSIGNAL in sys/socket.h... $ECHO_C" >&6; } + saved_cppflags="${CPPFLAGS}" + if test "x${MSG_NOSIGNAL_DIR}" != "x"; then + MSG_NOSIGNAL_INCLUDE="-I${MSG_NOSIGNAL_DIR}/include" + fi + CPPFLAGS="${CPPFLAGS} ${MSG_NOSIGNAL_INCLUDE}" + + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <sys/socket.h> +int +main () +{ +#if defined(MSG_NOSIGNAL) + int foo = 0; + #else + int foo = bar; + #endif + 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + PBX_MSG_NOSIGNAL=1 + +cat >>confdefs.h <<\_ACEOF +#define HAVE_MSG_NOSIGNAL 1 +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define HAVE_MSG_NOSIGNAL_VERSION +_ACEOF + + +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CPPFLAGS="${saved_cppflags}" + fi + + + + if test "x${PBX_SO_NOSIGPIPE}" != "x1"; then + { echo "$as_me:$LINENO: checking for SO_NOSIGPIPE in sys/socket.h" >&5 +echo $ECHO_N "checking for SO_NOSIGPIPE in sys/socket.h... $ECHO_C" >&6; } + saved_cppflags="${CPPFLAGS}" + if test "x${SO_NOSIGPIPE_DIR}" != "x"; then + SO_NOSIGPIPE_INCLUDE="-I${SO_NOSIGPIPE_DIR}/include" + fi + CPPFLAGS="${CPPFLAGS} ${SO_NOSIGPIPE_INCLUDE}" + + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <sys/socket.h> +int +main () +{ +#if defined(SO_NOSIGPIPE) + int foo = 0; + #else + int foo = bar; + #endif + 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + PBX_SO_NOSIGPIPE=1 + +cat >>confdefs.h <<\_ACEOF +#define HAVE_SO_NOSIGPIPE 1 +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define HAVE_SO_NOSIGPIPE_VERSION +_ACEOF + + +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CPPFLAGS="${saved_cppflags}" + fi + + + if test "x${PBX_SDL}" != "x1" -a "${USE_SDL}" != "no"; then PBX_SDL=0 @@ -47636,6 +47792,8 @@ CONFIG_GMIME!$CONFIG_GMIME$ac_delim EDITLINE_LIB!$EDITLINE_LIB$ac_delim PBX_H323!$PBX_H323$ac_delim PBX_IXJUSER!$PBX_IXJUSER$ac_delim +PBX_MSG_NOSIGNAL!$PBX_MSG_NOSIGNAL$ac_delim +PBX_SO_NOSIGPIPE!$PBX_SO_NOSIGPIPE$ac_delim CONFIG_SDL!$CONFIG_SDL$ac_delim CONFIG_GTK!$CONFIG_GTK$ac_delim PKGCONFIG!$PKGCONFIG$ac_delim @@ -47658,7 +47816,7 @@ PBX_SYSLOG!$PBX_SYSLOG$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 89; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 91; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 |