GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2004-09-14 Marcus Brinkmann <marcus@g10code.de>

Browse Source 
* configure.ac: Improve diagnostics with version check.
This commit is contained in:
Marcus Brinkmann 2004-09-14 19:47:50 +00:00
parent c9209a7d19
commit 84af83d668
2 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -1,5 +1,7 @@
2004-09-14 Marcus Brinkmann <marcus@g10code.de> 2004-09-14 Marcus Brinkmann <marcus@g10code.de>
* configure.ac: Improve diagnostics with version check.
* configure.ac: Print diagnostics about found thread libraries at * configure.ac: Print diagnostics about found thread libraries at
the end. Check for the versions of GPG and GPGSM and print the the end. Check for the versions of GPG and GPGSM and print the
found versions at the end. found versions at the end.

36
configure.ac
View File

@ -241,8 +241,21 @@ else
fi fi
dnl Check for GnuPG version requirement. dnl Check for GnuPG version requirement.
GPG_VERSION=unknown GPG_VERSION=unknown
ok=no ok=maybe
if test "$cross_compiling" != "yes" -a -n "$GPG" -a -r "$GPG"; then if test -z "$GPG" -o "x$GPG" = "xno"; then
ok=no
else
if test "$cross_compiling" = "yes"; then
AC_MSG_WARN([GnuPG version can not be checked when cross compiling])
ok=no
else
if test ! -x "$GPG"; then
AC_MSG_WARN([GnuPG not executable, version check disabled])
ok=no
fi
fi
fi
if test "$ok" = "maybe"; then
AC_MSG_CHECKING(for GnuPG >= $NEED_GPG_VERSION) AC_MSG_CHECKING(for GnuPG >= $NEED_GPG_VERSION)
req_major=`echo $NEED_GPG_VERSION | \ req_major=`echo $NEED_GPG_VERSION | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
@ -277,6 +290,7 @@ if test "$cross_compiling" != "yes" -a -n "$GPG" -a -r "$GPG"; then
if test "$ok" = "yes"; then if test "$ok" = "yes"; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
else else
AC_MSG_RESULT(no)
AC_MSG_WARN([GnuPG must be at least version $NEED_GPG_VERSION]) AC_MSG_WARN([GnuPG must be at least version $NEED_GPG_VERSION])
fi fi
fi fi
@ -318,8 +332,21 @@ fi
AM_CONDITIONAL(HAVE_GPGSM, [test -n "$GPGSM"]) AM_CONDITIONAL(HAVE_GPGSM, [test -n "$GPGSM"])
dnl Check for GPGSM version requirement. dnl Check for GPGSM version requirement.
GPGSM_VERSION=unknown GPGSM_VERSION=unknown
ok=no ok=maybe
if test "$cross_compiling" != "yes" -a -n "$GPGSM" -a -r "$GPGSM"; then if test -z "$GPGSM" -o "x$GPGSM" = "xno"; then
ok=no
else
if test "$cross_compiling" = "yes"; then
AC_MSG_WARN([GPGSM version can not be checked when cross compiling])
ok=no
else
if test ! -x "$GPGSM"; then
AC_MSG_WARN([GPGSM not executable, version check disabled])
ok=no
fi
fi
fi
if test "$ok" = "maybe"; then
AC_MSG_CHECKING(for GPGSM >= $NEED_GPGSM_VERSION) AC_MSG_CHECKING(for GPGSM >= $NEED_GPGSM_VERSION)
req_major=`echo $NEED_GPGSM_VERSION | \ req_major=`echo $NEED_GPGSM_VERSION | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
@ -354,6 +381,7 @@ if test "$cross_compiling" != "yes" -a -n "$GPGSM" -a -r "$GPGSM"; then
if test "$ok" = "yes"; then if test "$ok" = "yes"; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
else else
AC_MSG_RESULT(no)
AC_MSG_WARN([GPGSM must be at least version $NEED_GPGSM_VERSION]) AC_MSG_WARN([GPGSM must be at least version $NEED_GPGSM_VERSION])
fi fi
fi fi