summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorStefano Pigozzi <stefano.pigozzi@gmail.com>2013-09-12 18:38:02 +0200
committerStefano Pigozzi <stefano.pigozzi@gmail.com>2013-09-12 18:45:40 +0200
commitfe7fed590aa3aa5f981c6fbae7cd1689da1cad09 (patch)
tree6da8b9f834c8ee270ec070b02479b695c3740cc8 /configure
parent86c05655d43083cea79a84764a3c5c114bac4eaa (diff)
downloadmpv-fe7fed590aa3aa5f981c6fbae7cd1689da1cad09.tar.bz2
mpv-fe7fed590aa3aa5f981c6fbae7cd1689da1cad09.tar.xz
macosx: always active bundle path lookup if cocoa is active
This is not really something you want to disable anyway. If there is no bundle the code already does it's falbacks anyway.
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure18
1 files changed, 0 insertions, 18 deletions
diff --git a/configure b/configure
index abf6982091..05f2f94031 100755
--- a/configure
+++ b/configure
@@ -317,7 +317,6 @@ 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 [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]
@@ -481,7 +480,6 @@ _cdda=auto
_coreaudio=auto
_corevideo=auto
_cocoa=auto
-_macosx_bundle=no
_enca=auto
_pthreads=auto
_ass=auto
@@ -723,7 +721,6 @@ for ac_option do
--disable-corevideo) _corevideo=no ;;
--enable-cocoa) _cocoa=yes ;;
--disable-cocoa) _cocoa=no ;;
- --enable-macosx-bundle) _macosx_bundle=yes ;;
--enable-manpage) _build_man=yes ;;
--disable-manpage) _build_man=no ;;
@@ -1579,19 +1576,6 @@ fi
echores "$_sys_sysinfo"
-if darwin; then
-
-echocheck "Mac OS X Bundle file locations"
-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"
-
-fi #if darwin
-
echocheck "pkg-config"
if $($_pkg_config --version > /dev/null 2>&1); then
if test "$_ld_static"; then
@@ -3167,7 +3151,6 @@ LIBQUVI = $_libquvi4
LIBQUVI9 = $_libquvi9
LIBGUESS = $_libguess
LIRC = $_lirc
-MACOSX_BUNDLE = $_macosx_bundle
MNG = $_mng
MPG123 = $_mpg123
OPENAL = $_openal
@@ -3258,7 +3241,6 @@ $def_termios
$def_dl
$def_dos_paths
$def_iconv
-$def_macosx_bundle
$def_priority