comparison configure @ 25022:78761aa9b8b3

removed unneeded checks on the version of dvdnav (the acceptance of --minilibs guarantees it's ok) and unneeded assignments
author nicodvb
date Wed, 14 Nov 2007 22:20:19 +0000
parents be9cd6001a7d
children 03d7f478c367
comparison
equal deleted inserted replaced
25021:fb6908f555bf 25022:78761aa9b8b3
7524 int main(void) { dvdnav_t *dvd=0; return 0; } 7524 int main(void) { dvdnav_t *dvd=0; return 0; }
7525 EOF 7525 EOF
7526 _dvdnav=no 7526 _dvdnav=no
7527 _dvdnavdir=`$_dvdnavconfig --cflags` 7527 _dvdnavdir=`$_dvdnavconfig --cflags`
7528 _dvdnavlibs=`$_dvdnavconfig --libs` 7528 _dvdnavlibs=`$_dvdnavconfig --libs`
7529 _dvdnavvsn=`$_dvdnavconfig --version | sed "s/\.//g"`
7530 _dvdnavmajor=`echo $_dvdnavvsn | cut -d. -f2`
7531 test "$_dvdnavmajor" -ge 2 -o "$_dvdnavvsn" -ge 0110 && \
7532 cc_check $_dvdnavdir $_dvdnavlibs $_ld_dl $_ld_pthread && _dvdnav=yes 7529 cc_check $_dvdnavdir $_dvdnavlibs $_ld_dl $_ld_pthread && _dvdnav=yes
7533 fi 7530 fi
7534 if test "$_dvdnav" = yes ; then 7531 if test "$_dvdnav" = yes ; then
7535 _largefiles=yes 7532 _largefiles=yes
7536 _def_dvdnav='#define USE_DVDNAV 1' 7533 _def_dvdnav='#define USE_DVDNAV 1'
7537 _dvdnav_version=`$_dvdnavconfig --version | sed "s/\.//g"`
7538 _def_dvdnav_version="#define DVDNAVVERSION $_dvdnav_version"
7539 _inc_extra="$_inc_extra `$_dvdnavconfig --cflags`" 7534 _inc_extra="$_inc_extra `$_dvdnavconfig --cflags`"
7540 _ld_extra="$_ld_extra `$_dvdnavconfig --minilibs`" 7535 _ld_extra="$_ld_extra `$_dvdnavconfig --minilibs`"
7541 _inputmodules="dvdnav $_inputmodules" 7536 _inputmodules="dvdnav $_inputmodules"
7542 else 7537 else
7543 _def_dvdnav='#undef USE_DVDNAV' 7538 _def_dvdnav='#undef USE_DVDNAV'
8052 */ 8047 */
8053 $_def_lircc 8048 $_def_lircc
8054 8049
8055 /* DVD navigation support using libdvdnav */ 8050 /* DVD navigation support using libdvdnav */
8056 $_def_dvdnav 8051 $_def_dvdnav
8057 $_def_dvdnav_version
8058 8052
8059 /* Define this to enable MPEG 1/2 image postprocessing (requires a FAST CPU!) */ 8053 /* Define this to enable MPEG 1/2 image postprocessing (requires a FAST CPU!) */
8060 #define MPEG12_POSTPROC 1 8054 #define MPEG12_POSTPROC 1
8061 8055
8062 /* Define this to enable image postprocessing in libavcodec (requires a FAST CPU!) */ 8056 /* Define this to enable image postprocessing in libavcodec (requires a FAST CPU!) */