[vlc-commits] commit: Clarify live555 version error ( Rémi Denis-Courmont )

[git at videolan.org]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Oct 11 18:51:04 2010 +0300| [39173fb7097975a2e071399e8f53a2515c19e56e] | committer: Rémi Denis-Courmont 

Clarify live555 version error

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=39173fb7097975a2e071399e8f53a2515c19e56e
---

 configure.ac |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index d56b735..3030c78 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1741,16 +1741,16 @@ if test "${enable_live555}" != "no"; then
         [#include <liveMedia_version.hh>
          #ifdef LIVEMEDIA_LIBRARY_VERSION_INT
          #if LIVEMEDIA_LIBRARY_VERSION_INT < 1275091200
-         yes
+         NO!
          #endif
          #endif],
         [AC_MSG_RESULT([no])
-          if test "${enable_live555}" == "yes"; then
-            AC_MSG_ERROR([Your version of liveMedia is too old: you may get a more recent one from http://www.live555.com/liveMedia.
-lternatively you can use --disable-live555 to disable the liveMedia plugin.])
-          else
-            AC_MSG_WARN([Your version of liveMedia is too old: you may get a more recent one from http://www.live555.com/liveMedia.])
-          fi
+          AC_MSG_WARN([The installed liveMedia version is too old:
+Version 2010.05.29 or later is required to proceed.
+You can get an updated one from http://www.live555.com/liveMedia .])
+          AS_IF([test "${enable_live555}" == "yes"], [
+            AC_MSG_ERROR([Update live555 or pass --disable-live555 to disable the plugin.])
+          ])
         ],[
           AC_MSG_RESULT([yes])
           other_libs="-lgroupsock -lBasicUsageEnvironment -lUsageEnvironment"