Merged revisions 330844 via svnmerge from

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

................
  r330844 | twilson | 2011-08-04 15:51:23 -0500 (Thu, 04 Aug 2011) | 11 lines
  
  Merged revisions 330843 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r330843 | twilson | 2011-08-04 15:29:19 -0500 (Thu, 04 Aug 2011) | 4 lines
    
    Make libsrtp instructions more explicit when linking fails
    
    (closes issue ASTERISK-18139)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@330845 65c4cc65-6c06-0410-ace0-fbb531ad65f3

2 files changed, 31 insertions, 25 deletions

diff --git a/configure b/configure
index 3abd3cb69..d06cebfb2 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 323321 .
+# From configure.ac Revision: 326589 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.67 for asterisk trunk.
 #
@@ -26632,22 +26632,26 @@ 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;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ***" >&5
+$as_echo "$as_me: WARNING: ***" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** libsrtp could not be linked as a shared object." >&5
+$as_echo "$as_me: WARNING: *** libsrtp could not be linked as a shared object." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Try compiling libsrtp manually. Configure libsrtp" >&5
+$as_echo "$as_me: WARNING: *** Try compiling libsrtp manually. Configure libsrtp" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** with ./configure CFLAGS=-fPIC --prefix=/usr" >&5
+$as_echo "$as_me: WARNING: *** with ./configure CFLAGS=-fPIC --prefix=/usr" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** replacing /usr with the prefix of your choice." >&5
+$as_echo "$as_me: WARNING: *** replacing /usr with the prefix of your choice." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** After re-installing libsrtp" >&5
+$as_echo "$as_me: WARNING: *** After re-installing libsrtp" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** configure script." >&5
+$as_echo "$as_me: WARNING: *** configure script." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ***" >&5
+$as_echo "$as_me: WARNING: ***" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** If you do not need SRTP support re-run configure" >&5
+$as_echo "$as_me: WARNING: *** If you do not need SRTP support re-run configure" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** with the --without-srtp option." >&5
+$as_echo "$as_me: WARNING: *** with the --without-srtp option." >&2;}
         exit 1
 
 
diff --git a/configure.ac b/configure.ac
index cc3d73cb1..2c78a176c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2009,14 +2009,16 @@ then
     [ AC_MSG_RESULT(yes) ],
     [
         AC_MSG_RESULT(no)
-        AC_MSG_NOTICE(***)
-        AC_MSG_NOTICE(*** libsrtp could not be linked as a shared object)
-        AC_MSG_NOTICE(*** try compiling libsrtp manually and configuring with)
-        AC_MSG_NOTICE(*** ./configure CFLAGS=-fPIC --prefix=/usr)
-        AC_MSG_NOTICE(*** replacing /usr with the prefix of your choice)
-        AC_MSG_NOTICE(***)
-        AC_MSG_NOTICE(*** If you do not need SRTP support re-run configure)
-        AC_MSG_NOTICE(*** with the --without-srtp option.)
+        AC_MSG_WARN(***)
+        AC_MSG_WARN(*** libsrtp could not be linked as a shared object.)
+        AC_MSG_WARN(*** Try compiling libsrtp manually. Configure libsrtp)
+        AC_MSG_WARN(*** with ./configure CFLAGS=-fPIC --prefix=/usr)
+        AC_MSG_WARN(*** replacing /usr with the prefix of your choice.)
+        AC_MSG_WARN(*** After re-installing libsrtp, re-run the Asterisk)
+        AC_MSG_WARN(*** configure script.)
+        AC_MSG_WARN(***)
+        AC_MSG_WARN(*** If you do not need SRTP support re-run configure)
+        AC_MSG_WARN(*** with the --without-srtp option.)
         exit 1
     ]
     )