diff options
| author | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-10-29 16:50:34 +0000 |
|---|---|---|
| committer | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-10-29 16:50:34 +0000 |
| commit | 19259744eea58f9d3c5dd40f0f3f6d06896f4afc (patch) | |
| tree | 37b1f8e3c0c1ee722714f9ebbf64c9216c4a7aac /configure | |
| parent | 94f5f95d31614f41dcc40771d1cfe3cf8a809cf7 (diff) | |
| download | mpv-19259744eea58f9d3c5dd40f0f3f6d06896f4afc.tar.bz2 mpv-19259744eea58f9d3c5dd40f0f3f6d06896f4afc.tar.xz | |
cleaned up liblzo detect and naming
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7960 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 37 |
1 files changed, 17 insertions, 20 deletions
@@ -155,7 +155,7 @@ Codecs: --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 @@ _iconv=auto _rtc=auto _ossaudio=auto _arts=auto -_lzo=auto +_liblzo=auto _mad=auto _vorbis=auto _faad=auto @@ -1082,8 +1082,8 @@ for ac_option do --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 @@ else 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 + cc_check -llzo && _liblzo=yes fi -if test "$_lzo" = yes ; then - _def_lzo='#define USE_LZO 1' - _ld_lzo='-llzo' - _codecmodules="lzo $_codecmodules" - _mkf_lzo="yes" +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" + _def_liblzo='#undef USE_LIBLZO' + _nocodecmodules="liblzo $_nocodecmodules" fi -echores "$_lzo" +echores "$_liblzo" echocheck "mad support" @@ -4520,8 +4518,7 @@ CDPARANOIA_INC = $_inc_cdparanoia 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_gif_4 $_def_freetype /* liblzo support */ -$_def_lzo +$_def_liblzo /* libmad support */ $_def_mad |