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

Update gpg-error.m4

Browse Source
This commit is contained in:
Werner Koch 2011-04-06 14:16:52 +02:00
parent 7e547d87d2
commit e54fe47db8
2 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
m4/ChangeLog
View File

@ -1,3 +1,7 @@
2011-04-06 Werner Koch <wk@g10code.com>
* gpg-error.m4: Update from current libgpg-error repo.
2010-05-07 Werner Koch <wk@g10code.com> 2010-05-07 Werner Koch <wk@g10code.com>
* libassuan.m4: Update from libassuan svn. * libassuan.m4: Update from libassuan svn.

26
m4/gpg-error.m4
View File

@ -1,5 +1,5 @@
# gpg-error.m4 - autoconf macro to detect libgpg-error. # gpg-error.m4 - autoconf macro to detect libgpg-error.
# Copyright (C) 2002, 2003, 2004 g10 Code GmbH # Copyright (C) 2002, 2003, 2004, 2011 g10 Code GmbH
# #
# This file is free software; as a special exception the author gives # This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without # unlimited permission to copy and/or distribute it, with or without
@ -14,7 +14,8 @@ dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
dnl Test for libgpg-error and define GPG_ERROR_CFLAGS and GPG_ERROR_LIBS dnl Test for libgpg-error and define GPG_ERROR_CFLAGS and GPG_ERROR_LIBS
dnl dnl
AC_DEFUN([AM_PATH_GPG_ERROR], AC_DEFUN([AM_PATH_GPG_ERROR],
[ AC_ARG_WITH(gpg-error-prefix, [ AC_REQUIRE([AC_CANONICAL_HOST])
AC_ARG_WITH(gpg-error-prefix,
AC_HELP_STRING([--with-gpg-error-prefix=PFX], AC_HELP_STRING([--with-gpg-error-prefix=PFX],
[prefix where GPG Error is installed (optional)]), [prefix where GPG Error is installed (optional)]),
gpg_error_config_prefix="$withval", gpg_error_config_prefix="") gpg_error_config_prefix="$withval", gpg_error_config_prefix="")
@ -24,11 +25,12 @@ 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
if test "$GPG_ERROR_CONFIG" != "no" ; then if test "$GPG_ERROR_CONFIG" != "no" \
&& test -f "$GPG_ERROR_CONFIG" ; then
req_major=`echo $min_gpg_error_version | \ req_major=`echo $min_gpg_error_version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
req_minor=`echo $min_gpg_error_version | \ req_minor=`echo $min_gpg_error_version | \
@ -51,8 +53,21 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
if test $ok = yes; then if test $ok = yes; then
GPG_ERROR_CFLAGS=`$GPG_ERROR_CONFIG $gpg_error_config_args --cflags` GPG_ERROR_CFLAGS=`$GPG_ERROR_CONFIG $gpg_error_config_args --cflags`
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) AC_MSG_RESULT([yes ($gpg_error_config_version)])
ifelse([$2], , :, [$2]) ifelse([$2], , :, [$2])
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
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)
]) ])