X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=m4%2Fsigrok.m4;h=2ca2444dfddf813abe3d26b94ed3d4d64c5d412f;hb=1c50255506971b0bdb37fca88c80a8146abbb6e4;hp=904fc8759465d6ea5add3fba1c1570e71ebdb780;hpb=c2b0f42989bb0f206e736dff5ac5946d93618545;p=libsigrok.git

diff --git a/m4/sigrok.m4 b/m4/sigrok.m4
index 904fc875..2ca2444d 100644
--- a/m4/sigrok.m4
+++ b/m4/sigrok.m4
@@ -18,7 +18,7 @@
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
-#serial 20150825
+#serial 20150910
 
 ## SR_APPEND(var-name, [list-sep,] element)
 ##
@@ -319,6 +319,19 @@ _SR_ARG_OPT_PKG(m4_defn([_SR_VAR_OPT_PKG_FEATURES]),
 	m4_shift3($@))[]dnl
 ])
 
+## SR_PROG_VERSION(program, sh-var)
+##
+## Obtain the version of <program> and store it in <sh-var>.
+##
+AC_DEFUN([SR_PROG_VERSION],
+[dnl
+m4_assert([$# >= 2])[]dnl
+sr_prog_ver=`$1 --version 2>&AS_MESSAGE_LOG_FD | sed 1q 2>&AS_MESSAGE_LOG_FD`
+AS_CASE([[$]?:$sr_prog_ver],
+	[[0:*[0-9].[0-9]*]], [$2=$sr_prog_ver],
+	[$2=unknown])[]dnl
+])
+
 ## SR_PROG_MAKE_ORDER_ONLY
 ##
 ## Check whether the make program supports order-only prerequisites.
@@ -327,7 +340,6 @@ _SR_ARG_OPT_PKG(m4_defn([_SR_VAR_OPT_PKG_FEATURES]),
 ##
 AC_DEFUN([SR_PROG_MAKE_ORDER_ONLY],
 [dnl
-AC_PROVIDE([$0])[]dnl
 AC_CACHE_CHECK([whether [$]{MAKE:-make} supports order-only prerequisites],
 	[sr_cv_prog_make_order_only], [
 cat >conftest.mk <<'_SREOF'
@@ -341,6 +353,7 @@ rm -f conftest.mk
 ])
 AS_IF([test "x$sr_cv_prog_make_order_only" = xyes], [ORDER='|'], [ORDER=])
 AC_SUBST([ORDER])
+AM_SUBST_NOTMAKE([ORDER])[]dnl
 ])
 
 ## SR_CHECK_COMPILE_FLAGS(flags-var, description, flags)