[svn-commits] twilson: trunk r330845 - in /trunk: ./ configure configure.ac

[SVN commits to the Digium repositories]

Author: twilson
Date: Thu Aug  4 15:53:16 2011
New Revision: 330845

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=330845
Log:
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)
  ........
................

Modified:
    trunk/   (props changed)
    trunk/configure
    trunk/configure.ac

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: trunk/configure.ac
URL: http://svnview.digium.com/svn/asterisk/trunk/configure.ac?view=diff&rev=330845&r1=330844&r2=330845
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Thu Aug  4 15:53:16 2011
@@ -2009,14 +2009,16 @@
     [ 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
     ]
     )