From def5a12ff0d2c6c3aa6c28b2fea2220c6edb9dc6 Mon Sep 17 00:00:00 2001
From: Elijah Newren <newren gmail com>
Date: Mon, 18 Sep 2006 16:18:37 +0000
Subject: [PATCH] Make detection of stable vs. unstable automatic and based
 upon the version

2006-09-18  Elijah Newren  <newren gmail com>

	* configure.in: Make detection of stable vs. unstable automatic
	and based upon the version number.  Partially based on patch from
	Christian Hamar in #356122.  Fixes #356122.
---
 ChangeLog    |  6 ++++++
 configure.in | 20 +++++++++++++++++---
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ad22aef63..c088564ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-09-18  Elijah Newren  <newren gmail com>
+
+	* configure.in: Make detection of stable vs. unstable automatic
+	and based upon the version number.  Partially based on patch from
+	Christian Hamar in #356122.  Fixes #356122.
+
 2006-09-13  Elijah Newren  <newren gmail com>
 
 	* HACKING: update -- we depend on gtk+ >= 2.10 since Vincent's
diff --git a/configure.in b/configure.in
index 9a8a91318..cf1956019 100644
--- a/configure.in
+++ b/configure.in
@@ -1,8 +1,14 @@
 AC_PREREQ(2.50)
 
+m4_define([metacity_major_version], [2])
+m4_define([metacity_minor_version], [16])
 # Fibonacci sequence for micro version numbering:
 # 0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233, 377, 610, 987
-AC_INIT([metacity], [2.16.2],
+m4_define([metacity_micro_version], [2])
+
+m4_define([metacity_version],
+          [metacity_major_version.metacity_minor_version.metacity_micro_version])
+AC_INIT([metacity], [metacity_version],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=metacity])
 
 AC_CONFIG_SRCDIR(src/display.c)
@@ -516,5 +522,13 @@ metacity-$VERSION:
 	Render:                   ${have_xrender}
 	Xcursor:                  ${have_xcursor}
 "
-echo "This is the UNSTABLE branch of metacity"
-echo "Use 2.14.x for stable (gnome-2-14 branch in CVS)"
+
+METACITY_MINOR_VERSION=metacity_minor_version
+if test $(( $(echo $METACITY_MINOR_VERSION) %2)) == "1"; then
+   stable_version=$(( ($METACITY_MINOR_VERSION / 2) * 2))
+   echo "This is the UNSTABLE branch of metacity"
+   echo -n "Use 2.$stable_version.x for stable "
+   echo    "(gnome-2-$stable_version branch in CVS)"
+else
+   echo "This is the stable branch of metacity"
+fi