diff --git a/configure b/configure
index 7e9ba95..c179520 100755
--- a/configure
+++ b/configure
@@ -16538,7 +16538,7 @@
 fi
 
 
-# Conditionally use libsqlite3.  AX_LIB_SQLITE3 defines HAVE_SQLITE3.
+# Conditionally use libsqlite3.  AX_LIB_SQLITE3 defines HAVE_SQLITE3 in confdefs.h .
 
 
 # Check whether --with-sqlite3 was given.
@@ -16682,7 +16682,7 @@
         fi
     fi
 
-if test "$HAVE_SQLITE3" == 1 ; then
+if grep -q "#define HAVE_SQLITE3" confdefs.h ; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_open in -lsqlite3" >&5
 $as_echo_n "checking for sqlite3_open in -lsqlite3... " >&6; }
 if ${ac_cv_lib_sqlite3_sqlite3_open+:} false; then :
@@ -16756,25 +16756,22 @@
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_OSX_SECKEYCHAIN 1
-_ACEOF
-
+    HAVE_OSX_SECKEYCHAIN=1
 
 else
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_OSX_SECKEYCHAIN 0
-_ACEOF
-
+    HAVE_OSX_SECKEYCHAIN=0
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
+cat >>confdefs.h <<_ACEOF
+#define HAVE_OSX_SECKEYCHAIN $HAVE_OSX_SECKEYCHAIN
+_ACEOF
+
+
 
 
 
diff --git a/configure.ac b/configure.ac
index f22e967..f352260 100644
--- a/configure.ac
+++ b/configure.ac
@@ -93,9 +93,9 @@
 AC_CHECK_LIB([crypto], [EVP_EncryptInit], [],
              [AC_MSG_FAILURE([can't find openssl crypto lib])])
 
-# Conditionally use libsqlite3.  AX_LIB_SQLITE3 defines HAVE_SQLITE3.
+# Conditionally use libsqlite3.  AX_LIB_SQLITE3 defines HAVE_SQLITE3 in confdefs.h .
 AX_LIB_SQLITE3()
-if test "$HAVE_SQLITE3" == 1 ; then
+if grep -q "#define HAVE_SQLITE3" confdefs.h ; then
 AC_CHECK_LIB([sqlite3], [sqlite3_open], [],
              [AC_MSG_FAILURE([have sqlite2 headers but no libsqlite3])])
 fi
@@ -108,11 +108,12 @@
     [[void test() { SecKeychainRef x; }]])
 ], [
     AC_MSG_RESULT([yes])
-    AC_DEFINE_UNQUOTED([HAVE_OSX_SECKEYCHAIN], 1, [1 if have OSX SecKeychain.])
+    HAVE_OSX_SECKEYCHAIN=1
 ], [
     AC_MSG_RESULT([no])
-    AC_DEFINE_UNQUOTED([HAVE_OSX_SECKEYCHAIN], 0, [1 if have OSX SecKeychain.])
+    HAVE_OSX_SECKEYCHAIN=0
 ])
+AC_DEFINE_UNQUOTED([HAVE_OSX_SECKEYCHAIN], $HAVE_OSX_SECKEYCHAIN, [1 if have OSX SecKeychain.])
 
 DX_HTML_FEATURE(ON)
 DX_CHM_FEATURE(OFF)