diff options
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 29 |
1 files changed, 20 insertions, 9 deletions
@@ -1076,6 +1076,7 @@ fi _prefix="/usr/local" _xvmclib="XvMCNVIDIA" +_xvidcore="xvidcore" # GOTCHA: the variables below defines the default behavior for autodetection # and have - unless stated otherwise - at least 2 states : yes no @@ -4932,21 +4933,30 @@ cat > $TMPC << EOF #include <xvid.h> int main(void) { xvid_init(0, 0, 0, 0); return 0; } EOF -if test "$_xvid" != no && cc_check "$_xvidcore" -lm ; then +if test "$_xvid" != no && cc_check -l$_xvidcore -lm ; then _xvid=yes - _ld_xvid="$_xvidcore" - _def_xvid='#define HAVE_XVID 1' + _ld_xvid="-l$_xvidcore" + _def_xvid3='#define HAVE_XVID3 1' + _def_xvid4='#undef HAVE_XVID4' _codecmodules="xvid $_codecmodules" -elif test "$_xvid" != no && cc_check -lxvidcore -lm ; then +else +cat > $TMPC << EOF +#include <xvid.h> +int main(void) { xvid_global(0, 0, 0, 0); return 0; } +EOF + if test "$_xvid" != no && cc_check -l$_xvidcore -lm ; then _xvid=yes - _ld_xvid='-lxvidcore' - _def_xvid='#define HAVE_XVID 1' + _ld_xvid="-l$_xvidcore" + _def_xvid3='#undef HAVE_XVID3' + _def_xvid4='#define HAVE_XVID4 1' _codecmodules="xvid $_codecmodules" -else + else _xvid=no _ld_xvid='' - _def_xvid='#undef HAVE_XVID' + _def_xvid3='#undef HAVE_XVID3' + _def_xvid4='#undef HAVE_XVID4' _nocodecmodules="xvid $_nocodecmodules" + fi fi echores "$_xvid" @@ -5930,7 +5940,8 @@ $_def_decore $_def_divx5 /* Define if you are using XviD library */ -$_def_xvid +$_def_xvid3 +$_def_xvid4 $_def_decore_xvid $_def_encore_xvid |