From: Pierre d'Herbemont <pdherbemont@free.fr>
Date: Thu, 31 Dec 2009 15:51:06 +0000 (+0100)
Subject: configure: Make sure old VLC.app building is optional on Mac OS X.
X-Git-Tag: 1.1.0-ff~1533
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=f954a0582e9cf3e2cfdc612fb3dbe14abbcf6a5a;p=vlc

configure: Make sure old VLC.app building is optional on Mac OS X.
---

diff --git a/Makefile.am b/Makefile.am
index e28142fa9b..61603fbcdb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -410,7 +410,7 @@ vlc$(EXEEXT):
 	ln -sf bin/vlc-static$(EXEEXT) vlc$(EXEEXT)
 
 if HAVE_DARWIN
-if BUILD_VLC
+if BUILD_MACOSX_VLC_APP
 # Create the MacOS X app
 noinst_DATA = VLC.app
 endif
diff --git a/configure.ac b/configure.ac
index 257fd34b24..ea8f366aff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4439,6 +4439,10 @@ then
   VLC_ADD_PLUGIN([access_eyetv])
 fi
 
+AC_ARG_ENABLE(macosx-vlc-app,
+  [  --enable-macosx-vlc-app            build the VLC media player (default enabled on Mac OS X)])
+AM_CONDITIONAL(BUILD_MACOSX_VLC_APP, [test "${enable_macosx_vlc_app}" != "no" &&
+    (test "${SYS}" = "darwin" || test "${enable_macosx_vlc_app}" = "yes") ])
 
 
 dnl