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

	* configure.ac: Improve diagnostics with version check.

diff --git a/trunk/ChangeLog b/trunk/ChangeLog
index ddaa21404f4417161874492bd9b9e66aba654e4c..a9069f97b1bfccb4b4e8289bec5b17979540a971 100644 (file)
--- a/trunk/ChangeLog
+++ b/trunk/ChangeLog
@@ -1,5 +1,7 @@
 2004-09-14  Marcus Brinkmann  <marcus@g10code.de>
 
+       * configure.ac: Improve diagnostics with version check.
+
        * configure.ac: Print diagnostics about found thread libraries at
        the end.  Check for the versions of GPG and GPGSM and print the
        found versions at the end.

diff --git a/trunk/configure.ac b/trunk/configure.ac
index 858c807d02ff78093042248e1217c5810ef03869..d19c2a402023b2181d3c08ec84c76c6071842b7f 100644 (file)
--- a/trunk/configure.ac
+++ b/trunk/configure.ac
@@ -241,8 +241,21 @@ else
 fi
 dnl Check for GnuPG version requirement.
 GPG_VERSION=unknown
-ok=no
-if test "$cross_compiling" != "yes" -a -n "$GPG" -a -r "$GPG"; then
+ok=maybe
+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)
   req_major=`echo $NEED_GPG_VERSION | \
              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
     AC_MSG_RESULT(yes)
   else
+    AC_MSG_RESULT(no)
     AC_MSG_WARN([GnuPG must be at least version $NEED_GPG_VERSION])
   fi
 fi
@@ -318,8 +332,21 @@ fi
 AM_CONDITIONAL(HAVE_GPGSM, [test -n "$GPGSM"])
 dnl Check for GPGSM version requirement.
 GPGSM_VERSION=unknown
-ok=no
-if test "$cross_compiling" != "yes" -a -n "$GPGSM" -a -r "$GPGSM"; then
+ok=maybe
+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)
   req_major=`echo $NEED_GPGSM_VERSION | \
              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
     AC_MSG_RESULT(yes)
   else
+    AC_MSG_RESULT(no)
     AC_MSG_WARN([GPGSM must be at least version $NEED_GPGSM_VERSION])
   fi
 fi