8000 Adjusting the configure template for commoncrypto · magic-coder/sqlcipher@be057d3 · GitHub
[go: up one dir, main page]
Skip to content

Commit be057d3

Browse files
developernotesdevelopernotes
committed
Adjusting the configure template for commoncrypto
1 parent 1742ee4 commit be057d3

File tree

2 files changed

+2
-51
lines changed

2 files changed

+2
-51
lines changed

‎configure

Lines changed: 1 addition & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -10665,57 +10665,10 @@ fi
1066510665

1066610666
else
1066710667
if test "$crypto_lib" = "commoncrypto"; then
10668-
CFLAGS+=" -DSQLCIPHER_CRYPTO_OPENSSL -DSQLCIPHER_CRYPTO_CC"
10668+
CFLAGS+=" -DSQLCIPHER_CRYPTO_CC"
1066910669
BUILD_CFLAGS+=" -DSQLCIPHER_CRYPTO_OPENSSL -DSQLCIPHER_CRYPTO_CC"
1067010670
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: commoncrypto" >&5
1067110671
$as_echo "commoncrypto" >&6; }
10672-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for HMAC_Init_ex in -lcrypto" >&5
10673-
$as_echo_n "checking for HMAC_Init_ex in -lcrypto... " >&6; }
10674-
if ${ac_cv_lib_crypto_HMAC_Init_ex+:} false; then :
10675-
$as_echo_n "(cached) " >&6
10676-
else
10677-
ac_check_lib_save_LIBS=$LIBS
10678-
LIBS="-lcrypto $LIBS"
10679-
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10680-
/* end confdefs.h. */
10681-
10682-
/* Override any GCC internal prototype to avoid an error.
10683-
Use char because int might match the return type of a GCC
10684-
builtin and then its argument prototype would still apply. */
10685-
#ifdef __cplusplus
10686-
extern "C"
10687-
#endif
10688-
char HMAC_Init_ex ();
10689-
int
10690-
main ()
10691-
{
10692-
return HMAC_Init_ex ();
10693-
;
10694-
return 0;
10695-
}
10696-
_ACEOF
10697-
if ac_fn_c_try_link "$LINENO"; then :
10698-
ac_cv_lib_crypto_HMAC_Init_ex=yes
10699-
else
10700-
ac_cv_lib_crypto_HMAC_Init_ex=no
10701-
fi
10702-
rm -f core conftest.err conftest.$ac_objext \
10703-
conftest$ac_exeext conftest.$ac_ext
10704-
LIBS=$ac_check_lib_save_LIBS
10705-
fi
10706-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_HMAC_Init_ex" >&5
10707-
$as_echo "$ac_cv_lib_crypto_HMAC_Init_ex" >&6; }
10708-
if test "x$ac_cv_lib_crypto_HMAC_Init_ex" = xyes; then :
10709-
cat >>confdefs.h <<_ACEOF
10710-
#define HAVE_LIBCRYPTO 1
10711-
_ACEOF
10712-
10713-
LIBS="-lcrypto $LIBS"
10714-
10715-
else
10716-
as_fn_error $? "Library crypto not found. Install openssl!\"" "$LINENO" 5
10717-
fi
10718-
1071910672
else
1072010673
CFLAGS+=" -DSQLCIPHER_CRYPTO_OPENSSL"
1072110674
BUILD_CFLAGS+=" -DSQLCIPHER_CRYPTO_OPENSSL"

‎configure.ac

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -265,11 +265,9 @@ if test "$crypto_lib" = "libtomcrypt"; then
265265
AC_MSG_ERROR([Library crypto not found. Install libtomcrypt!"]))
266266
else
267267
if test "$crypto_lib" = "commoncrypto"; then
268-
CFLAGS+=" -DSQLCIPHER_CRYPTO_OPENSSL -DSQLCIPHER_CRYPTO_CC"
268+
CFLAGS+=" -DSQLCIPHER_CRYPTO_CC"
269269
BUILD_CFLAGS+=" -DSQLCIPHER_CRYPTO_OPENSSL -DSQLCIPHER_CRYPTO_CC"
270270
AC_MSG_RESULT([commoncrypto])
271-
AC_CHECK_LIB([crypto], [HMAC_Init_ex], ,
272-
AC_MSG_ERROR([Library crypto not found. Install openssl!"]))
273271
else
274272
CFLAGS+=" -DSQLCIPHER_CRYPTO_OPENSSL"
275273
BUILD_CFLAGS+=" -DSQLCIPHER_CRYPTO_OPENSSL"

0 commit comments

Comments
 (0)
0