Mercurial > mplayer.hg
changeset 26465:6b804575c306
added support for dvdread-config (from our svn), called as fallback when dvdread isn't detected
| author | nicodvb |
|---|---|
| date | Tue, 22 Apr 2008 21:48:28 +0000 |
| parents | 252ec5ba2dd3 |
| children | d4f4ce3534c3 |
| files | configure |
| diffstat | 1 files changed, 17 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Tue Apr 22 21:21:46 2008 +0000 +++ b/configure Tue Apr 22 21:48:28 2008 +0000 @@ -451,6 +451,7 @@ --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 @@ _xmms=no _dvdnav=auto _dvdnavconfig=dvdnav-config +_dvdreadconfig=dvdread-config _dvdread=auto _dvdread_internal=auto _libdvdcss_internal=auto @@ -741,6 +743,9 @@ --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 @@ 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