diff --git a/trunk/ChangeLog b/trunk/ChangeLog
index 8458c9bb..9ea316f6 100644
--- a/trunk/ChangeLog
+++ b/trunk/ChangeLog
@@ -1,3 +1,7 @@
+2004-10-22  Marcus Brinkmann  <marcus@g10code.de>
+
+	* configure.ac: Set HAVE_GPGSM to true only if $GPGSM is not "no".
+
 2004-09-30  Marcus Brinkmann  <marcus@g10code.de>
 
 	Released 1.0.0.
diff --git a/trunk/configure.ac b/trunk/configure.ac
index 53af0950..8d2f092f 100644
--- a/trunk/configure.ac
+++ b/trunk/configure.ac
@@ -330,7 +330,7 @@ else
   AC_DEFINE_UNQUOTED(GPGSM_PATH, "$GPGSM", [Path to the GPGSM binary.])
   AC_SUBST(GPGSM)
 fi
-AM_CONDITIONAL(HAVE_GPGSM, [test -n "$GPGSM"])
+AM_CONDITIONAL(HAVE_GPGSM, ["$GPGSM" != "no"])
 dnl Check for GPGSM version requirement.
 GPGSM_VERSION=unknown
 ok=maybe