summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefano Pigozzi <stefano.pigozzi@gmail.com>2013-08-23 00:15:18 +0200
committerwm4 <wm4@nowhere>2013-08-29 19:19:35 +0200
commit669f5d42f0a729655567fa0a6a353e68a56c16fb (patch)
tree632623c7d73979b17169d2415026dd7b9d15d0e3
parentf0d245ce4b0c1dfc5d66a1d51f7080195756055d (diff)
downloadmpv-669f5d42f0a729655567fa0a6a353e68a56c16fb.tar.bz2
mpv-669f5d42f0a729655567fa0a6a353e68a56c16fb.tar.xz
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.
-rwxr-xr-xconfigure9
1 files changed, 4 insertions, 5 deletions
diff --git a/configure b/configure
index 25d755918f..fec2dd0f51 100755
--- a/configure
+++ b/configure
@@ -316,7 +316,7 @@ Optional features:
--disable-bluray disable Blu-ray support [autodetect]
--disable-dvdread disable libdvdread [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-libass disable subtitle rendering with libass [autodetect]
--disable-libass-osd disable OSD rendering with libass [autodetect]
@@ -474,7 +474,7 @@ _cdda=auto
_coreaudio=auto
_corevideo=auto
_cocoa=auto
-_macosx_bundle=auto
+_macosx_bundle=no
_enca=auto
_pthreads=auto
_ass=auto
@@ -709,7 +709,6 @@ for ac_option do
--enable-cocoa) _cocoa=yes ;;
--disable-cocoa) _cocoa=no ;;
--enable-macosx-bundle) _macosx_bundle=yes ;;
- --disable-macosx-bundle) _macosx_bundle=no ;;
--enable-manpage) _build_man=yes ;;
--disable-manpage) _build_man=no ;;
@@ -1550,11 +1549,11 @@ echores "$_sys_sysinfo"
if darwin; then
echocheck "Mac OS X Bundle file locations"
-def_macosx_bundle='#undef CONFIG_MACOSX_BUNDLE'
-test "$_macosx_bundle" = auto
if test "$_macosx_bundle" = yes ; then
extra_ldflags="$extra_ldflags -headerpad_max_install_names"
def_macosx_bundle='#define CONFIG_MACOSX_BUNDLE 1'
+else
+ def_macosx_bundle='#undef CONFIG_MACOSX_BUNDLE'
fi
echores "$_macosx_bundle"