[vlc-devel] [VLC 3.x v2 2/2] package/macosx: Fix bundling without Growl framework

[Marvin Scholz]

When the macOS notifications module was disabled due to lack of Growl
framework in contribs, this was not properly checked for in the package
Makefile, resulting in a failure due to the missing framework.
---
 configure.ac                      | 3 +++
 extras/package/macosx/package.mak | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/configure.ac b/configure.ac
index 14f80f7c13..9b41afb17c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4200,8 +4200,11 @@ AS_IF([test "${enable_osx_notifications}" != "no"], [
       VLC_ADD_PLUGIN([osx_notifications])
       VLC_ADD_LIBS([osx_notifications], [-Wl,-framework,Growl,-framework,Foundation])
       VLC_ADD_OBJCFLAGS([osx_notifications], [-fobjc-exceptions] )
+  else
+      enable_osx_notifications="no"
   fi
 ])
+AM_CONDITIONAL(HAVE_OSX_NOTIFICATIONS, [test "$enable_osx_notifications" != "no"])
 
 dnl
 dnl Libnotify notification plugin
diff --git a/extras/package/macosx/package.mak b/extras/package/macosx/package.mak
index 2deaaeec73..31d8ba665d 100644
--- a/extras/package/macosx/package.mak
+++ b/extras/package/macosx/package.mak
@@ -24,7 +24,9 @@ VLC.app: install
 	xcrun plutil -convert binary1 $@/Contents/Info.plist
 	## Create Frameworks dir and copy required ones
 	mkdir -p $@/Contents/Frameworks
+if HAVE_OSX_NOTIFICATIONS
 	cp -R $(CONTRIB_DIR)/Frameworks/Growl.framework $@/Contents/Frameworks
+endif
 if HAVE_SPARKLE
 	cp -R $(CONTRIB_DIR)/Frameworks/Sparkle.framework $@/Contents/Frameworks
 endif
-- 
2.30.1