X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=configure.ac;h=c15e133d407843bd299c67166e24225934a43e78;hb=4011e8678d85310eedf19fd00aa5d96a9a60770a;hp=eafd1f79e6d5020b617eccea4ca0bdeda539cf46;hpb=3f065f556352de9610a2a5bb347dabc486f6f41e;p=xboard.git

diff --git a/configure.ac b/configure.ac
index eafd1f7..c15e133 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl| configure.in
 dnl|
 dnl| Copyright 1992-2001, 2002, 2003, 2004, 2005, 2006, 2007,
-dnl| 2008, 2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc.
+dnl| 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Free Software Foundation, Inc.
 dnl|
 dnl| GNU XBoard is free software: you can redistribute it and/or modify
 dnl| it under the terms of the GNU General Public License as published by
@@ -136,9 +136,9 @@ FRONTEND_CFLAGS=""
 FRONTEND_LIBS=""
 
 AC_ARG_WITH([gtk],
-            [AS_HELP_STRING([--with-gtk],[use GTK front-end])],
+            [AS_HELP_STRING([--with-gtk],[use GTK front-end (default)])],
             [with_GTK=$withval],
-            [with_GTK="no"])
+            [with_GTK="yes"])
 
 AC_ARG_WITH([Xaw3d],
             [AS_HELP_STRING([--with-Xaw3d],[use Xaw3d front-end (not fully supported anymore)])],
@@ -146,9 +146,9 @@ AC_ARG_WITH([Xaw3d],
             [with_Xaw3d="no"])
 
 AC_ARG_WITH([Xaw],
-            [AS_HELP_STRING([--with-Xaw],[use Xaw front-end (default)])],
+            [AS_HELP_STRING([--with-Xaw],[use Xaw front-end])],
             [with_Xaw="$withval"],
-            [with_Xaw="yes"])
+            [with_Xaw="no"])
 
 AC_ARG_WITH([iconsdir],
             [AS_HELP_STRING([--with-iconsdir=DIR],
@@ -191,8 +191,8 @@ AC_ARG_ENABLE([osxapp],
               [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])],
+     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'
@@ -202,8 +202,7 @@ AS_IF([test x"$enable_OSXAPP" = x"yes"], [
      mandir='$(datadir)/man'
      bindir='$(prefix)/MacOS'
      localedir='$(datadir)/locale'
-     GAMEDATADIR='$(datadir)/xboard'
-])
+     GAMEDATADIR='$(datadir)/xboard'],[])
 
 AM_CONDITIONAL(OSX_APP, test x"$enable_OSXAPP" = x"yes")
 
@@ -475,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-gtk2"
+    fi
     FRONTEND_CFLAGS="$FRONTEND_CFLAGS -I/opt/local/include -L/opt/local/lib"
   ;;
 esac
@@ -550,7 +552,7 @@ CONFIGURE_OPTIONS="prefix=$prefix; datarootdir=$datarootdir; \
 datadir=$datadir; gamedatadir=$GAMEDATADIR; desktopdir=$DESKTOPDIR; \
 mimedir=$MIMEDIR; iconsdir=$ICONSDIR; svgiconsdir=$SVGICONSDIR; infodir=$infodir; \
 sysconfigdir=$sysconfigdir; update_mimedb=$enable_mimedb; NLS=$USE_NLS; \
-GKT=$with_GTK; Xaw3d=$with_Xaw3d; Xaw=$with_Xaw; \
+GTK=$with_GTK; Xaw3d=$with_Xaw3d; Xaw=$with_Xaw; \
 ptys=$enable_ptys; zippy=$enable_zippy; sigint=$enable_sigint"
 
 AC_SUBST(CONFIGURE_OPTIONS)