Merge branch 'prerelease' of github.com:sqlcipher/sqlcipher into prerelease

sjlombardo · sjlombardo · commit 0a767d7c1560 · 2013-06-21T11:11:36.000-04:00
diff --git a/configure b/configure
@@ -10666,7 +10666,7 @@ fi
 else
   if test "$crypto_lib" = "commoncrypto"; then
     CFLAGS+=" -DSQLCIPHER_CRYPTO_CC"
-    BUILD_CFLAGS+=" -DSQLCIPHER_CRYPTO_OPENSSL -DSQLCIPHER_CRYPTO_CC"
+    BUILD_CFLAGS+=" -DSQLCIPHER_CRYPTO_CC"
 	  { $as_echo "$as_me:${as_lineno-$LINENO}: result: commoncrypto" >&5
 $as_echo "commoncrypto" >&6; }
   else
diff --git a/configure.ac b/configure.ac
@@ -266,7 +266,7 @@ if test "$crypto_lib" = "libtomcrypt"; then
 else
   if test "$crypto_lib" = "commoncrypto"; then
     CFLAGS+=" -DSQLCIPHER_CRYPTO_CC"
-    BUILD_CFLAGS+=" -DSQLCIPHER_CRYPTO_OPENSSL -DSQLCIPHER_CRYPTO_CC"
+    BUILD_CFLAGS+=" -DSQLCIPHER_CRYPTO_CC"
 	  AC_MSG_RESULT([commoncrypto])
   else
     CFLAGS+=" -DSQLCIPHER_CRYPTO_OPENSSL"
