diff options
author | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-04-16 17:29:04 +0000 |
---|---|---|
committer | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-04-16 17:29:04 +0000 |
commit | f974b8e83f90d1288d47ff4e0317abcc3a4fc31b (patch) | |
tree | f076da8b457b744f9b0d564adadab8b6849ee627 /configure | |
parent | 0b657de32c1aa7c1b9fd598224f97a48a247ebc0 (diff) | |
download | mpv-f974b8e83f90d1288d47ff4e0317abcc3a4fc31b.tar.bz2 mpv-f974b8e83f90d1288d47ff4e0317abcc3a4fc31b.tar.xz |
fix dvdnav detection
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5651 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 17 |
1 files changed, 13 insertions, 4 deletions
@@ -144,6 +144,8 @@ Optional features: --enable-joystick enable joystick support in new input [disable] --enable-i18n GNU internationalisation [disable] --disable-runtime-cpudetection disable runtime CPU detection [enable] + --disable-dvdnav Disable dvdnav support [autodetect] + Video: --enable-gl build with OpenGL render support [autodetect] --enable-dga[=n] build with DGA [n in {1, 2} ] support [autodetect] @@ -782,7 +784,7 @@ _mad=auto _vorbis=auto _faad=auto _css=auto -_dvdnav=no +_dvdnav=yes _dvdread=auto _xanim=auto _xinerama=auto @@ -893,6 +895,8 @@ for ac_option do --disable-css) _css=no ;; --enable-dvdread) _dvdread=yes ;; --disable-dvdread) _dvdread=no ;; + --enable-dvdnav) _dvdnav=yes ;; + --disable-dvdnav) _dvdnav=no ;; --enable-xanim) _xanim=yes ;; --disable-xanim) _xanim=no ;; --enable-xinerama) _xinerama=yes ;; @@ -2504,13 +2508,18 @@ if test "$_dvdnav" = yes ; then int main(void) { dvdnav_t *dvd=0; return 0; } EOF _dvdnav=no - cc_check $_inc_extra -I$_dvdnavdir $_ld_css -L$_dvdnavdir/.libs -ldvdnav && _dvdnav=yes + if test -n "$_dvdnavdir" ; then + _legal_dvdnavdir=-L$_dvdnavdir/.libs + fi + cc_check $_inc_extra -I$_dvdnavdir $_legal_dvdnavdir -ldvdnav $_ld_css $_ld_dl && _dvdnav=yes fi if test "$_dvdnav" = yes ; then _largefiles=yes _def_dvdnav='#define USE_DVDNAV 1' - _ld_css="$_ld_css -L$_dvdnavdir/.libs -ldvdnav" - _inc_extra="$_inc_extra -I$_dvdnavdir" + _ld_css="$_ld_css $_legal_dvdnavdir -ldvdnav" + if test -n "$_dvdnavdir" ; then + _inc_extra="$_inc_extra -I$_dvdnavdir" + fi _inputmodules="dvdnav $_inputmodules" echores "yes" else |