Mercurial > mplayer.hg

comparison configure @ 21262:aa706bcc07f0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move checking/defining HAVE_LINUX_DVD_STRUCT etc. to dvdcss check, since dvdread does not use them. Also seems to allow building with (external) dvdnav and internal dvdcss.
author reimar
date Sun, 26 Nov 2006 18:37:51 +0000
parents cc1d070fda33
children df74299363e8
comparison
equal deleted inserted replaced
21261:a2e02e6b6379 21262:aa706bcc07f0
5168 if test "$_dvdread_internal" = yes; then 5168 if test "$_dvdread_internal" = yes; then
5169 _def_dvdread_internal="#define USE_DVDREAD_INTERNAL 1" 5169 _def_dvdread_internal="#define USE_DVDREAD_INTERNAL 1"
5170 _def_dvdread='#define USE_DVDREAD 1' 5170 _def_dvdread='#define USE_DVDREAD 1'
5171 _inputmodules="dvdread $_inputmodules" 5171 _inputmodules="dvdread $_inputmodules"
5172 _largefiles=yes 5172 _largefiles=yes
5173 elif test "$_dvdread" = yes; then
5174 _def_dvdread='#define USE_DVDREAD 1'
5175 _inputmodules="dvdread $_inputmodules"
5176 _largefiles=yes
5177 test "$_dvdnav" != yes && _ld_extra="$_ld_extra -ldvdread"
5178 else
5179 _def_dvdread_internal="#undef USE_DVDREAD_INTERNAL"
5180 _def_dvdread='#undef USE_DVDREAD'
5181 _noinputmodules="dvdread $_noinputmodules"
5182 fi
5183 echores "$_dvdread"
5184
5185
5186 echocheck "internal libdvdcss"
5187 if test "$_libdvdcss_internal" = auto ; then
5188 _libdvdcss_internal=no
5189 test "$_dvdread_internal" = yes && _libdvdcss_internal=yes
5190 fi
5191 if test "$_libdvdcss_internal" = yes ; then
5173 if linux || netbsd || openbsd || bsdos ; then 5192 if linux || netbsd || openbsd || bsdos ; then
5174 _def_dvd_linux='#define HAVE_LINUX_DVD_STRUCT 1' 5193 _def_dvd_linux='#define HAVE_LINUX_DVD_STRUCT 1'
5175 openbsd && _dev_dvd_openbsd='#define HAVE_OPENBSD_DVD_STRUCT 1' 5194 openbsd && _dev_dvd_openbsd='#define HAVE_OPENBSD_DVD_STRUCT 1'
5176 elif freebsd ; then 5195 elif freebsd ; then
5177 _def_dvd_bsd='#define HAVE_BSD_DVD_STRUCT 1' 5196 _def_dvd_bsd='#define HAVE_BSD_DVD_STRUCT 1'
5178 elif darwin ; then 5197 elif darwin ; then
5179 _def_dvd_darwin='#define DARWIN_DVD_IOCTL' 5198 _def_dvd_darwin='#define DARWIN_DVD_IOCTL'
5180 _ld_extra="$_ld_extra -framework IOKit" 5199 _ld_extra="$_ld_extra -framework IOKit"
5181 fi 5200 fi
5182 elif test "$_dvdread" = yes; then
5183 _def_dvdread='#define USE_DVDREAD 1'
5184 _inputmodules="dvdread $_inputmodules"
5185 _largefiles=yes
5186 test "$_dvdnav" != yes && _ld_extra="$_ld_extra -ldvdread"
5187 else
5188 _def_dvdread_internal="#undef USE_DVDREAD_INTERNAL"
5189 _def_dvdread='#undef USE_DVDREAD'
5190 _noinputmodules="dvdread $_noinputmodules"
5191 fi
5192 echores "$_dvdread"
5193
5194
5195 echocheck "internal libdvdcss"
5196 if test "$_libdvdcss_internal" = auto ; then
5197 _libdvdcss_internal=no
5198 test "$_dvdread_internal" = yes && _libdvdcss_internal=yes
5199 fi
5200 if test "$_libdvdcss_internal" = yes ; then
5201 _inputmodules="libdvdcss $_inputmodules" 5201 _inputmodules="libdvdcss $_inputmodules"
5202 else 5202 else
5203 _noinputmodules="libdvdcss $_noinputmodules" 5203 _noinputmodules="libdvdcss $_noinputmodules"
5204 fi 5204 fi
5205 echores "$_libdvdcss_internal" 5205 echores "$_libdvdcss_internal"