From fe7fed590aa3aa5f981c6fbae7cd1689da1cad09 Mon Sep 17 00:00:00 2001
From: Stefano Pigozzi <stefano.pigozzi@gmail.com>
Date: Thu, 12 Sep 2013 18:38:02 +0200
Subject: 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.
---
 Makefile       |  2 +-
 configure      | 18 ------------------
 mpvcore/path.c |  4 ++--
 3 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/Makefile b/Makefile
index f35cf56a85..a689b3130c 100644
--- a/Makefile
+++ b/Makefile
@@ -44,8 +44,8 @@ SOURCES-$(LIBBS2B)              += audio/filter/af_bs2b.c
 SOURCES-$(LIBPOSTPROC)          += video/filter/vf_pp.c
 SOURCES-$(LIBSMBCLIENT)         += stream/stream_smb.c
 
-SOURCES-$(MACOSX_BUNDLE)        += osdep/macosx_bundle.m
 SOURCES-$(COCOA)                += video/out/cocoa_common.m \
+                                   osdep/macosx_bundle.m \
                                    osdep/macosx_application.m \
                                    osdep/macosx_events.m \
                                    osdep/ar/HIDRemote.m
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
 
 
diff --git a/mpvcore/path.c b/mpvcore/path.c
index c5466b22f2..ae12f20e68 100644
--- a/mpvcore/path.c
+++ b/mpvcore/path.c
@@ -46,7 +46,7 @@
 #include <sys/cygwin.h>
 #endif
 
-#ifdef CONFIG_MACOSX_BUNDLE
+#ifdef CONFIG_COCOA
 #include "osdep/macosx_bundle.h"
 #endif
 
@@ -54,7 +54,7 @@
 typedef char *(*lookup_fun)(const char *);
 static const lookup_fun config_lookup_functions[] = {
     mp_find_user_config_file,
-#ifdef CONFIG_MACOSX_BUNDLE
+#ifdef CONFIG_COCOA
     get_bundled_path,
 #endif
     mp_find_global_config_file,
-- 
cgit v1.2.3