videolan/vlc
1
Fork 0
mirror of https://code.videolan.org/videolan/vlc synced 2024-09-04 09:11:33 +02:00
Code Releases Activity

configure: show the contrib selection result directly

Browse Source 
So all AC_MSG_RESULT are grouped in the same block.
This commit is contained in:
Steve Lhomme 2022-09-23 14:42:58 +02:00 committed by Jean-Baptiste Kempf
parent 6a56e91605
commit f67d499893
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@ -519,6 +519,7 @@ AS_IF([test -z "${with_contrib}" || test "${with_contrib}" = "yes"], [
], [
AS_IF([test "${with_contrib}" != "no"], [
CONTRIB_DIR="${with_contrib}"
AC_MSG_RESULT([${CONTRIB_DIR}])
], [
CONTRIB_DIR=""
AC_MSG_RESULT([disabled])
@ -526,7 +527,9 @@ AS_IF([test -z "${with_contrib}" || test "${with_contrib}" = "yes"], [
])
AS_IF([test -n "${CONTRIB_DIR}"], [
AS_IF([test -d "${CONTRIB_DIR}/lib"],[
CONTRIB_DIR=`cd "${CONTRIB_DIR}" && pwd`
SRC_CONTRIB_DIR=$(CONTRIB_DIR)
CONTRIB_DIR=`cd "${CONTRIB_DIR}" && pwd -P`
AC_MSG_RESULT([${CONTRIB_DIR} from ${SRC_CONTRIB_DIR}])
], [
echo "${CONTRIB_DIR}/lib not found" >&AS_MESSAGE_LOG_FD
CONTRIB_DIR=""
@ -535,7 +538,6 @@ AS_IF([test -n "${CONTRIB_DIR}"], [
])
AS_IF([test -n "${CONTRIB_DIR}"], [
AC_MSG_RESULT([${CONTRIB_DIR}])
CPPFLAGS="${CPPFLAGS} -I${CONTRIB_DIR}/include"
CFLAGS="${CFLAGS} -I${CONTRIB_DIR}/include"
CXXFLAGS="${CXXFLAGS} -I${CONTRIB_DIR}/include"