diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-12-11 21:52:47 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-12-11 21:52:47 +0000 |
commit | 436f39edfdc8487d6ef3dddb8bef99ccfd0c3dc4 (patch) | |
tree | e7138e2a93276a710d8f6c8f39de369f65a2b7a7 | |
parent | 094f2ca895b43ac79e1ee79dbd505a6434e9a7cd (diff) | |
download | mpv-436f39edfdc8487d6ef3dddb8bef99ccfd0c3dc4.tar.bz2 mpv-436f39edfdc8487d6ef3dddb8bef99ccfd0c3dc4.tar.xz |
Rework Theora test, it was throwing away CFLAGS provided by pkg-config.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28130 b3059339-0415-0410-9bf9-f77b7e298cf2
-rwxr-xr-x | configure | 26 |
1 files changed, 18 insertions, 8 deletions
@@ -6071,15 +6071,25 @@ int main(void) { return 0; } EOF - for _ld_theora in "`$_pkg_config --silence-errors --libs --cflags theora`" "-ltheora -logg"; do - cc_check $_ld_theora && _ld_extra="$_ld_extra $_ld_theora" \ - && _theora=yes && break - done + _ld_theora=$($_pkg_config --silence-errors --libs theora) + _inc_theora=$($_pkg_config --silence-errors --cflags theora) + cc_check $_inc_theora $_ld_theora && _ld_extra="$_ld_extra $_ld_theora" && + _inc_extra="$_inc_extra $_inc_theora" && _theora=yes + if test _theora = no; then + _ld_theora="-ltheora -logg" + cc_check $_ld_theora && _ld_extra="$_ld_extra $_ld_theora" && _theora=yes + fi if test "$_theora" = no && test "$_tremor_internal" = yes; then - for _ld_theora in "`$_pkg_config --silence-errors --libs --cflags theora`" "-ltheora -logg"; do - cc_check tremor/bitwise.c $_ld_theora \ - && _ld_extra="$_ld_extra $_ld_theora" && theora=yes && break - done + _ld_theora=$($_pkg_config --silence-errors --libs theora) + _inc_theora=$($_pkg_config --silence-errors --cflags theora) + cc_check tremor/bitwise.c $_inc_theora $_ld_theora && + _ld_extra="$_ld_extra $_ld_theora" && + _inc_extra="$_inc_extra $_inc_theora" && _theora=yes + if test _theora = no; then + _ld_theora="-ltheora -logg" + cc_check tremor/bitwise.c $_ld_theora && + _ld_extra="$_ld_extra $_ld_theora" && _theora=yes + fi fi fi if test "$_theora" = yes ; then |