From: Arun Persaud <arun@nubati.net>
Date: Fri, 17 Oct 2014 06:34:22 +0000 (-0700)
Subject: USE OSXAPP instead of APPLE and fix withval->enableval in AC_ARG_ENABLE
X-Git-Url: http://winboard.nl/cgi-bin?p=xboard.git;a=commitdiff_plain;h=3f065f556352de9610a2a5bb347dabc486f6f41e

USE OSXAPP instead of APPLE and fix withval->enableval in AC_ARG_ENABLE
---

diff --git a/configure.ac b/configure.ac
index 65f463b..eafd1f7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -187,11 +187,12 @@ AC_ARG_ENABLE([update-mimedb],
 
 AC_ARG_ENABLE([osxapp],
 	      [AS_HELP_STRING([--enable-osxapp],[build a OSX app [default=no]])],
-              [enable_OSXAPP=$withval],
+              [enable_OSXAPP=$enableval],
               [enable_OSXAPP="no"])
 
 AS_IF([test x"$enable_OSXAPP" = x"yes"], [
      AC_PREFIX_DEFAULT([`pwd`/XBoard.app/Contents])
+     AC_DEFINE([OSXAPP], [1], [We are building an OSX APP, redefine some functions])],
      with_GTK="yes"
      enable_mimedb="no"
      datarootdir='$(prefix)/Resources'
diff --git a/gtk/xboard.c b/gtk/xboard.c
index f134d8b..88550f7 100644
--- a/gtk/xboard.c
+++ b/gtk/xboard.c
@@ -167,7 +167,7 @@ extern char *getenv();
 #include "gettext.h"
 #include "draw.h"
 
-#ifdef __APPLE__
+#ifdef OSXAPP
 #  include <gtkmacintegration/gtkosxapplication.h>
    // prevent pathname of positional file argument provided by OS X being be mistaken for option name
    // (price is that we won't recognize Windows option format anymore).
@@ -828,7 +828,7 @@ LoadIconFile (gchar *svgFilename)
     return gdk_pixbuf_new_from_file(buf, NULL);
 }
 
-#ifdef __APPLE__
+#ifdef OSXAPP
 static char clickedFile[MSG_SIZ];
 static int suppress;
 
@@ -874,7 +874,7 @@ main (int argc, char **argv)
 
     /* set up GTK */
     gtk_init (&argc, &argv);
-#ifdef __APPLE__
+#ifdef OSXAPP
     {   // prepare to catch OX OpenFile signal, which will tell us the clicked file
 	char *path = gtkosx_application_get_bundle_path();
 #ifdef ENABLE_NLS
@@ -1951,7 +1951,7 @@ TempForwardProc (Widget w, XEvent *event, String *prms, Cardinal *nprms)
 void
 ManProc ()
 {   // called from menu
-#ifdef __APPLE__
+#ifdef OSXAPP
     char buf[MSG_SIZ];
     snprintf(buf, MSG_SIZ, "%s ./man.command", appData.sysOpen);
     system(buf);
@@ -2064,7 +2064,7 @@ SetClockIcon (int color)
     GdkPixbuf *pm = *clockIcons[color];
     if (mainwindowIcon != pm) {
         mainwindowIcon = pm;
-#ifdef __APPLE__
+#ifdef OSXAPP
         gtkosx_application_set_dock_icon_pixbuf(theApp, mainwindowIcon);
 #else
         gtk_window_set_icon(GTK_WINDOW(shellWidget), mainwindowIcon);