RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

configure: fix help for macosx-bundle from autodetected to disabled 

The help and configure result wrongly showed this feature was autodetected,
while it is infact disabled by default.
This commit is contained in:
Stefano Pigozzi 2013-08-23 00:15:18 +02:00
parent d4a874f726
commit cf2d0b882a
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure vendored
View File

@ -316,7 +316,7 @@ Optional features:
--disable-bluray disable Blu-ray support [autodetect] --disable-bluray disable Blu-ray support [autodetect]
--disable-dvdread disable libdvdread [autodetect] --disable-dvdread disable libdvdread [autodetect]
--disable-enca disable ENCA charset oracle library [autodetect] --disable-enca disable ENCA charset oracle library [autodetect]
--enable-macosx-bundle enable Mac OS X bundle file locations [autodetect] --enable-macosx-bundle enable Mac OS X bundle file locations [disabled]
--disable-pthreads disable Posix threads support [autodetect] --disable-pthreads disable Posix threads support [autodetect]
--disable-libass disable subtitle rendering with libass [autodetect] --disable-libass disable subtitle rendering with libass [autodetect]
--disable-libass-osd disable OSD rendering with libass [autodetect] --disable-libass-osd disable OSD rendering with libass [autodetect]
@ -479,7 +479,7 @@ _cdda=auto
_coreaudio=auto _coreaudio=auto
_corevideo=auto _corevideo=auto
_cocoa=auto _cocoa=auto
_macosx_bundle=auto _macosx_bundle=no
_enca=auto _enca=auto
_pthreads=auto _pthreads=auto
_ass=auto _ass=auto
@ -718,7 +718,6 @@ for ac_option do
--enable-cocoa) _cocoa=yes ;; --enable-cocoa) _cocoa=yes ;;
--disable-cocoa) _cocoa=no ;; --disable-cocoa) _cocoa=no ;;
--enable-macosx-bundle) _macosx_bundle=yes ;; --enable-macosx-bundle) _macosx_bundle=yes ;;
--disable-macosx-bundle) _macosx_bundle=no ;;
--enable-manpage) _build_man=yes ;; --enable-manpage) _build_man=yes ;;
--disable-manpage) _build_man=no ;; --disable-manpage) _build_man=no ;;
@ -1559,11 +1558,11 @@ echores "$_sys_sysinfo"
if darwin; then if darwin; then
echocheck "Mac OS X Bundle file locations" echocheck "Mac OS X Bundle file locations"
def_macosx_bundle='#undef CONFIG_MACOSX_BUNDLE'
test "$_macosx_bundle" = auto
if test "$_macosx_bundle" = yes ; then if test "$_macosx_bundle" = yes ; then
extra_ldflags="$extra_ldflags -headerpad_max_install_names" extra_ldflags="$extra_ldflags -headerpad_max_install_names"
def_macosx_bundle='#define CONFIG_MACOSX_BUNDLE 1' def_macosx_bundle='#define CONFIG_MACOSX_BUNDLE 1'
else
def_macosx_bundle='#undef CONFIG_MACOSX_BUNDLE'
fi fi
echores "$_macosx_bundle" echores "$_macosx_bundle"