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| to regenerate configure. Then submit your changes to be folded into
dnl| the standard version of xboard.
-dnl| define second argument as VERSION.PATCHLEVEL. e.g. 4.4.0j
-AC_INIT([xboard],[4.8.0],[bug-xboard@gnu.org])
+dnl| define second argument as MAJOR.MINOR.PATCHLEVEL. e.g. 4.4.0
+dnl| MAJOR means large changes
+dnl| MINOR can includes new features and bug fixes
+dnl| PATCHLEVEL is used for bugfixes only
+dnl| pre-release version have a -YYYYMMDD attached, e.g 4.9.0-20160313
+AC_INIT([xboard],[4.9.0-20160313],[bug-xboard@gnu.org])
dnl| need this to be able to compile some files in a subdir (filebrowser)
AM_INIT_AUTOMAKE([subdir-objects])
AC_MSG_ERROR([cannot find pkg-config! Please install it.]))
dnl | check for cairo and librsvg
-PKG_CHECK_MODULES([CAIRO], [ cairo >= 1.2.0 librsvg-2.0 >= 2.14.0 ])
+PKG_CHECK_MODULES([CAIRO], [ cairo >= 1.2.0 pangocairo librsvg-2.0 >= 2.14.0 ])
AC_SUBST(CAIRO_CFLAGS)
AC_SUBST(CAIRO_LIBS)
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)])],
[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 (default)])],
+ [AS_HELP_STRING([--with-Xaw],[use Xaw front-end])],
[with_Xaw="$withval"],
- [with_Xaw="yes"])
+ [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_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'
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(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])
AC_SUBST(XDG_MIME)
AC_PATH_PROG([XDG_DESKTOP_MENU],[xdg-desktop-menu])
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
[],
[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])
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)