diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-08-18 02:29:37 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-08-18 02:29:37 +0300 |
| commit | 95da34aa071d64b21ef3e952b987ba3dcee84ca0 (patch) | |
| tree | eabf4399e40fd270714c53d40688eadadfd4c5ff /configure | |
| parent | f394231f5de9d1ff679f1b2da4d1f1b303ae914a (diff) | |
| parent | 3961e12fca2f1ec10c64e3ff298828feecca52c9 (diff) | |
| download | mpv-95da34aa071d64b21ef3e952b987ba3dcee84ca0.tar.bz2 mpv-95da34aa071d64b21ef3e952b987ba3dcee84ca0.tar.xz | |
Merge svn changes up to r29532
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -2755,8 +2755,9 @@ language_man=$tmp_language_man test -z "$language_man" && language_man=en for lang in $language_msg ; do - test -f "help/help_mp-${lang}.h" && language_msg=$lang && break + test -f "help/help_mp-${lang}.h" && tmp_language_msg=$lang && break done +language_msg=$tmp_language_msg test -z "$language_msg" && language_msg=en _mp_help="help/help_mp-${language_msg}.h" echores "messages: $language_msg - man pages: $language_man - documentation: $language_doc" @@ -7379,7 +7380,7 @@ if test "$_pvr" = auto ; then #include <inttypes.h> #include <linux/types.h> #include <linux/videodev2.h> -int main(void) { struct v4l2_ext_controls ext; return 0; } +int main(void) { struct v4l2_ext_controls ext; return ext.controls->value; } EOF cc_check && _pvr=yes fi @@ -7940,6 +7941,7 @@ CONFIG_XVMC=$_xvmc CONFIG_ZLIB=$_zlib HAVE_PTHREADS = $_pthreads +HAVE_SHM = $_shm HAVE_W32THREADS = $_w32threads HAVE_YASM = $_have_yasm |