Fix popdown of menus on help click
[xboard.git] / configure.ac
index a168db1..93c215a 100644 (file)
@@ -1,7 +1,7 @@
 dnl| configure.in
 dnl|
 dnl| Copyright 1992-2001, 2002, 2003, 2004, 2005, 2006, 2007,
 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, 2016 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
 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
@@ -144,11 +144,15 @@ AC_ARG_WITH([Xaw3d],
             [AS_HELP_STRING([--with-Xaw3d],[use Xaw3d front-end (not fully supported anymore)])],
             [with_Xaw3d="$withval"],
             [with_Xaw3d="no"])
             [AS_HELP_STRING([--with-Xaw3d],[use Xaw3d front-end (not fully supported anymore)])],
             [with_Xaw3d="$withval"],
             [with_Xaw3d="no"])
+dnl | overwrite default gtk
+AS_IF([test "x$with_Xaw3d" = xyes], [with_GTK="no"])
 
 AC_ARG_WITH([Xaw],
             [AS_HELP_STRING([--with-Xaw],[use Xaw front-end])],
             [with_Xaw="$withval"],
             [with_Xaw="no"])
 
 AC_ARG_WITH([Xaw],
             [AS_HELP_STRING([--with-Xaw],[use Xaw front-end])],
             [with_Xaw="$withval"],
             [with_Xaw="no"])
+dnl | overwrite default gtk
+AS_IF([test "x$with_Xaw" = xyes], [with_GTK="no"])
 
 AC_ARG_WITH([iconsdir],
             [AS_HELP_STRING([--with-iconsdir=DIR],
 
 AC_ARG_WITH([iconsdir],
             [AS_HELP_STRING([--with-iconsdir=DIR],
@@ -206,6 +210,8 @@ AS_IF([test x"$enable_OSXAPP" = x"yes"], [
 
 AM_CONDITIONAL(OSX_APP, test x"$enable_OSXAPP" = x"yes")
 
 
 AM_CONDITIONAL(OSX_APP, test x"$enable_OSXAPP" = x"yes")
 
+AM_CONDITIONAL(NLS_ENABLED, test x"$USE_NLS" = x"yes")
+
 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])
 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])
@@ -476,7 +482,7 @@ dnl| add some libs for OS X
     fi
     FRONTEND_LIBS="$FRONTEND_LIBS -headerpad_max_install_names "
     if test x"$enable_OSXAPP" = x"yes" ; then
     fi
     FRONTEND_LIBS="$FRONTEND_LIBS -headerpad_max_install_names "
     if test x"$enable_OSXAPP" = x"yes" ; then
-        FRONTEND_LIBS="$FRONTEND_LIBS -lgtkmacintegration"
+        FRONTEND_LIBS="$FRONTEND_LIBS -lgtkmacintegration-gtk2"
     fi
     FRONTEND_CFLAGS="$FRONTEND_CFLAGS -I/opt/local/include -L/opt/local/lib"
   ;;
     fi
     FRONTEND_CFLAGS="$FRONTEND_CFLAGS -I/opt/local/include -L/opt/local/lib"
   ;;