Update m4.

[awesomized/libmemcached] / m4 / ax_vcs_checkout.m4

diff --git a/m4/ax_vcs_checkout.m4 b/m4/ax_vcs_checkout.m4
index 020586f3c90bbc30f9461fbb3b9fe52ba0adbbbd..af4635ae28b4b2a046fd70774c85e38ed39b95ed 100644 (file)
--- a/m4/ax_vcs_checkout.m4
+++ b/m4/ax_vcs_checkout.m4
@@ -45,17 +45,40 @@
 #  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 #  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#serial 4
+#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_CHECKOUT],[
+    AC_REQUIRE([AX_VCS_SYSTEM])
     AC_CACHE_CHECK([for vcs checkout], [ac_cv_vcs_checkout], [
-      AS_IF([test -d ".bzr"],[ac_cv_vcs_checkout=yes])
-      AS_IF([test -d ".svn"],[ac_cv_vcs_checkout=yes])
-      AS_IF([test -d ".hg"], [ac_cv_vcs_checkout=yes])
-      AS_IF([test -d ".git"],[ac_cv_vcs_checkout=yes])
-      ],[
-      ac_cv_vcs_checkout=no
+      AS_IF([test "x$ac_cv_vcs_system" != "xnone"],[
+        ac_cv_vcs_checkout=yes
+        ],[
+        ac_cv_vcs_checkout=no
+        ])
       ])
 
-    AM_CONDITIONAL([MAINTAINER_MODE], [ test "$ac_cv_vcs_checkout" = "yes" ])
+    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.])
+      ])
     ])