Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
GSoC
GSoC2018
macOS
vlc
Commits
55b5dd33
Commit
55b5dd33
authored
Aug 25, 2008
by
Christophe Mutricy
Browse files
Cosmetics + reorder test to note print a stupid message
parent
c3723f3d
Changes
1
Hide whitespace changes
Inline
Side-by-side
configure.ac
View file @
55b5dd33
...
...
@@ -98,13 +98,14 @@ dnl Check for the contrib directory
dnl
AC_ARG_WITH(contrib,
[ --without-contrib do not use the libraries in extras/contrib],[],[])
if
test "${with_contrib}" != "no"
; then
AS_IF([
test "${with_contrib}" != "no"
],[
AC_MSG_CHECKING([for libs in extras/contrib])
topdir="`dirname $0`"
if test "`echo \"$topdir\" | cut -c 1`" != "/"; then
topdir="`pwd`/$topdir"
fi
if test "`grep HOST ${topdir}/extras/contrib/config.mak 2>/dev/null|awk '{print $3}'`" != "`$CC -dumpmachine`"; then
AS_IF([test -d ${topdir}/extras/contrib/lib],[
AS_IF([test "`grep HOST ${topdir}/extras/contrib/config.mak 2>/dev/null|awk '{print $3}'`" != "`$CC -dumpmachine`"],[
if test "${with_contrib}" = "yes"; then
AC_MSG_RESULT([no])
AC_MSG_ERROR([ not using the libs in extras/contrib as it is not the same host])
...
...
@@ -112,8 +113,7 @@ AC_ARG_WITH(contrib,
AC_MSG_RESULT([no])
AC_MSG_WARN([ not using the libs in extras/contrib as it is not the same host])
fi
else
if test -d ${topdir}/extras/contrib/lib; then
],[
AC_MSG_RESULT([yes])
export PATH=${topdir}/extras/contrib/bin:$PATH
CPPFLAGS="${CPPFLAGS} -I${topdir}/extras/contrib/include"
...
...
@@ -146,11 +146,11 @@ AC_ARG_WITH(contrib,
export LIBRARY_PATH=${topdir}/extras/contrib/lib:$LIBRARY_PATH
export BELIBRARIES=${topdir}/extras/contrib/lib:$BELIBRARIES
fi
else
AC_MSG_RESULT([no])
fi
fi
fi
])
],[
AC_MSG_RESULT([no])
])
])
dnl
dnl Set default values
dnl
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment