Commit c11082a5 authored by Rafaël Carré's avatar Rafaël Carré
Browse files

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

parent c0e8b04d
...@@ -1720,7 +1720,11 @@ if test "${enable_live555}" != "no"; then ...@@ -1720,7 +1720,11 @@ if test "${enable_live555}" != "no"; then
if test -z "${with_live555_tree}" -a "${CXX}" != ""; then if test -z "${with_live555_tree}" -a "${CXX}" != ""; then
AC_LANG_PUSH(C++) AC_LANG_PUSH(C++)
CPPFLAGS_save="${CPPFLAGS}" 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 if test "${SYS}" = "solaris"; then
CPPFLAGS_live555="${CPPFLAGS_live555} -DSOLARIS" CPPFLAGS_live555="${CPPFLAGS_live555} -DSOLARIS"
fi fi
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment