[vlc-commits] configure: check that live555 has our patches applied

Rémi Denis-Courmont git at videolan.org
Mon Nov 14 17:35:09 CET 2011


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Nov 14 18:34:04 2011 +0200| [6a20b9968abde4f828c4c6cea51e8b7601f98fa5] | committer: Rémi Denis-Courmont

configure: check that live555 has our patches applied

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

 configure.ac |   27 +++++++++++++++++++++++++++
 1 files changed, 27 insertions(+), 0 deletions(-)

diff --git a/configure.ac b/configure.ac
index daeb4ca..a9d412b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1769,7 +1769,34 @@ You can get an updated one from http://www.live555.com/liveMedia .])
     AS_IF([test -n "${enable_live555}"], [
       AC_MSG_ERROR([Update live555 or pass --disable-live555 to disable RTSP input support.])
     ])
+    ac_cv_live555_usable=""
   ], [
+    dnl Check that live555 is patched correctly.
+    AC_CACHE_CHECK([for live555 usability], [ac_cv_live555_usable], [
+      AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
+[#include <locale.h>
+#ifdef __APPLE__
+# include <xlocale.h>
+#endif
+#undef LC_ALL
+#define LC_ALL BOOM
+#ifdef LC_ALL_MASK
+#include <Locale.hh>
+#endif
+#include <GroupsockHelper.hh>]], [
+[struct in_addr addr;
+our_inet_ntoa(addr, NULL);]])
+      ], [
+        ac_cv_live555_usable="yes"
+      ], [
+        ac_cv_live555_usable="no"
+      ])
+    ])
+    AS_IF([test "$ac_cv_live555_usable" = "no"], [
+      AC_MSG_ERROR([liveMedia lacks patches and is not usable.
+Please apply our patches from the VLC contrib (contrib/src/live555/).
+You can also disable RTSP input with --disable-live555. You were warned.])
+    ])
     other_libs="-lgroupsock -lBasicUsageEnvironment -lUsageEnvironment"
     other_libs_pic="-lgroupsock_pic -lBasicUsageEnvironment_pic -lUsageEnvironment_pic"
     AS_IF([test "${SYS}" = "mingw32"], [



More information about the vlc-commits mailing list