Mercurial > mplayer.hg
changeset 992:a5a3d936b116
Changed to detect sdl in non-standard location, as suggested by Martin Aumueller <lists@reserv.at>.
| author | atmosfear |
|---|---|
| date | Mon, 04 Jun 2001 14:14:28 +0000 |
| parents | dab1e9e67d8c |
| children | dfa641c44d4a |
| files | configure |
| diffstat | 1 files changed, 11 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Mon Jun 04 12:17:51 2001 +0000 +++ b/configure Mon Jun 04 14:14:28 2001 +0000 @@ -126,7 +126,9 @@ --with-win32libdir=DIR windows codec files --with-csslibdir=DIR directory contains libcss.so shared library --with-cssincdir=DIR directory contains libcss header file (css.h) - (--with-css* only needed, if libCSS autodetect fails) + (--with-css* only needed, if libCSS autodetect fails) + --with-sdl-config=PATH specify location of sdl-config if it's not in your PATH + (example: --with-sdl-cofig=/usr/sdl/bin/sdl-config) --size-x=SIZE default screen width --size-y=SIZE default screen height @@ -176,6 +178,7 @@ fi _skip_cc_check=no +_sdlconfig='sdl-config' for ac_option do @@ -195,6 +198,9 @@ --disable-x11) _x11=no ;; + --with-sdl-config=*) + _sdlconfig=`echo $ac_option | cut -d '=' -f 2` + ;; esac done @@ -469,9 +475,9 @@ # Atmosfear: added SDL versioncheck and autodetect; removed warnings. _sdl=no -if $_cc $TMPC -o $TMPO -L/usr/lib/ -L/usr/local/lib/ -lSDL -lpthread &> /dev/null ; then - if test `sdl-config --version | sed s/[=[:punct:]=]//g` -gt 116 ; then - if test `sdl-config --version | sed s/[=[:punct:]=]//g` -lt 121 ; then +if $_cc $TMPC -o $TMPO `$_sdlconfig --libs` &> /dev/null ; then + if test `$_sdlconfig --version | sed s/[=[:punct:]=]//g` -gt 116 ; then + if test `$_sdlconfig --version | sed s/[=[:punct:]=]//g` -lt 121 ; then _sdlbuggy='#define BUGGY_SDL' else _sdlbuggy='#undef BUGGY_SDL' @@ -894,7 +900,7 @@ fi if [ $_sdl = yes ]; then - _sdllib='-lSDL -lpthread' + _sdllib=`$_sdlconfig --libs` fi if [ $_dga = yes ]; then