security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

Update gpg-error.m4 and libgcrypt.m4

This commit is contained in:
Werner Koch 2011-02-23 16:29:45 +01:00
parent 6902560059
commit cf8878cb18
3 changed files with 40 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
m4/ChangeLog
View File

@ -1,3 +1,7 @@
2011-02-23 Werner Koch <wk@g10code.com>
* libgcrypt.m4, gpg-error.m4: Update from their GIT masters.
2010-06-08 Werner Koch <wk@g10code.com> 2010-06-08 Werner Koch <wk@g10code.com>
* ldap.m4 (gnupg_have_ldap): Set variable. * ldap.m4 (gnupg_have_ldap): Set variable.
@ -86,7 +90,7 @@
2006-07-27 Werner Koch <wk@g10code.com> 2006-07-27 Werner Koch <wk@g10code.com>
* autobuild.m4: New. * autobuild.m4: New.
2006-06-30 Werner Koch <wk@g10code.com> 2006-06-30 Werner Koch <wk@g10code.com>
@ -144,4 +148,3 @@
* uintmax_t.m4: New file, from gettext-0.11.5. * uintmax_t.m4: New file, from gettext-0.11.5.
* ulonglong.m4: New file, from gettext-0.11.5. * ulonglong.m4: New file, from gettext-0.11.5.
* Makefile.am: New file. * Makefile.am: New file.

20
m4/gpg-error.m4
View File

@ -24,7 +24,7 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
fi fi
fi fi
AC_PATH_PROG(GPG_ERROR_CONFIG, gpg-error-config, no) AC_PATH_TOOL(GPG_ERROR_CONFIG, gpg-error-config, no)
min_gpg_error_version=ifelse([$1], ,0.0,$1) min_gpg_error_version=ifelse([$1], ,0.0,$1)
AC_MSG_CHECKING(for GPG Error - version >= $min_gpg_error_version) AC_MSG_CHECKING(for GPG Error - version >= $min_gpg_error_version)
ok=no ok=no
@ -40,7 +40,7 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'` sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
if test "$major" -gt "$req_major"; then if test "$major" -gt "$req_major"; then
ok=yes ok=yes
else else
if test "$major" -eq "$req_major"; then if test "$major" -eq "$req_major"; then
if test "$minor" -ge "$req_minor"; then if test "$minor" -ge "$req_minor"; then
ok=yes ok=yes
@ -53,6 +53,21 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
GPG_ERROR_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --libs` GPG_ERROR_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --libs`
AC_MSG_RESULT([yes ($gpg_error_config_version)]) AC_MSG_RESULT([yes ($gpg_error_config_version)])
ifelse([$2], , :, [$2]) ifelse([$2], , :, [$2])
if test x"$host" != x ; then
gpg_error_config_host=`$GPG_ERROR_CONFIG $gpg_error_config_args --host 2>/dev/null || echo none`
if test x"$gpg_error_config_host" != xnone ; then
if test x"$gpg_error_config_host" != x"$host" ; then
AC_MSG_WARN([[
***
*** The config script $GPG_ERROR_CONFIG was
*** built for $gpg_error_config_host and thus may not match the
*** used host $host.
*** You may want to use the configure option --with-gpg-error-prefix
*** to specify a matching config script.
***]])
fi
fi
fi
else else
GPG_ERROR_CFLAGS="" GPG_ERROR_CFLAGS=""
GPG_ERROR_LIBS="" GPG_ERROR_LIBS=""
@ -62,4 +77,3 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
AC_SUBST(GPG_ERROR_CFLAGS) AC_SUBST(GPG_ERROR_CFLAGS)
AC_SUBST(GPG_ERROR_LIBS) AC_SUBST(GPG_ERROR_LIBS)
]) ])

21
m4/libgcrypt.m4
View File

@ -15,7 +15,7 @@ dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
dnl Test for libgcrypt and define LIBGCRYPT_CFLAGS and LIBGCRYPT_LIBS. dnl Test for libgcrypt and define LIBGCRYPT_CFLAGS and LIBGCRYPT_LIBS.
dnl MINIMUN-VERSION is a string with the version number optionalliy prefixed dnl MINIMUN-VERSION is a string with the version number optionalliy prefixed
dnl with the API version to also check the API compatibility. Example: dnl with the API version to also check the API compatibility. Example:
dnl a MINIMUN-VERSION of 1:1.2.5 won't pass the test unless the installed dnl a MINIMUN-VERSION of 1:1.2.5 won't pass the test unless the installed
dnl version of libgcrypt is at least 1.2.5 *and* the API number is 1. Using dnl version of libgcrypt is at least 1.2.5 *and* the API number is 1. Using
dnl this features allows to prevent build against newer versions of libgcrypt dnl this features allows to prevent build against newer versions of libgcrypt
dnl with a changed API. dnl with a changed API.
@ -31,7 +31,7 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
fi fi
fi fi
AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no) AC_PATH_TOOL(LIBGCRYPT_CONFIG, libgcrypt-config, no)
tmp=ifelse([$1], ,1:1.2.0,$1) tmp=ifelse([$1], ,1:1.2.0,$1)
if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
req_libgcrypt_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` req_libgcrypt_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'`
@ -59,7 +59,7 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'` sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
if test "$major" -gt "$req_major"; then if test "$major" -gt "$req_major"; then
ok=yes ok=yes
else else
if test "$major" -eq "$req_major"; then if test "$major" -eq "$req_major"; then
if test "$minor" -gt "$req_minor"; then if test "$minor" -gt "$req_minor"; then
ok=yes ok=yes
@ -98,6 +98,21 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags` LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags`
LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs` LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs`
ifelse([$2], , :, [$2]) ifelse([$2], , :, [$2])
if test x"$host" != x ; then
libgcrypt_config_host=`$LIBGCRYPT_CONFIG --host 2>/dev/null || echo none`
if test x"$libgcrypt_config_host" != xnone ; then
if test x"$libgcrypt_config_host" != x"$host" ; then
AC_MSG_WARN([[
***
*** The config script $LIBGCRYPT_CONFIG was
*** built for $libgcrypt_config_host and thus may not match the
*** used host $host.
*** You may want to use the configure option --with-libgcrypt-prefix
*** to specify a matching config script.
***]])
fi
fi
fi
else else
LIBGCRYPT_CFLAGS="" LIBGCRYPT_CFLAGS=""
LIBGCRYPT_LIBS="" LIBGCRYPT_LIBS=""