aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2007-11-06 15:01:56 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2007-11-06 15:01:56 +0000
commitf1e53779f17953f8e1fab8e539cf7eafaf240d4c (patch)
tree3b3fce2588cb1468cd30a3e71197f961f4ec5fc7
parentce01581f867d95e5adb471af3ee7fcde6ab47e33 (diff)
Set up detection of IP_PKTINFO in autoconf for chan_unistim
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@88973 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--channels/chan_unistim.c4
-rwxr-xr-xconfigure55
-rw-r--r--configure.ac9
-rw-r--r--include/asterisk/autoconfig.h.in3
4 files changed, 66 insertions, 5 deletions
diff --git a/channels/chan_unistim.c b/channels/chan_unistim.c
index 39e3e00a9..822561380 100644
--- a/channels/chan_unistim.c
+++ b/channels/chan_unistim.c
@@ -83,10 +83,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/abstract_jb.h"
#include "asterisk/event.h"
-/*! IP_PKTINFO is not portable. It's used to retrieve our IP.
- Comment the next line if your running *BSD */
-#define HAVE_PKTINFO 1
-
/*! Beware, G729 and G723 are not supported by asterisk, except with the proper licence */
#define CAPABILITY AST_FORMAT_ALAW | AST_FORMAT_ULAW /* | AST_FORMAT_G729A | AST_FORMAT_G723_1 */
diff --git a/configure b/configure
index d3e150422..44265d4a8 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.ac Revision: 88184 .
+# From configure.ac Revision: 88250 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61.
#
@@ -15046,6 +15046,59 @@ fi
done
+# check if we have IP_PKTINFO constant defined
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <netinet/in.h>
+int
+main ()
+{
+int pi = IP_PKTINFO;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+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_link") 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_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_PKTINFO 1
+_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_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+
# some systems already have gethostbyname_r so we don't need to build ours in main/utils.c
{ echo "$as_me:$LINENO: checking for library containing gethostbyname_r" >&5
echo $ECHO_N "checking for library containing gethostbyname_r... $ECHO_C" >&6; }
diff --git a/configure.ac b/configure.ac
index f25847f68..dbe6094b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -284,6 +284,15 @@ AC_CHECK_FUNCS([asprintf atexit bzero dup2 endpwent ftruncate getcwd gethostbyna
# fopencookie on linux
AC_CHECK_FUNCS([funopen fopencookie])
+# check if we have IP_PKTINFO constant defined
+AC_LINK_IFELSE(
+ AC_LANG_PROGRAM([#include <netinet/in.h>],
+ [int pi = IP_PKTINFO;]),
+ AC_MSG_RESULT(yes)
+ AC_DEFINE([HAVE_PKTINFO], 1, [Define to 1 if your system defines IP_PKTINFO.]),
+ AC_MSG_RESULT(no)
+)
+
# some systems already have gethostbyname_r so we don't need to build ours in main/utils.c
AC_SEARCH_LIBS(gethostbyname_r, [socket nsl])
diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in
index daf8a5ca1..01ecfb72a 100644
--- a/include/asterisk/autoconfig.h.in
+++ b/include/asterisk/autoconfig.h.in
@@ -520,6 +520,9 @@
/* Define to indicate the PostgreSQL library */
#undef HAVE_PGSQL
+/* Define to 1 if your system defines IP_PKTINFO. */
+#undef HAVE_PKTINFO
+
/* Define this to indicate the ${POPT_DESCRIP} library */
#undef HAVE_POPT