X-Git-Url: http://winboard.nl/cgi-bin?p=xboard.git;a=blobdiff_plain;f=configure.ac;h=330640909e882077fc48761ea1c28fc5ee97b048;hp=de6eadb1d536872d622452688b82e46b6a933b50;hb=HEAD;hpb=7e2360965657e1529103b7b4c6bc32fcbb25ce00

diff --git a/configure.ac b/configure.ac
index de6eadb..3306409 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, 2015 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
@@ -27,8 +27,12 @@ dnl| it portable to sites and systems other than your own), and run autoconf
 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-20160402],[bug-xboard@gnu.org])
 
 dnl| need this to be able to compile some files in a subdir (filebrowser)
 AM_INIT_AUTOMAKE([subdir-objects])
@@ -124,7 +128,7 @@ AS_IF( [test "x$PKGCONFIG" = xpkgconfig_not_found],
        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)
 
@@ -144,11 +148,15 @@ 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])],
             [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],