diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2011-01-20 11:21:34 +0000 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2011-01-31 16:03:10 +0200 |
commit | 1ff555e2ed45f44904145990bd040d95d1184538 (patch) | |
tree | 8dada65d1ed00acaad2565c114c6db1040720fdb /configure | |
parent | 5cb40ec42ff36d0e639937546eac74af19740a5b (diff) | |
download | mpv-1ff555e2ed45f44904145990bd040d95d1184538.tar.bz2 mpv-1ff555e2ed45f44904145990bd040d95d1184538.tar.xz |
configure: add return_check and return_statement_check helpers
cosmetics: Move header_check helper function.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32803 b3059339-0415-0410-9bf9-f77b7e298cf2
Add return_check() helper function and use it to simplify some checks.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32805 b3059339-0415-0410-9bf9-f77b7e298cf2
Add return_statement_check() helper function and use it to simplify some checks.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32806 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 55 |
1 files changed, 25 insertions, 30 deletions
@@ -73,6 +73,24 @@ EOF compile_check $TMPC $@ } +header_check() { + cat > $TMPC << EOF +#include <$1> +int main(void) { return 0; } +EOF + shift + compile_check $TMPC $@ +} + +return_check() { + cat > $TMPC << EOF +#include <$1> +int main(void) { return $2; } +EOF + shift 2 + compile_check $TMPC $@ +} + statement_check() { cat > $TMPC << EOF #include <$1> @@ -93,12 +111,12 @@ EOF compile_check $TMPC $@ } -header_check() { +return_statement_check() { cat > $TMPC << EOF #include <$1> -int main(void) { return 0; } +int main(void) { $2; return $3; } EOF - shift + shift 3 compile_check $TMPC $@ } @@ -4030,13 +4048,7 @@ echocheck "VDPAU" if test "$_vdpau" = auto ; then _vdpau=no if test "$_dl" = yes ; then - cat > $TMPC <<EOF -#include <vdpau/vdpau_x11.h> -int main(void) { - vdp_device_create_x11(0, 0, 0, 0); - return VDP_VIDEO_MIXER_FEATURE_HIGH_QUALITY_SCALING_L1; } -EOF - cc_check -lvdpau && _vdpau=yes + return_statement_check vdpau/vdpau_x11.h 'vdp_device_create_x11(0, 0, 0, 0)' VDP_VIDEO_MIXER_FEATURE_HIGH_QUALITY_SCALING_L1 -lvdpau && _vdpau=yes fi fi if test "$_vdpau" = yes ; then @@ -4090,11 +4102,7 @@ echores "$_vm" echocheck "XF86keysym" if test "$_xf86keysym" = auto; then _xf86keysym=no - cat > $TMPC <<EOF -#include <X11/XF86keysym.h> -int main(void) { return XF86XK_AudioPause; } -EOF - cc_check && _xf86keysym=yes + return_check X11/XF86keysym.h XF86XK_AudioPause && _xf86keysym=yes fi if test "$_xf86keysym" = yes ; then def_xf86keysym='#define CONFIG_XF86XK 1' @@ -4484,16 +4492,7 @@ fi echocheck "MNG support" if test "$_mng" = auto ; then _mng=no - cat > $TMPC << EOF -#include <libmng.h> -int main(void) { - const char * p_ver = mng_version_text(); - return !p_ver || p_ver[0] == 0; -} -EOF - if cc_check -lmng -lz $_ld_lm ; then - _mng=yes - fi + return_statement_check libmng.h 'const char * p_ver = mng_version_text()' '!p_ver || p_ver[0] == 0' -lmng -lz $_ld_lm && _mng=yes fi echores "$_mng" if test "$_mng" = yes ; then @@ -4995,12 +4994,8 @@ echores "$_v4l2" echocheck "OSS Audio" if test "$_ossaudio" = auto ; then - cat > $TMPC << EOF -#include <$_soundcard_header> -int main(void) { return SNDCTL_DSP_SETFRAGMENT; } -EOF _ossaudio=no - cc_check && _ossaudio=yes + return_check $_soundcard_header SNDCTL_DSP_SETFRAGMENT && _ossaudio=yes fi if test "$_ossaudio" = yes ; then def_ossaudio='#define CONFIG_OSS_AUDIO 1' |