X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=m4%2Fax_vcs_checkout.m4;h=8047b65ec35a5bd4e5321f62394807a877161da5;hb=585b2385384b32af964b5f2f999e70173b33a460;hp=af4635ae28b4b2a046fd70774c85e38ed39b95ed;hpb=67209884de543fe89aebf9d186670062cc5277dc;p=awesomized%2Flibmemcached diff --git a/m4/ax_vcs_checkout.m4 b/m4/ax_vcs_checkout.m4 index af4635ae..8047b65e 100644 --- a/m4/ax_vcs_checkout.m4 +++ b/m4/ax_vcs_checkout.m4 @@ -45,40 +45,31 @@ # (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 5 +#serial 6 -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_PREREQ([2.63])dnl + 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_DEFINE_UNQUOTED([VCS_SYSTEM],["$ac_cv_vcs_system"],[VCS system]) ]) -AC_DEFUN([AX_VCS_CHECKOUT],[ +AC_DEFUN([AX_VCS_CHECKOUT], + [AC_PREREQ([2.63])dnl 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_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.])], + [AC_DEFINE([VCS_CHECKOUT],[0],[Define if the code was built from VCS.])]) ])