Mercurial > mplayer.hg
changeset 7959:9b8dd240314d
cleaned up liblzo detect and naming
| author | alex |
|---|---|
| date | Tue, 29 Oct 2002 16:50:34 +0000 |
| parents | 2a5def1e08d7 |
| children | 0a4ab841ae29 |
| files | configure libmpcodecs/vd_lzo.c |
| diffstat | 2 files changed, 20 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Tue Oct 29 16:40:45 2002 +0000 +++ b/configure Tue Oct 29 16:50:34 2002 +0000 @@ -155,7 +155,7 @@ --enable-gif enable gif89a output support [autodetect] --enable-png enable png input/output support [autodetect] --enable-jpeg enable jpeg input/output support [autodetect] - --enable-lzo enable lzo input support [autodetect] + --enable-liblzo enable external liblzo support [autodetect] --disable-win32 disable Win32 DLL support [autodetect] --disable-dshow disable Win32/DirectShow support [autodetect] --disable-xanim disable XAnim DLL support [autodetect] @@ -954,7 +954,7 @@ _rtc=auto _ossaudio=auto _arts=auto -_lzo=auto +_liblzo=auto _mad=auto _vorbis=auto _faad=auto @@ -1082,8 +1082,8 @@ --disable-arts) _arts=no ;; --enable-mad) _mad=yes ;; --disable-mad) _mad=no ;; - --enable-lzo) _lzo=yes ;; - --disable-lzo) _lzo=no ;; + --enable-liblzo) _liblzo=yes ;; + --disable-liblzo) _liblzo=no ;; --enable-vorbis) _vorbis=yes ;; --disable-vorbis) _vorbis=no ;; --enable-faad) _faad=yes ;; @@ -3431,26 +3431,24 @@ fi -echocheck "lzo support" -if test "$_lzo" = auto ; then - _lzo=no +echocheck "external liblzo support" +if test "$_liblzo" = auto ; then + _liblzo=no cat > $TMPC << EOF #include <lzo1x.h> int main(void) { lzo_init();return 0; } EOF - cc_check -llzo && _lzo=yes -fi -if test "$_lzo" = yes ; then - _def_lzo='#define USE_LZO 1' - _ld_lzo='-llzo' - _codecmodules="lzo $_codecmodules" - _mkf_lzo="yes" + cc_check -llzo && _liblzo=yes +fi +if test "$_liblzo" = yes ; then + _def_liblzo='#define USE_LIBLZO 1' + _ld_liblzo='-lliblzo' + _codecmodules="liblzo $_codecmodules" else - _def_lzo='#undef USE_LZO' - _nocodecmodules="lzo $_nocodecmodules" - _mkf_lzo="no" -fi -echores "$_lzo" + _def_liblzo='#undef USE_LIBLZO' + _nocodecmodules="liblzo $_nocodecmodules" +fi +echores "$_liblzo" echocheck "mad support" @@ -4520,8 +4518,7 @@ CDPARANOIA_LIB = $_ld_cdparanoia FREETYPE_INC = $_inc_freetype FREETYPE_LIB = $_ld_freetype -LZO= $_mkf_lzo -LZO_LIB= $_ld_lzo +LIBLZO_LIB= $_ld_liblzo MAD_LIB = $_ld_mad VORBIS_LIB = $_ld_vorbis $_ld_libdv FAAD_LIB = $_ld_faad @@ -4869,7 +4866,7 @@ $_def_freetype /* liblzo support */ -$_def_lzo +$_def_liblzo /* libmad support */ $_def_mad