From d8a895769422f711f20f2f0b9fee68b26f976052 Mon Sep 17 00:00:00 2001
From: Steve Yen <steve.yen@gmail.com>
Date: Thu, 29 Mar 2012 13:44:32 -0700
Subject: [PATCH] version.pl parses git describe output with more forgiveness.

Change-Id: Ieaf49916e80458b52e58616a07b0a7971842e329
---
 .gitignore        | 1 +
 config/version.pl | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index a56a4d5..0935f49 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,7 @@
 /Makefile.in
 /aclocal.m4
 /autom4te.cache
+/config.cache
 /config.h
 /config.h.in
 /config.log
diff --git a/config/version.pl b/config/version.pl
index 30ef804..85861c4 100755
--- a/config/version.pl
+++ b/config/version.pl
@@ -11,7 +11,8 @@
 #my $version = '1.4.2-30-gf966dba';
 #my $version = '1.4.3-rc1';
 #my $version = '1.4.3';
-unless ($version =~ m/^\d+\.\d+\.\d+/) {
+#my $version = 'couchbase_1.8.0-6-g35fd1b9';
+unless ($version =~ m/\d+\.\d+\.\d+/) {
     write_file('m4/version.m4', "m4_define([VERSION_NUMBER], [UNKNOWN])\n");
     exit;
 }
@@ -28,7 +29,7 @@
     $VERSION = $1;
     $FULLVERSION = $version;
     $RELEASE = '1.' . $2;
-} elsif ($version =~ m/^(\d+\.\d+\.\d+)$/) {
+} elsif ($version =~ m/(\d+\.\d+\.\d+)/) {
     $VERSION = $1;
     $FULLVERSION = $version;
     $RELEASE = '1';