aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2011-04-06 12:41:14 +0000
committerWerner Koch <[email protected]>2011-04-06 12:41:14 +0000
commit2a9687fced289571f19c95e0c759ac9eac41940c (patch)
tree735d6ced7030f3689d03be701973180d30855125
parentUpdated error code references (diff)
downloadlibgpg-error-2a9687fced289571f19c95e0c759ac9eac41940c.tar.gz
libgpg-error-2a9687fced289571f19c95e0c759ac9eac41940c.zip
Extra test for gpg-error-config script
If the path to gpg-error-config was explicitly given by the user it may happen that it does not exists but AC_CHECK_TOOL may assume it still exists because it is somewhere in the PATH. The extra check avoids extra sh warnings. Note that we can't use test -x because that is not defined on some old systems.
-rw-r--r--ChangeLog4
-rw-r--r--src/gpg-error.m43
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 3745c67..9334c75 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-04-06 Werner Koch <[email protected]>
+
+ * src/gpg-error.m4: Test whether gpg-error-config exists.
+
2011-02-23 Werner Koch <[email protected]>
* autogen.sh: Check git setup.
diff --git a/src/gpg-error.m4 b/src/gpg-error.m4
index 2e5a0ab..ef07fd7 100644
--- a/src/gpg-error.m4
+++ b/src/gpg-error.m4
@@ -29,7 +29,8 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
min_gpg_error_version=ifelse([$1], ,0.0,$1)
AC_MSG_CHECKING(for GPG Error - version >= $min_gpg_error_version)
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 | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
req_minor=`echo $min_gpg_error_version | \