summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-04-22 21:48:28 +0000
committernicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-04-22 21:48:28 +0000
commit5c1be94ba33caae90e1effa7389215e4eb9ebf08 (patch)
tree7ff4b6ca125a9beea67ac3f995e5a10f96e3fd07
parentda8d898ffef3cf37243a8f821b0f948f6ec1be77 (diff)
downloadmpv-5c1be94ba33caae90e1effa7389215e4eb9ebf08.tar.bz2
mpv-5c1be94ba33caae90e1effa7389215e4eb9ebf08.tar.xz
added support for dvdread-config (from our svn), called as fallback when dvdread isn't detected
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26497 b3059339-0415-0410-9bf9-f77b7e298cf2
-rwxr-xr-xconfigure17
1 files changed, 17 insertions, 0 deletions
diff --git a/configure b/configure
index b7f7d7aba3..76e1ca0ecf 100755
--- a/configure
+++ b/configure
@@ -451,6 +451,7 @@ multiple paths separated by ':'):
--with-gtk-config=PATH path to gtk*-config
--with-sdl-config=PATH path to sdl*-config
--with-dvdnav-config=PATH path to dvdnav-config
+ --with-dvdread-config=PATH path to dvdread-config
This configure script is NOT autoconf-based, even though its output is similar.
It will try to autodetect all configuration options. If you --enable an option
@@ -576,6 +577,7 @@ _ladspa=auto
_xmms=no
_dvdnav=auto
_dvdnavconfig=dvdnav-config
+_dvdreadconfig=dvdread-config
_dvdread=auto
_dvdread_internal=auto
_libdvdcss_internal=auto
@@ -741,6 +743,9 @@ for ac_option do
--with-dvdnav-config=*)
_dvdnavconfig=`echo $ac_option | cut -d '=' -f 2`
;;
+ --with-dvdread-config=*)
+ _dvdreadconfig=`echo $ac_option | cut -d '=' -f 2`
+ ;;
--extra-libs=*)
_extra_libs=`echo $ac_option | cut -d '=' -f 2`
@@ -5435,6 +5440,18 @@ EOF
cc_check -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \
-ldvdread $_ld_dl && _dvdread=yes && _res_comment="external"
fi
+ if test "$_dvdread" = no ; then
+ _dvdreadconfig="dvdread-config"
+ _dvdreadcflags=`$_dvdreadconfig --cflags`
+ _dvdreadlibs=`$_dvdreadconfig --libs`
+ if cc_check -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \
+ $_dvdreadcflags $_dvdreadlibs $_ld_dl ; then
+ _dvdread=yes
+ _inc_extra="$_inc_extra $_dvdreadcflags"
+ _ld_extra="$_ld_extra $_dvdreadlibs"
+ _res_comment="external"
+ fi
+ fi
fi
if test "$_dvdread_internal" = yes; then