X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=configure.ac;h=a7ec5a511c2c97a9b7cd6950346c98b07891608f;hb=57aff1c0cf6029088ea77d69ee7d5c83527c4cf1;hp=d140b0865fd3d651e74c7b1fa073b4b989697c7c;hpb=74211da04fac64abca20883d03bab5bdd80cf5af;p=lttng-ust.git diff --git a/configure.ac b/configure.ac index d140b086..a7ec5a51 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ dnl Version infos m4_define([V_MAJOR], [2]) m4_define([V_MINOR], [12]) -m4_define([V_PATCH], [0]) +m4_define([V_PATCH], [1]) dnl m4_define([V_EXTRA], []) m4_define([V_NAME], [[(Ta) Meilleure]]) m4_define([V_DESC], [[Ta Meilleure is a Northeast IPA beer brewed by Lagabière. Translating to "Your best one", this beer gives out strong aromas of passion fruit, lemon, and peaches. Tastewise, expect a lot of fruit, a creamy texture, and a smooth lingering hop bitterness.]]) @@ -53,7 +53,8 @@ AC_REQUIRE_AUX_FILE([tap-driver.sh]) AC_USE_SYSTEM_EXTENSIONS AC_SYS_LARGEFILE AC_PROG_CC -AC_PROG_CC_STDC +# AC_PROG_CC_STDC was merged in AC_PROG_CC in autoconf 2.70 +m4_version_prereq([2.70], [], [AC_PROG_CC_STDC]) AC_PROG_CXX RW_PROG_CXX_WORKS AM_CONDITIONAL([CXX_WORKS], [test "x$rw_cv_prog_cxx_works" = "xyes"]) @@ -72,8 +73,8 @@ AC_PROG_GREP AC_PROG_LN_S AC_PROG_MKDIR_P AC_PROG_MAKE_SET -AC_CHECK_PROG([HAVE_CMAKE], [cmake], ["yes"]) -AM_CONDITIONAL([HAVE_CMAKE], [test "x$HAVE_CMAKE" = "xyes"]) +AC_CHECK_PROG([CMAKE], [cmake]) +AM_CONDITIONAL([HAVE_CMAKE], [test "x$CMAKE" != "x"]) # libtool link_all_deplibs fixup. See http://bugs.lttng.org/issues/321. AC_ARG_ENABLE([libtool-linkdep-fixup], [