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

[xboard.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index cc9023a..eafd1f7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -136,7 +136,7 @@ FRONTEND_CFLAGS=""
 FRONTEND_LIBS=""
 
 AC_ARG_WITH([gtk],
-            [AS_HELP_STRING([--with-gtk],[use GTK front-end (experimental)])],
+            [AS_HELP_STRING([--with-gtk],[use GTK front-end])],
             [with_GTK=$withval],
             [with_GTK="no"])
 
@@ -180,18 +180,19 @@ AC_ARG_WITH([gamedatadir],
             [GAMEDATADIR="$withval"],
             [GAMEDATADIR='$(datadir)/games/xboard'])
 
-AC_ARG_ENABLE( [update-mimedb],
-               [AS_HELP_STRING([--disable-update-mimedb],[disable the update-mime-database after install [default=no]])],
-               [enable_mimedb="no"],
-               [enable_mimedb="yes"])
+AC_ARG_ENABLE([update-mimedb],
+             [AS_HELP_STRING([--disable-update-mimedb],[disable the update-mime-database after install [default=no]])],
+             [enable_mimedb="no"],
+             [enable_mimedb="yes"])
 
 AC_ARG_ENABLE([osxapp],
-             [AS_HELP_STRING([--enable-osxapp],[build a OSX app])],
-              [enable_OSXAPP=$withval],
+             [AS_HELP_STRING([--enable-osxapp],[build a OSX app [default=no]])],
+              [enable_OSXAPP=$enableval],
               [enable_OSXAPP="no"])
 
-AS_IF([test "x$enable_osxapp" = "xyes"], [
+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'
@@ -204,10 +205,10 @@ AS_IF([test "x$enable_osxapp" = "xyes"], [
      GAMEDATADIR='$(datadir)/xboard'
 ])
 
-AM_CONDITIONAL(OSX_APP, test x"$enable_osxapp" = "xyes")
+AM_CONDITIONAL(OSX_APP, test x"$enable_OSXAPP" = x"yes")
 
-AM_CONDITIONAL(ENABLE_UPDATE_MIMEDB, test x"$enable_mimedb" = "xyes")
-if test x"$enable_mimedb" = "xyes"; then
+AM_CONDITIONAL(ENABLE_UPDATE_MIMEDB, test x"$enable_mimedb" = x"yes")
+if test x"$enable_mimedb" = x"yes"; then
    AC_PATH_PROG([XDG_MIME],[xdg-mime])
    AC_SUBST(XDG_MIME)
    AC_PATH_PROG([XDG_DESKTOP_MENU],[xdg-desktop-menu])
@@ -465,7 +466,8 @@ dnl| USE_PTYS=1
 dnl| add some libs for OS X
   *-apple-* )
     AC_MSG_WARN([Apple support is experimental, please report any problems to bug-xboard@gnu.org])
-    AC_MSG_WARN([Building an OS X app currently relies on some programs such as dylib that we don't test for])
+    AC_MSG_WARN([use --enable-osxapp to enable the build target and automatically adjust target directories])
+    AC_MSG_WARN([Building an OSX app currently relies on some programs such as dylib that we don't test for])
     AC_MSG_WARN([patches welcome ;)])
     AC_PATH_PROG(SW_VERS, sw_vers)
     if test "x$SW_VERS" != "x"; then
@@ -515,7 +517,7 @@ AC_ARG_ENABLE( [zippy],
               [],
               [enable_zippy="no"])
 
-if test x"$enable_zippy" != xno; then
+if test x"$enable_zippy" != x"no"; then
   AC_DEFINE(ZIPPY, 1,[should zippy be enabled])
 else
   AC_DEFINE(ZIPPY, 0,[should zippy be enabled])