diff options
| author | wm4 <wm4@nowhere> | 2013-06-25 00:43:04 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-06-25 00:43:04 +0200 |
| commit | 403a266d466850621397c07e0b96cc2c493b2936 (patch) | |
| tree | 0835a0908b3df8cca8374d173c34e0bf7df7d842 /configure | |
| parent | 536871d7e5848eb385b97202a33b9382b5e8ab0e (diff) | |
| parent | 54851d60614e912fc422658302d72811a31b80f8 (diff) | |
| download | mpv-403a266d466850621397c07e0b96cc2c493b2936.tar.bz2 mpv-403a266d466850621397c07e0b96cc2c493b2936.tar.xz | |
Merge branch 'sub_mess2'
...the return.
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 21 |
1 files changed, 21 insertions, 0 deletions
@@ -292,6 +292,7 @@ Installation directories: Optional features: --disable-encoding disable encoding functionality [enable] + --disable-libguess disable libguess [autodetect] --enable-termcap use termcap database for key codes [autodetect] --enable-termios use termios database for key codes [autodetect] --disable-iconv disable iconv for encoding conversion [autodetect] @@ -465,6 +466,7 @@ networking=yes _winsock2_h=auto _smb=auto _libquvi=auto +_libguess=auto _joystick=no _lirc=auto _lircc=auto @@ -666,6 +668,8 @@ for ac_option do --disable-smb) _smb=no ;; --enable-libquvi) _libquvi=yes ;; --disable-libquvi) _libquvi=no ;; + --enable-libguess) _libguess=yes ;; + --disable-libguess) _libguess=no ;; --enable-joystick) _joystick=yes ;; --disable-joystick) _joystick=no ;; --enable-libav) ffmpeg=yes ;; @@ -1687,6 +1691,21 @@ else fi +echocheck "libguess support" +if test "$_libguess" = auto ; then + _libguess=no + if pkg_config_add 'libguess >= 1.0' ; then + _libguess=yes + fi +fi +if test "$_libguess" = yes; then + def_libguess="#define CONFIG_LIBGUESS 1" +else + def_libguess="#undef CONFIG_LIBGUESS" +fi +echores "$_libguess" + + echocheck "Samba support (libsmbclient)" if test "$_smb" = yes; then libs_mplayer="$libs_mplayer -lsmbclient" @@ -3171,6 +3190,7 @@ VF_LAVFI = $vf_lavfi AF_LAVFI = $af_lavfi LIBSMBCLIENT = $_smb LIBQUVI = $_libquvi +LIBGUESS = $_libguess LIBTHEORA = $_theora LIRC = $_lirc MACOSX_BUNDLE = $_macosx_bundle @@ -3369,6 +3389,7 @@ $def_inet_pton $def_networking $def_smb $def_libquvi +$def_libguess $def_socklen_t $def_vstream |