Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-1.1
Commits
55b5dd33
Commit
55b5dd33
authored
Aug 25, 2008
by
Christophe Mutricy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cosmetics + reorder test to note print a stupid message
parent
c3723f3d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
9 deletions
+9
-9
configure.ac
configure.ac
+9
-9
No files found.
configure.ac
View file @
55b5dd33
...
@@ -98,13 +98,14 @@ dnl Check for the contrib directory
...
@@ -98,13 +98,14 @@ dnl Check for the contrib directory
dnl
dnl
AC_ARG_WITH(contrib,
AC_ARG_WITH(contrib,
[ --without-contrib do not use the libraries in extras/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])
AC_MSG_CHECKING([for libs in extras/contrib])
topdir="`dirname $0`"
topdir="`dirname $0`"
if test "`echo \"$topdir\" | cut -c 1`" != "/"; then
if test "`echo \"$topdir\" | cut -c 1`" != "/"; then
topdir="`pwd`/$topdir"
topdir="`pwd`/$topdir"
fi
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
if test "${with_contrib}" = "yes"; then
AC_MSG_RESULT([no])
AC_MSG_RESULT([no])
AC_MSG_ERROR([ not using the libs in extras/contrib as it is not the same host])
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,
...
@@ -112,8 +113,7 @@ AC_ARG_WITH(contrib,
AC_MSG_RESULT([no])
AC_MSG_RESULT([no])
AC_MSG_WARN([ not using the libs in extras/contrib as it is not the same host])
AC_MSG_WARN([ not using the libs in extras/contrib as it is not the same host])
fi
fi
else
],[
if test -d ${topdir}/extras/contrib/lib; then
AC_MSG_RESULT([yes])
AC_MSG_RESULT([yes])
export PATH=${topdir}/extras/contrib/bin:$PATH
export PATH=${topdir}/extras/contrib/bin:$PATH
CPPFLAGS="${CPPFLAGS} -I${topdir}/extras/contrib/include"
CPPFLAGS="${CPPFLAGS} -I${topdir}/extras/contrib/include"
...
@@ -146,11 +146,11 @@ AC_ARG_WITH(contrib,
...
@@ -146,11 +146,11 @@ AC_ARG_WITH(contrib,
export LIBRARY_PATH=${topdir}/extras/contrib/lib:$LIBRARY_PATH
export LIBRARY_PATH=${topdir}/extras/contrib/lib:$LIBRARY_PATH
export BELIBRARIES=${topdir}/extras/contrib/lib:$BELIBRARIES
export BELIBRARIES=${topdir}/extras/contrib/lib:$BELIBRARIES
fi
fi
else
])
AC_MSG_RESULT([no])
],[
fi
AC_MSG_RESULT([no])
fi
])
fi
])
dnl
dnl
dnl Set default values
dnl Set default values
dnl
dnl
...
...
Write
Preview
Markdown
is supported
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