Merged revisions 284399 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.6.2

................
  r284399 | tilghman | 2010-08-31 15:18:32 -0500 (Tue, 31 Aug 2010) | 14 lines
  
  Merged revisions 284393 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r284393 | tilghman | 2010-08-31 15:13:21 -0500 (Tue, 31 Aug 2010) | 7 lines
    
    Don't send a devstate change on poke_noanswer if the state did not change.
    
    (closes issue #17741)
     Reported by: schmidts
     Patches: 
           chan_sip.c.patch uploaded by schmidts (license 1077)
  ........
................


git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@284415 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 56 insertions, 1 deletions

diff --git a/configure b/configure
index 655adc785..571e71106 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 279658 .
+# From configure.ac Revision: 280020 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.65 for asterisk trunk.
 #
@@ -26148,6 +26148,61 @@ fi
 
 
 
+if test "$PBX_SRTP" = "1";
+then
+    saved_libs="${LIBS}"
+    saved_ldflags="${LDFLAGS}"
+    LIBS="${LIBS} -lsrtp"
+    LDFLAGS="${LDFLAGS} -shared -fPIC"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the ability of -lsrtp to be linked in a shared object" >&5
+$as_echo_n "checking for the ability of -lsrtp to be linked in a shared object... " >&6; }
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+        #include <srtp/srtp.h>
+int
+main ()
+{
+srtp_init();
+
+  ;
+  return 0;
+}
+
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: ***" >&5
+$as_echo "$as_me: ***" >&6;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: *** libsrtp could not be linked as a shared object" >&5
+$as_echo "$as_me: *** libsrtp could not be linked as a shared object" >&6;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: *** try compiling libsrtp manually and configuring with" >&5
+$as_echo "$as_me: *** try compiling libsrtp manually and configuring with" >&6;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: *** ./configure CFLAGS=-fPIC --prefix=/usr" >&5
+$as_echo "$as_me: *** ./configure CFLAGS=-fPIC --prefix=/usr" >&6;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: *** replacing /usr with the prefix of your choice" >&5
+$as_echo "$as_me: *** replacing /usr with the prefix of your choice" >&6;}
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: ***" >&5
+$as_echo "$as_me: ***" >&6;}
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: *** If you do not need SRTP support re-run configure" >&5
+$as_echo "$as_me: *** If you do not need SRTP support re-run configure" >&6;}
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: *** with the --without-srtp option." >&5
+$as_echo "$as_me: *** with the --without-srtp option." >&6;}
+        exit 1
+
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+    LIBS="${saved_libs}"
+    LDFLAGS="${saved_ldflags}"
+fi
+
 
     if test "x${PBX_GMIME}" != "x1" -a "${USE_GMIME}" != "no"; then
 	PBX_GMIME=0