security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-17 15:44:34 +02:00
Code Activity

Fix npth version check.

Browse Source
This commit is contained in:
Marcus Brinkmann 2011-10-13 17:43:12 +02:00
parent 36e85416a3
commit 3a0f06e3e8
1 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
m4/npth.m4
View File

@ -23,11 +23,9 @@ AC_DEFUN([_AM_PATH_NPTH_CONFIG],
npth_version=`$NPTH_CONFIG --version` npth_version=`$NPTH_CONFIG --version`
fi fi
npth_version_major=`echo $npth_version | \ npth_version_major=`echo $npth_version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
npth_version_minor=`echo $npth_version | \ npth_version_minor=`echo $npth_version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'` sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
npth_version_micro=`echo $npth_version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
]) ])
dnl AM_PATH_NPTH([MINIMUM-VERSION, dnl AM_PATH_NPTH([MINIMUM-VERSION,
@ -36,7 +34,7 @@ dnl Test for libnpth and define NPTH_CFLAGS and NPTH_LIBS.
dnl dnl
AC_DEFUN([AM_PATH_NPTH], AC_DEFUN([AM_PATH_NPTH],
[ AC_REQUIRE([_AM_PATH_NPTH_CONFIG])dnl [ AC_REQUIRE([_AM_PATH_NPTH_CONFIG])dnl
tmp=ifelse([$1], ,1:0.0.1,$1) tmp=ifelse([$1], ,1:0.0,$1)
if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
req_npth_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` req_npth_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'`
min_npth_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'` min_npth_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'`
@ -49,23 +47,16 @@ AC_DEFUN([AM_PATH_NPTH],
ok=no ok=no
if test "$NPTH_CONFIG" != "no" ; then if test "$NPTH_CONFIG" != "no" ; then
req_major=`echo $min_npth_version | \ req_major=`echo $min_npth_version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
req_minor=`echo $min_npth_version | \ req_minor=`echo $min_npth_version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
req_micro=`echo $min_npth_version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
if test "$npth_version_major" -gt "$req_major"; then if test "$npth_version_major" -gt "$req_major"; then
ok=yes ok=yes
else else
if test "$npth_version_major" -eq "$req_major"; then if test "$npth_version_major" -eq "$req_major"; then
if test "$npth_version_minor" -gt "$req_minor"; then if test "$npth_version_minor" -ge "$req_minor"; then
ok=yes ok=yes
else
if test "$npth_version_minor" -eq "$req_minor"; then
if test "$npth_version_micro" -ge "$req_micro"; then
ok=yes
fi
fi
fi fi
fi fi
fi fi