Changeset 4923cfeff6360e13aa1ccf052d4c20a9a3801b14
- Timestamp:
- 14/04/06 15:22:44
(3 years ago)
- Author:
- Benjamin Pracht <bigben@videolan.org>
- git-committer:
- Benjamin Pracht <bigben@videolan.org> 1145020964 +0000
- git-parent:
[6a320d91b2c8f6833b579c0d3d87ae49c8010687]
- git-author:
- Benjamin Pracht <bigben@videolan.org> 1145020964 +0000
- Message:
* What is the point in having a detection for libvc1 if we don't have a libvc1 module ? Moreover, that prevents jlj's patch with the module from applying.
-
Files:
-
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
| rc9d6320 |
r4923cfe |
|
| 3225 | 3225 | AC_MSG_ERROR([libdirac doesn't appear to be installed on you system.]) |
|---|
| 3226 | 3226 | ]) |
|---|
| 3227 | | fi |
|---|
| 3228 | | |
|---|
| 3229 | | dnl libvc1 decoder plugin |
|---|
| 3230 | | dnl |
|---|
| 3231 | | AC_ARG_ENABLE(libvc1, |
|---|
| 3232 | | [ --enable-libvc1 VC-1 codec (default disabled)]) |
|---|
| 3233 | | if test "${enable_libvc1}" = "yes" |
|---|
| 3234 | | then |
|---|
| 3235 | | AC_ARG_WITH(libvc1-tree, |
|---|
| 3236 | | [ --with-libvc1-tree=PATH libvc1 tree for static linking]) |
|---|
| 3237 | | if test -n "${with_libvc1_tree}" |
|---|
| 3238 | | then |
|---|
| 3239 | | AC_MSG_CHECKING(for vc1dec.o in ${with_libvc1_tree}) |
|---|
| 3240 | | real_libvc1_tree="`cd ${with_libvc1_tree} 2>/dev/null && pwd`" |
|---|
| 3241 | | if test -f "${real_libvc1_tree}/src/.libs/vc1dec.o" |
|---|
| 3242 | | then |
|---|
| 3243 | | VLC_ADD_BUILTINS([libvc1]) |
|---|
| 3244 | | VLC_ADD_CPPFLAGS([libvc1],[-I${real_libvc1_tree}/src]) |
|---|
| 3245 | | VLC_ADD_LDFLAGS([libvc1],[${real_libvc1_tree}/src/.libs/libvc1.a]) |
|---|
| 3246 | | AC_MSG_RESULT(yes) |
|---|
| 3247 | | else |
|---|
| 3248 | | dnl The given libvc1 tree wasn't built |
|---|
| 3249 | | AC_MSG_RESULT(no) |
|---|
| 3250 | | AC_MSG_ERROR([cannot find ${real_libvc1_tree}/src/.libs/vc1dec.o, |
|---|
| 3251 | | make sure you compiled libvc1 in ${with_libvc1_tree}]) |
|---|
| 3252 | | fi |
|---|
| 3253 | | fi |
|---|
| 3254 | 3227 | fi |
|---|
| 3255 | 3228 | |
|---|