aboutsummaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorThierry Crozat2016-03-25 20:28:41 +0000
committerThierry Crozat2016-03-25 20:28:41 +0000
commita2250d74ed1bcda6b6726bb7e6866be9129700c7 (patch)
tree49190c66be2096fd90421f1ebdc2a669b72ad880 /configure
parente917971681edc7f5e8f3f6158646eac9e22fb81d (diff)
downloadscummvm-rg350-a2250d74ed1bcda6b6726bb7e6866be9129700c7.tar.gz
scummvm-rg350-a2250d74ed1bcda6b6726bb7e6866be9129700c7.tar.bz2
scummvm-rg350-a2250d74ed1bcda6b6726bb7e6866be9129700c7.zip
CONFIGURE: Only check Sparkle and NSDockTilePlugIn availability on OS X
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure67
1 files changed, 42 insertions, 25 deletions
diff --git a/configure b/configure
index f919d862e7..a1afe4e681 100755
--- a/configure
+++ b/configure
@@ -3937,44 +3937,61 @@ echo "$_mpeg2"
#
# 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
+#
+# Check is NSDockTilePlugIn protocol is supported
+#
+case $_host_os in
+ darwin*)
+ echocheck "Sparkle"
+ if test "$_updates" = no; then
+ _sparkle=no
+ else
+ 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
- append_var LIBS "$SPARKLE_LIBS -framework Sparkle"
- append_var INCLUDES "$SPARKLE_CFLAGS"
-fi
-define_in_config_if_yes "$_sparkle" 'USE_SPARKLE'
-fi
-echo "$_sparkle"
+ cc_check $SPARKLE_CFLAGS $SPARKLE_LIBS -framework Sparkle -ObjC++ -lobjc && _sparkle=yes
+ fi
+ if test "$_sparkle" = yes ; then
+ append_var LIBS "$SPARKLE_LIBS -framework Sparkle"
+ append_var INCLUDES "$SPARKLE_CFLAGS"
+ fi
+ define_in_config_if_yes "$_sparkle" 'USE_SPARKLE'
+ fi
+ echo "$_sparkle"
+ ;;
+ *)
+ _sparkle=no
+ ;;
+esac
#
# Check is NSDockTilePlugIn protocol is supported
#
-# NSDockTilePlugIn was added in OS X 10.6, so will not be available when compiling on older OS X versions.
-echocheck "DockTilePlugin"
-if test "$_osxdockplugin" = auto ; then
- _osxdockplugin=no
- cat > $TMPC << EOF
+case $_host_os in
+ darwin*)
+ # NSDockTilePlugIn was added in OS X 10.6, so will not be available when compiling on older OS X versions.
+ echocheck "DockTilePlugin"
+ if test "$_osxdockplugin" = auto ; then
+ _osxdockplugin=no
+ cat > $TMPC << EOF
#include <Cocoa/Cocoa.h>
@interface ScummVMDockTilePlugIn : NSObject <NSDockTilePlugIn> {
}
@end
EOF
- cc_check -c -ObjC++ && _osxdockplugin=yes
-fi
-define_in_config_if_yes "$_osxdockplugin" 'USE_DOCKTILEPLUGIN'
-echo "$_osxdockplugin"
+ cc_check -c -ObjC++ && _osxdockplugin=yes
+ fi
+ define_in_config_if_yes "$_osxdockplugin" 'USE_DOCKTILEPLUGIN'
+ echo "$_osxdockplugin"
+ ;;
+ *)
+ _osxdockplugin=no
+ ;;
+esac
#
# Check for FluidSynth