From: Rafaël Carré <rafael.carre@gmail.com>
Date: Thu, 18 Feb 2010 07:27:34 +0000 (+0100)
Subject: Don't look for live555 in /usr when using contribs
X-Git-Tag: 1.1.0-pre1~855
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=c11082a5e58edae6cf090201d70e79bcc0e0e4fb;p=vlc

Don't look for live555 in /usr when using contribs
---

diff --git a/configure.ac b/configure.ac
index a74906a1ae..73049462a7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1720,7 +1720,11 @@ if test "${enable_live555}" != "no"; then
   if test -z "${with_live555_tree}" -a "${CXX}" != ""; then
     AC_LANG_PUSH(C++)
     CPPFLAGS_save="${CPPFLAGS}"
-    CPPFLAGS_live555="-I/usr/include/liveMedia -I/usr/include/groupsock -I/usr/include/BasicUsageEnvironment -I/usr/include/UsageEnvironment"
+    if test -z "${CONTRIB_DIR}"; then
+        CPPFLAGS_live555="-I/usr/include/liveMedia -I/usr/include/groupsock -I/usr/include/BasicUsageEnvironment -I/usr/include/UsageEnvironment"
+    else
+        CPPFLAGS_live555="-I${CONTRIB_DIR}/include/liveMedia -I${CONTRIB_DIR}/include/groupsock -I${CONTRIB_DIR}/include/BasicUsageEnvironment -I${CONTRIB_DIR}/include/UsageEnvironment"
+    fi
     if test "${SYS}" = "solaris"; then
       CPPFLAGS_live555="${CPPFLAGS_live555} -DSOLARIS"
     fi