X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=m4%2Fsigrok.m4;h=2ca2444dfddf813abe3d26b94ed3d4d64c5d412f;hp=a9b82f13bdbac10108f53ac9399bc64f7038a2a9;hb=9a1a7dc2832b0c51baff94ef551518d91f47ff31;hpb=2defc4116b57a73a69c1ad284a22bd2b2f7d8c68

diff --git a/m4/sigrok.m4 b/m4/sigrok.m4
index a9b82f13..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 20150907
+#serial 20150910
 
 ## SR_APPEND(var-name, [list-sep,] element)
 ##
@@ -319,26 +319,17 @@ _SR_ARG_OPT_PKG(m4_defn([_SR_VAR_OPT_PKG_FEATURES]),
 	m4_shift3($@))[]dnl
 ])
 
-## SR_PROG_MAKE_NO_PRINT_DIRECTORY
+## SR_PROG_VERSION(program, sh-var)
 ##
-## Check whether the make program supports the --no-print-directory flag.
-## If so, add it to AM_MAKEFLAGS.
+## Obtain the version of <program> and store it in <sh-var>.
 ##
-AC_DEFUN([SR_PROG_MAKE_NO_PRINT_DIRECTORY],
+AC_DEFUN([SR_PROG_VERSION],
 [dnl
-AC_CACHE_CHECK([whether [$]{MAKE:-make} supports --no-print-directory],
-	[sr_cv_prog_make_no_print_dir], [
-cat >conftest.mk <<'_SREOF'
-all: ; @:
-.PHONY: all
-_SREOF
-AS_IF([[$]{MAKE:-make} -f conftest.mk --no-print-directory >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD],
-	[sr_cv_prog_make_no_print_dir=yes], [sr_cv_prog_make_no_print_dir=no])
-rm -f conftest.mk
-])
-AS_IF([test "x$sr_cv_prog_make_no_print_dir" = xyes],
-	[SR_APPEND([AM_MAKEFLAGS], [--no-print-directory])])
-AC_SUBST([AM_MAKEFLAGS])
+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
@@ -362,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)