From 828f1884b463c49eb39b7f63def0e4bda15d11c6 Mon Sep 17 00:00:00 2001
From: CeRiAl
Date: Sun, 3 Jul 2011 23:01:17 +0200
Subject: MACOSX: Add Sparkle support

---
 configure | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

(limited to 'configure')

diff --git a/configure b/configure
index 9ec277bf60..3f062b964c 100755
--- a/configure
+++ b/configure
@@ -134,6 +134,7 @@ _alsa=auto
 _seq_midi=auto
 _timidity=auto
 _zlib=auto
+_sparkle=auto
 _png=auto
 _theoradec=auto
 _faad=auto
@@ -813,6 +814,9 @@ Optional Libraries:
                            installed (optional)
   --disable-fluidsynth     disable fluidsynth MIDI driver [autodetect]
 
+  --with-sparkle-prefix=DIR   Prefix where sparkle is installed (MacOSX only - optional)
+  --disable-sparkle        disable sparkle automatic update support [MacOSX only - autodetect]
+
   --with-sdl-prefix=DIR    Prefix where the sdl-config script is
                            installed (optional)
 
@@ -861,6 +865,8 @@ for ac_option in $@; do
 	--disable-mad)            _mad=no         ;;
 	--enable-zlib)            _zlib=yes       ;;
 	--disable-zlib)           _zlib=no        ;;
+	--enable-sparkle)         _sparkle=yes    ;;
+	--disable-sparkle)        _sparkle=no     ;;
 	--enable-nasm)            _nasm=yes       ;;
 	--disable-nasm)           _nasm=no        ;;
 	--disable-png)            _png=no         ;;
@@ -948,6 +954,11 @@ for ac_option in $@; do
 		ZLIB_CFLAGS="-I$arg/include"
 		ZLIB_LIBS="-L$arg/lib"
 		;;
+	--with-sparkle-prefix=*)
+		arg=`echo $ac_option | cut -d '=' -f 2`
+		SPARKLE_CFLAGS="-F$arg"
+		SPARKLE_LIBS="-F$arg"
+		;;
 	--with-readline-prefix=*)
 		arg=`echo $ac_option | cut -d '=' -f 2`
 		READLINE_CFLAGS="-I$arg/include"
@@ -2970,6 +2981,26 @@ if test `get_engine_build sword25` = yes && test ! "$_zlib" = yes ; then
 	engine_disable sword25
 fi
 
+#
+# Check for Sparkle
+#
+echocheck "Sparkle"
+if test "$_sparkle" = auto ; then
+	_sparkle=no
+	cat > $TMPC << EOF
+#include <Cocoa/Cocoa.h>
+#include <Sparkle/Sparkle.h>
+int main(void) { SUUpdater *updater = [SUUpdater sharedUpdater]; return 0; }
+EOF
+	cc_check $SPARKLE_CFLAGS $SPARKLE_LIBS -framework Sparkle -ObjC++ -lobjc && _sparkle=yes
+fi
+if test "$_sparkle" = yes ; then
+	LIBS="$LIBS $SPARKLE_LIBS -framework Sparkle"
+	INCLUDES="$INCLUDES $SPARKLE_CFLAGS"
+fi
+define_in_config_if_yes "$_sparkle" 'USE_SPARKLE'
+echo "$_sparkle"
+
 #
 # Check for libfluidsynth
 #
-- 
cgit v1.2.3


From f60d6f7a9776253ad4716eb8a72fba18c91a7588 Mon Sep 17 00:00:00 2001
From: CeRiAl
Date: Thu, 7 Jul 2011 02:47:46 +0200
Subject: MACOSX/UPDATES: Streamline UpdateManager

Moved UpdateManager related code from backends/modular-backend.* to
common/system.*. Added switch --enable/disable-updates to be able
to disable updates support generally.
---
 configure | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

(limited to 'configure')

diff --git a/configure b/configure
index 3f062b964c..1a449fd6e9 100755
--- a/configure
+++ b/configure
@@ -143,6 +143,7 @@ _opengl=auto
 _opengles=auto
 _readline=auto
 _taskbar=yes
+_updates=yes
 _libunity=auto
 # Default option behaviour yes/no
 _debug_build=auto
@@ -773,6 +774,7 @@ Optional Features:
   --disable-hq-scalers     exclude HQ2x and HQ3x scalers
   --disable-translation    don't build support for translated messages
   --disable-taskbar        don't build support for taskbar and launcher integration
+  --disable-updates        don't build support for updates
   --enable-text-console    use text console instead of graphical console
   --enable-verbose-build   enable regular echoing of commands during build
                            process
@@ -880,6 +882,8 @@ for ac_option in $@; do
 	--disable-readline)       _readline=no    ;;
 	--enable-taskbar)         _taskbar=yes    ;;
 	--disable-taskbar)        _taskbar=no     ;;
+	--enable-updates)         _updates=yes    ;;
+	--disable-updates)        _updates=no     ;;
 	--enable-libunity)        _libunity=yes   ;;
 	--disable-libunity)       _libunity=no    ;;
 	--enable-opengl)          _opengl=yes     ;;
@@ -2982,9 +2986,12 @@ if test `get_engine_build sword25` = yes && test ! "$_zlib" = yes ; then
 fi
 
 #
-# Check for Sparkle
+# Check for Sparkle if updates support is enabled
 #
 echocheck "Sparkle"
+if test "$_updates" = no; then
+	_sparkle=no
+else
 if test "$_sparkle" = auto ; then
 	_sparkle=no
 	cat > $TMPC << EOF
@@ -2999,6 +3006,7 @@ if test "$_sparkle" = yes ; then
 	INCLUDES="$INCLUDES $SPARKLE_CFLAGS"
 fi
 define_in_config_if_yes "$_sparkle" 'USE_SPARKLE'
+fi
 echo "$_sparkle"
 
 #
@@ -3307,6 +3315,21 @@ echo_n "Building Bink video support... "
 define_in_config_if_yes $_bink 'USE_BINK'
 echo "$_bink"
 
+#
+# Check whether to build updates support
+#
+echo_n "Building updates support... "
+define_in_config_if_yes $_updates 'USE_UPDATES'
+if test "$_updates" = yes; then
+	if test "$_sparkle" = yes; then
+		echo "Sparkle"
+	else
+		echo "$_updates"
+	fi
+else
+	echo "$_updates"
+fi
+
 #
 # Figure out installation directories
 #
-- 
cgit v1.2.3