[vlc-devel] commit: configure: Make sure old VLC.app building is optional on Mac OS X. (Pierre d'Herbemont )

git version control git at videolan.org
Thu Dec 31 17:08:52 CET 2009


vlc | branch: master | Pierre d'Herbemont <pdherbemont at free.fr> | Thu Dec 31 16:51:06 2009 +0100| [f954a0582e9cf3e2cfdc612fb3dbe14abbcf6a5a] | committer: Pierre d'Herbemont 

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

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f954a0582e9cf3e2cfdc612fb3dbe14abbcf6a5a
---

 Makefile.am  |    2 +-
 configure.ac |    4 ++++
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index e28142f..61603fb 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 257fd34..ea8f366 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




More information about the vlc-devel mailing list