diff options
| author | Werner Koch <[email protected]> | 2011-02-23 11:44:07 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2011-02-23 11:44:07 +0000 |
| commit | 7dc62ce5a81261255d9f25d3b08f5fa1f71e8fb7 (patch) | |
| tree | 575fa86161e00315bbdad70f10bb9c63ca8318ba /src | |
| parent | Add GPG_ERR_INV_CURVE and GPG_ERR_UNKNOWN_CURVE (diff) | |
| download | libgpg-error-7dc62ce5a81261255d9f25d3b08f5fa1f71e8fb7.tar.gz libgpg-error-7dc62ce5a81261255d9f25d3b08f5fa1f71e8fb7.zip | |
Make gpg-error-config and gpg-error.m4 more robust.
This is done by taking host prefixed config scripts names in account
(as suggested by bug#1261) and adding a new config option --host to
print a warning if the used config script was not built for the
current host. Care has been taken not to mess things up if an old
config script without the option is used or if AC_CANONICAL_HOST has
not been used.
Diffstat (limited to 'src')
| -rw-r--r-- | src/gpg-error-config.in | 4 | ||||
| -rw-r--r-- | src/gpg-error.m4 | 20 |
2 files changed, 21 insertions, 3 deletions
diff --git a/src/gpg-error-config.in b/src/gpg-error-config.in index 4be0343..14f0625 100644 --- a/src/gpg-error-config.in +++ b/src/gpg-error-config.in @@ -74,6 +74,10 @@ while test $# -gt 0; do fi output="$output @GPG_ERROR_CONFIG_LIBS@" ;; + --host) + echo "@GPG_ERROR_CONFIG_HOST@" + exit 0 + ;; *) usage 1 1>&2 ;; diff --git a/src/gpg-error.m4 b/src/gpg-error.m4 index 9d96d16..8d82925 100644 --- a/src/gpg-error.m4 +++ b/src/gpg-error.m4 @@ -24,7 +24,7 @@ AC_DEFUN([AM_PATH_GPG_ERROR], 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) AC_MSG_CHECKING(for GPG Error - version >= $min_gpg_error_version) ok=no @@ -40,7 +40,7 @@ AC_DEFUN([AM_PATH_GPG_ERROR], sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'` if test "$major" -gt "$req_major"; then ok=yes - else + else if test "$major" -eq "$req_major"; then if test "$minor" -ge "$req_minor"; then ok=yes @@ -53,6 +53,21 @@ AC_DEFUN([AM_PATH_GPG_ERROR], GPG_ERROR_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --libs` AC_MSG_RESULT([yes ($gpg_error_config_version)]) 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 GPG_ERROR_CFLAGS="" GPG_ERROR_LIBS="" @@ -62,4 +77,3 @@ AC_DEFUN([AM_PATH_GPG_ERROR], AC_SUBST(GPG_ERROR_CFLAGS) AC_SUBST(GPG_ERROR_LIBS) ]) - |