diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-07-28 17:18:07 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-07-28 17:18:07 +0000 |
commit | 81a931dd9dd7074bb9fd968c606f41f849397fe4 (patch) | |
tree | eb21d50c5d1d6ecead0eb543afc3bf7f73ee0fab /configure | |
parent | 5849495fdd0ab2bb9ca8bf903cbf133bd35ca41b (diff) | |
download | mpv-81a931dd9dd7074bb9fd968c606f41f849397fe4.tar.bz2 mpv-81a931dd9dd7074bb9fd968c606f41f849397fe4.tar.xz |
Move libdvdnav check before the CFLAGS section. It is still the last check
at this position.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27361 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 70 |
1 files changed, 35 insertions, 35 deletions
@@ -7593,6 +7593,41 @@ fi echores "$_maemo" fi +#this must be the last test to be performed or the ones following it will likely fail +#because libdvdnavmini is intentionally not linked against libdvdread (to permit mplayer +# to use its own copy of the library) +echocheck "DVD support (libdvdnav)" +if test "$_dvdnav" = auto ; then + if test "$_dvdread_internal" = yes ; then + _dvdnav=no + _res_comment="Disabled in favor of the internal copy of dvdread. Append --disable-dvdread-internal." + else + $_dvdnavconfig --version --minilibs >> $TMPLOG 2>&1 || _dvdnav=no + fi +fi +if test "$_dvdnav" = auto ; then + cat > $TMPC <<EOF +#include <inttypes.h> +#include <dvdnav/dvdnav.h> +int main(void) { dvdnav_t *dvd=0; return 0; } +EOF + _dvdnav=no + _dvdnavdir=`$_dvdnavconfig --cflags` + _dvdnavlibs=`$_dvdnavconfig --libs` + cc_check $_dvdnavdir $_dvdnavlibs $_ld_dl $_ld_pthread && _dvdnav=yes +fi +if test "$_dvdnav" = yes ; then + _largefiles=yes + _def_dvdnav='#define USE_DVDNAV 1' + _inc_extra="$_inc_extra `$_dvdnavconfig --cflags`" + _ld_extra="$_ld_extra `$_dvdnavconfig --minilibs`" + _inputmodules="dvdnav $_inputmodules" +else + _def_dvdnav='#undef USE_DVDNAV' + _noinputmodules="dvdnav $_noinputmodules" +fi +echores "$_dvdnav" + # linker paths should be the same for mencoder and mplayer _ld_tmp="" for I in $_libs_mplayer ; do @@ -7654,41 +7689,6 @@ fi cc_check -mno-omit-leaf-frame-pointer && CFLAG_NO_OMIT_LEAF_FRAME_POINTER="-mno-omit-leaf-frame-pointer" -#this must be the last test to be performed or the ones following it will likely fail -#because libdvdnavmini is intentionally not linked against libdvdread (to permit mplayer -# to use its own copy of the library) -echocheck "DVD support (libdvdnav)" -if test "$_dvdnav" = auto ; then - if test "$_dvdread_internal" = yes ; then - _dvdnav=no - _res_comment="Disabled in favor of the internal copy of dvdread. Append --disable-dvdread-internal." - else - $_dvdnavconfig --version --minilibs >> $TMPLOG 2>&1 || _dvdnav=no - fi -fi -if test "$_dvdnav" = auto ; then - cat > $TMPC <<EOF -#include <inttypes.h> -#include <dvdnav/dvdnav.h> -int main(void) { dvdnav_t *dvd=0; return 0; } -EOF - _dvdnav=no - _dvdnavdir=`$_dvdnavconfig --cflags` - _dvdnavlibs=`$_dvdnavconfig --libs` - cc_check $_dvdnavdir $_dvdnavlibs $_ld_dl $_ld_pthread && _dvdnav=yes -fi -if test "$_dvdnav" = yes ; then - _largefiles=yes - _def_dvdnav='#define USE_DVDNAV 1' - _inc_extra="$_inc_extra `$_dvdnavconfig --cflags`" - _ld_extra="$_ld_extra `$_dvdnavconfig --minilibs`" - _inputmodules="dvdnav $_inputmodules" -else - _def_dvdnav='#undef USE_DVDNAV' - _noinputmodules="dvdnav $_noinputmodules" -fi -echores "$_dvdnav" - ############################################################################# echo "Creating config.mak" cat > config.mak << EOF |