From 64060df2c73a4db6c1cda20deb8d49ed0d77646f Mon Sep 17 00:00:00 2001
From: iive <iive@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Wed, 12 Nov 2003 00:43:42 +0000
Subject: XviD Api4 support

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11437 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 configure | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index 1ca296ec59..c64fd7cbd0 100755
--- a/configure
+++ b/configure
@@ -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
 
-- 
cgit v1.2.3