summaryrefslogtreecommitdiffstats
path: root/acinclude.m4
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2004-02-12 10:25:30 +0100
committerWerner Koch <wk@gnupg.org>2004-02-12 10:25:30 +0100
commit53d11566822393b91d8ca238a6bc98c7291440fe (patch)
tree97de2abda636124f435ecbd12c97568f4cc0f2cf /acinclude.m4
parentNew. Based on code from ../sm/base64.c. (diff)
downloadgnupg2-53d11566822393b91d8ca238a6bc98c7291440fe.tar.xz
gnupg2-53d11566822393b91d8ca238a6bc98c7291440fe.zip
* am/cmacros.am: New.
* configure.ac: Removed the need for g10defs.h. Reworked the --with-foo-pgm stuff. * autogen.sh (check_version): Removed bashism and simplified. * acinclude.m4 (AM_PATH_OPENSC): Kludge to avoid error output for a bad opensc-config.
Diffstat (limited to 'acinclude.m4')
-rw-r--r--acinclude.m42
1 files changed, 1 insertions, 1 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 023563422..6855cbee7 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -596,7 +596,7 @@ AC_DEFUN(AM_PATH_OPENSC,
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
req_micro=`echo $min_opensc_version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
- opensc_config_version=`$OPENSC_CONFIG $opensc_config_args --version`
+ opensc_config_version=`$OPENSC_CONFIG $opensc_config_args --version 2>/dev/null || echo 0.0.0`
major=`echo $opensc_config_version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
minor=`echo $opensc_config_version | \