[vlc-commits] OSX: Sparkle is not optional

[Rafaël Carré]

vlc/vlc-1.2 | branch: master | Rafaël Carré <funman at videolan.org> | Tue Dec  6 17:11:52 2011 -0500| [018583095db11d623b6c3a612c92e14cdfcfd109] | committer: Jean-Baptiste Kempf

OSX: Sparkle is not optional

Should close #5609
(cherry picked from commit 70264925b42781cc7fad6d54b0406b6db8f9dce9)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 configure.ac                      |   12 +++++++-----
 modules/gui/macosx/intf.m         |    6 +-----
 modules/gui/macosx/simple_prefs.m |    6 +-----
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/configure.ac b/configure.ac
index 8fb2363..b2ffe50 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3781,11 +3781,13 @@ then
 
   VLC_ADD_LIBS([macosx], [-Wl,-framework,QTKit -Wl,-framework,IOKit -Wl,-framework,AddressBook -Wl,-framework,WebKit])
 
-  CFLAGS="-I${CONTRIB_DIR}/Sparkle.framework/Headers ${CFLAGS_saved}"
-  AC_CHECK_HEADERS(Sparkle.h, [
-    VLC_ADD_LIBS([macosx], [-F${CONTRIB_DIR} -Wl,-framework,Sparkle])
-    VLC_ADD_OBJCFLAGS([macosx], [-F${CONTRIB_DIR}])
-  ])
+  if ! test -d ${CONTRIB_DIR}/Sparkle.framework
+  then
+    AC_MSG_ERROR([Sparkle framework is required and was not found in ${CONTRIB_DIR}])
+  fi
+  VLC_ADD_LIBS([macosx], [-F${CONTRIB_DIR} -Wl,-framework,Sparkle])
+  VLC_ADD_OBJCFLAGS([macosx], [-F${CONTRIB_DIR}])
+
   if ! test -d ${CONTRIB_DIR}/BGHUDAppKit.framework
   then
     AC_MSG_ERROR([BGHUDAppKit framework is required and was not found in ${CONTRIB_DIR}])
diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 0120457..03a6e1e 100644
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -62,9 +62,7 @@
 #import "TrackSynchronization.h"
 
 #import <AddressBook/AddressBook.h>         /* for crashlog send mechanism */
-#ifdef HAVE_SPARKLE_H
-# import <Sparkle/Sparkle.h>                 /* we're the update delegate */
-#endif
+#import <Sparkle/Sparkle.h>                 /* we're the update delegate */
 
 /*****************************************************************************
  * Local prototypes.
@@ -762,7 +760,6 @@ static VLCMain *_o_sharedMainInstance = nil;
     [self setIntf:nil];
 }
 
-#ifdef HAVE_SPARKLE_H
 #pragma mark -
 #pragma mark Sparkle delegate
 /* received directly before the update gets installed, so let's shut down a bit */
@@ -772,7 +769,6 @@ static VLCMain *_o_sharedMainInstance = nil;
     [o_remote stopListening: self];
     var_SetInteger( p_intf->p_libvlc, "key-action", ACTIONID_STOP );
 }
-#endif
 
 #pragma mark -
 #pragma mark Media Key support
diff --git a/modules/gui/macosx/simple_prefs.m b/modules/gui/macosx/simple_prefs.m
index a353e31..7060ebd 100644
--- a/modules/gui/macosx/simple_prefs.m
+++ b/modules/gui/macosx/simple_prefs.m
@@ -35,9 +35,7 @@
 #import "intf.h"
 #import "AppleRemote.h"
 
-#ifdef HAVE_SPARKLE_H
-# import <Sparkle/Sparkle.h>                        //for o_intf_last_update_lbl
-#endif
+#import <Sparkle/Sparkle.h>                        //for o_intf_last_update_lbl
 
 static NSString* VLCSPrefsToolbarIdentifier = @"Our Simple Preferences Toolbar Identifier";
 static NSString* VLCIntfSettingToolbarIdentifier = @"Intf Settings Item Identifier";
@@ -459,11 +457,9 @@ static inline char * __config_GetLabel( vlc_object_t *p_this, const char *psz_na
     [self setupButton: o_intf_embedded_ckb forBoolValue: "embedded-video"];
 	[self setupButton: o_intf_appleremote_ckb forBoolValue: "macosx-appleremote"];
 	[self setupButton: o_intf_mediakeys_ckb forBoolValue: "macosx-mediakeys"];
-#ifdef HAVE_SPARKLE_H
     if( [[SUUpdater sharedUpdater] lastUpdateCheckDate] != NULL )
         [o_intf_last_update_lbl setStringValue: [NSString stringWithFormat: _NS("Last check on: %@"), [[[SUUpdater sharedUpdater] lastUpdateCheckDate] descriptionWithLocale: [[NSUserDefaults standardUserDefaults] dictionaryRepresentation]]]];
     else
-#endif
         [o_intf_last_update_lbl setStringValue: _NS("No check was performed yet.")];
     psz_tmp = config_GetPsz( p_intf, "control" );
     if (psz_tmp) {