X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=73049462a764147c9e6265c5c3499d07ee07a38b;hb=c11082a5e58edae6cf090201d70e79bcc0e0e4fb;hp=a74906a1ae2971bc57db612cf5cffa5c14a3f31d;hpb=c0e8b04da9e49184f5620340fe19655f0c104eca;p=vlc 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