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

This commit is contained in:
Stephen Lombardo 2013-06-21 11:11:36 -04:00
commit 0a767d7c15
2 changed files with 2 additions and 2 deletions

2
configure vendored
View File

@ -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

View File

@ -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"