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

diff --git a/Makefile.am b/Makefile.am
index e28142fa9b3921ca01376103c999c87e155dbd51..61603fbcdb98144fb38d88fcc74ff310136a8f09 100644 (file)
--- 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 257fd34b241f1344509c4d35443e39f3555fef42..ea8f366aff871173c0bf7c7c2152eca099dfe80f 100644 (file)
--- 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