summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorStefano Pigozzi <stefano.pigozzi@gmail.com>2013-08-23 00:15:18 +0200
committerStefano Pigozzi <stefano.pigozzi@gmail.com>2013-08-25 12:21:34 +0200
commitcf2d0b882a05f3f49df2b42fe285f47ae2f5663b (patch)
treeecbe0cb2dee9f2e201321958d0f80eea0edb5798 /configure
parentd4a874f726e091cd84b997ed447c0284f4a5cec7 (diff)
downloadmpv-cf2d0b882a05f3f49df2b42fe285f47ae2f5663b.tar.bz2
mpv-cf2d0b882a05f3f49df2b42fe285f47ae2f5663b.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.
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure9
1 files changed, 4 insertions, 5 deletions
diff --git a/configure b/configure
index 64cb7ea7ac..d0d6e3235c 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]
@@ -479,7 +479,7 @@ _cdda=auto
_coreaudio=auto
_corevideo=auto
_cocoa=auto
-_macosx_bundle=auto
+_macosx_bundle=no
_enca=auto
_pthreads=auto
_ass=auto
@@ -718,7 +718,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 ;;
@@ -1559,11 +1558,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"