Merge branch 'master' into v4.6.x; updated to correct version number for v4.6.0 branch

[xboard.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 32b58d1..dd816e5 100644 (file)
--- 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 Free Software Foundation, Inc.
+dnl| 2008, 2009, 2010, 2011, 2012 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
@@ -28,7 +28,7 @@ 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],[master-20110822],[bug-xboard@gnu.org])
+AC_INIT([xboard],[4.6.0.20120212],[bug-xboard@gnu.org])
 
 dnl| need this to be able to compile some files in a subdir (filebrowser)
 AM_INIT_AUTOMAKE([subdir-objects])
@@ -76,7 +76,7 @@ AC_ISC_POSIX
 AC_PROG_INSTALL
 
 dnl| add gettext support
-AM_GNU_GETTEXT_VERSION(0.18.1)
+AM_GNU_GETTEXT_VERSION(0.17)
 AM_GNU_GETTEXT([external])
 
 AC_CHECK_PROGS(RSH, remsh rsh, rsh)