X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=configure.ac;h=c0058e0d6563feb6de531749eb835c7160f2a285;hb=9df530983c4dc4dff2ffc1c1e1efacf455adebf1;hp=b9b0f40e4ce34fab2b7b97eab766e058d6c9b8b4;hpb=6dfa974c326e97e908a05fb49e5ead3d76f2a897;p=xboard.git

diff --git a/configure.ac b/configure.ac
index b9b0f40..c0058e0 100644
--- 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"])
 
@@ -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" = "xyes"], [
-     AC_PREFIX_DEFAULT([`pwd`/XBoard.app/Contents])
+AS_IF([test x"$enable_OSXAPP" = x"yes"], [
+     prefix=`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'
@@ -201,13 +202,12 @@ AS_IF([test "x$enable_osxapp" = "xyes"], [
      mandir='$(datadir)/man'
      bindir='$(prefix)/MacOS'
      localedir='$(datadir)/locale'
-     GAMEDATADIR='$(datadir)/xboard'
-])
+     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])
@@ -474,7 +474,10 @@ dnl| add some libs for OS X
       MACOSX_VERSION=`$SW_VERS -productVersion`
       AC_MSG_RESULT([$MACOSX_VERSION])
     fi
-    FRONTEND_LIBS="$FRONTEND_LIBS -lgtkmacintegration -headerpad_max_install_names "
+    FRONTEND_LIBS="$FRONTEND_LIBS -headerpad_max_install_names "
+    if test x"$enable_OSXAPP" = x"yes" ; then
+        FRONTEND_LIBS="$FRONTEND_LIBS -lgtkmacintegration"
+    fi
     FRONTEND_CFLAGS="$FRONTEND_CFLAGS -I/opt/local/include -L/opt/local/lib"
   ;;
 esac
@@ -516,7 +519,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])