From d91f7062aea103bc60d90471b5184aecf206bbca Mon Sep 17 00:00:00 2001
From: Brian Aker <brian@tangent.org>
Date: Wed, 31 Oct 2012 00:32:14 -0400
Subject: [PATCH] Update checkout code.

---
 m4/ax_vcs_checkout.m4 | 44 ++++++++++++++++---------------------------
 man/include.am        |  2 +-
 2 files changed, 17 insertions(+), 29 deletions(-)

diff --git a/m4/ax_vcs_checkout.m4 b/m4/ax_vcs_checkout.m4
index af4635ae..9475cab7 100644
--- a/m4/ax_vcs_checkout.m4
+++ b/m4/ax_vcs_checkout.m4
@@ -47,38 +47,26 @@
 
 #serial 5
 
-AC_DEFUN([AX_VCS_SYSTEM],[
-    AC_CACHE_CHECK([for vcs system], [ac_cv_vcs_system], [
-      AS_IF([test -d ".bzr"],[
-        ac_cv_vcs_system="bazaar"
-        ])
-      AS_IF([test -d ".svn"],[
-        ac_cv_vcs_system="svn"
-        ])
-      AS_IF([test -d ".hg"],[
-        ac_cv_vcs_system="mercurial"
-        ])
-      AS_IF([test -d ".git"],[
-        ac_cv_vcs_system="git"
-        ])
-      ],[
-      ac_cv_vcs_system="none"
+AC_DEFUN([AX_VCS_SYSTEM],
+    [AC_CACHE_CHECK([for vcs system], [ac_cv_vcs_system],
+      [ac_cv_vcs_system="none"
+      AS_IF([test -d ".bzr"],[ac_cv_vcs_system="bazaar"])
+      AS_IF([test -d ".svn"],[ac_cv_vcs_system="svn"])
+      AS_IF([test -d ".hg"],[ac_cv_vcs_system="mercurial"])
+      AS_IF([test -d ".git"],[ac_cv_vcs_system="git"])
       ])
-
     ])
 
-AC_DEFUN([AX_VCS_CHECKOUT],[
-    AC_REQUIRE([AX_VCS_SYSTEM])
-    AC_CACHE_CHECK([for vcs checkout], [ac_cv_vcs_checkout], [
-      AS_IF([test "x$ac_cv_vcs_system" != "xnone"],[
-        ac_cv_vcs_checkout=yes
-        ],[
-        ac_cv_vcs_checkout=no
-        ])
+AC_DEFUN([AX_VCS_CHECKOUT],
+    [AC_REQUIRE([AX_VCS_SYSTEM])
+    AC_CACHE_CHECK([for vcs checkout],[ac_cv_vcs_checkout],
+      [AS_IF([test "x$ac_cv_vcs_system" != "xnone"],
+        [ac_cv_vcs_checkout=yes],
+        [ac_cv_vcs_checkout=no])
       ])
 
-    AM_CONDITIONAL([VCS_CHECKOUT], [test "$ac_cv_vcs_checkout" = "yes"])
-    AS_IF([test "x$ac_cv_vcs_checkout" = "xyes"],[
-      AC_DEFINE([VCS_CHECKOUT], [1], [Define if the code was built from VCS.])
+    AM_CONDITIONAL([IS_VCS_CHECKOUT], [test "x$ac_cv_vcs_checkout" = "xyes"])
+    AS_IF([test "x$ac_cv_vcs_checkout" = "xyes"],
+      [AC_DEFINE([VCS_CHECKOUT], [1], [Define if the code was built from VCS.])
       ])
     ])
diff --git a/man/include.am b/man/include.am
index 2b621022..621fd612 100644
--- a/man/include.am
+++ b/man/include.am
@@ -4,7 +4,7 @@
 
 if HAVE_RECENT_SPHINX
 
-if VCS_CHECKOUT
+if IS_VCS_CHECKOUT
 
 dist-hook: man
 
-- 
2.30.2