[vlc-commits] OSX: test and use frameworks correctly

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Wed Nov 23 20:28:28 2011 -0500| [72263a21b63a4c6995193d258155835ca7c89785] | committer: Rafaël Carré

OSX: test and use frameworks correctly

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

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

diff --git a/configure.ac b/configure.ac
index a169371..7fd4c1f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3757,16 +3757,18 @@ then
   VLC_ADD_PLUGIN([macosx minimal_macosx])
 
   VLC_ADD_LIBS([macosx], [-Wl,-framework,QTKit -Wl,-framework,IOKit -Wl,-framework,AddressBook -Wl,-framework,WebKit])
-  AC_CHECK_HEADERS(Sparkle/Sparkle.h, [
-    VLC_ADD_LIBS([macosx], [-F${CONTRIB_DIR}/Sparkle -Wl,-framework,Sparkle])
-    VLC_ADD_OBJCFLAGS([macosx], [-F${CONTRIB_DIR}/Sparkle])
+
+  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}/BGHUDAppKit.framework
   then
     AC_MSG_ERROR([BGHUDAppKit framework is required and was not found in ${CONTRIB_DIR}])
   fi
-  VLC_ADD_LIBS([macosx], [-F${CONTRIB_DIR}/BGHUDAppKit -Wl,-framework,BGHUDAppKit])
-  VLC_ADD_OBJCFLAGS([macosx], [-F${CONTRIB_DIR}/BGHUDAppKit])
+  VLC_ADD_LIBS([macosx], [-F${CONTRIB_DIR} -Wl,-framework,BGHUDAppKit])
+  VLC_ADD_OBJCFLAGS([macosx], [-F${CONTRIB_DIR}])
 
 fi
 
diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index c714786..2c2fe88 100644
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -62,7 +62,7 @@
 #import "TrackSynchronization.h"
 
 #import <AddressBook/AddressBook.h>         /* for crashlog send mechanism */
-#ifdef HAVE_SPARKLE_SPARKLE_H
+#ifdef HAVE_SPARKLE_H
 # import <Sparkle/Sparkle.h>                 /* we're the update delegate */
 #endif
 
@@ -762,7 +762,7 @@ static VLCMain *_o_sharedMainInstance = nil;
     [self setIntf:nil];
 }
 
-#ifdef HAVE_SPARKLE_SPARKLE_H
+#ifdef HAVE_SPARKLE_H
 #pragma mark -
 #pragma mark Sparkle delegate
 /* received directly before the update gets installed, so let's shut down a bit */
diff --git a/modules/gui/macosx/simple_prefs.m b/modules/gui/macosx/simple_prefs.m
index 33747c4..a353e31 100644
--- a/modules/gui/macosx/simple_prefs.m
+++ b/modules/gui/macosx/simple_prefs.m
@@ -35,7 +35,7 @@
 #import "intf.h"
 #import "AppleRemote.h"
 
-#ifdef HAVE_SPARKLE_SPARKLE_H
+#ifdef HAVE_SPARKLE_H
 # import <Sparkle/Sparkle.h>                        //for o_intf_last_update_lbl
 #endif
 
@@ -459,7 +459,7 @@ 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_SPARKLE_H
+#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