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

f954a058 · Pierre d'Herbemont · d254ae08 · f954a058 · f954a058
Commit f954a058 authored Dec 31, 2009 by Pierre d'Herbemont
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

Makefile.am Makefile.am +1 -1

configure.ac configure.ac +4 -0

No files found.
--- 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

--- 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