printf ': "$${%s=%s}"\n' \
datadir '$(datadir)' \
LN_S '$(LN_S)' \
- MD5SUM '$(MD5SUM)' \
+ MD5 '$(MD5)' \
PAMARITH '$(PAMARITH)' \
PAMCHANNEL '$(PAMCHANNEL)' \
; } >$@.tmp
-Subproject commit 843799dbec995b276a7d017bb32c053747b55400
+Subproject commit 57a2e9b84fe5ec89d919373dae66bb4924926d7a
AM_CONDITIONAL([BUILD_LBXGUI], [$have_gtk])
# Check for utilities used by the test suite.
-DX_PROG_MD5SUM
-AS_IF([test x"$dx_cv_md5sum_works" = x"yes"],
- [HAVE_MD5SUM=true], [HAVE_MD5SUM=false])
-AC_SUBST([HAVE_MD5SUM])
+DX_PROG_MD5
AC_CHECK_PROGS([PAMARITH], [pamarith], [false])
AC_CHECK_PROGS([PAMCHANNEL], [pamchannel], [false])
+++ /dev/null
-AC_DEFUN([DX_PROG_MD5SUM], [dnl
-AC_CHECK_PROGS([MD5SUM], [md5sum], [false])
-AC_CACHE_CHECK([whether md5sum works], [dx_cv_md5sum_works], [dnl
- dx_cv_md5sum_works=yes
- # Positive test
- cat >conftest.md5 <<'EOF'
-d41d8cd98f00b204e9800998ecf8427e /dev/null
-EOF
- if $MD5SUM -c conftest.md5 >/dev/null 2>&1; then :; else
- dx_cv_md5sum_works=no
- fi
- # Negative test
- cat >conftest.md5 <<'EOF'
-d41d8cd98f00b204e9810998ecf8427e /dev/null
-EOF
- if $MD5SUM -c conftest.md5 >/dev/null 2>&1; then
- dx_cv_md5sum_works=no
- fi
- rm -f conftest.md5
-])])
m4_divert_push([PREPARE_TESTS])dnl
# Compute MD5 hash of standard input.
test_md5sum () {
- set x `md5sum </dev/null`
- case $2 in
- d41d8cd98f00b204e9800998ecf8427e) set x `md5sum && echo $?` ;;
- *) return 77 ;;
- esac
- echo $2
- eval "return \$$#"
+ set x `$MD5 </dev/null 2>/dev/null`
+ for md5_pos in 2 $#; do
+ AS_VAR_COPY([md5_digest], [$md5_pos])
+ case $md5_digest in
+ d41d8cd98f00b204e9800998ecf8427e)
+ set x `$MD5 && echo $?`
+ eval "echo \$$md5_pos; return \$$#"
+ esac
+ done
+ return 77
}
m4_divert_pop([PREPARE_TESTS])