From 08119c361d1181b3e8f1abb429236e488a664753 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 13 Aug 2013 15:42:54 -0400 Subject: Imported Upstream version 2.2.1 --- configure | 190 ++++++++++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 159 insertions(+), 31 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 7373415..69eb324 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for sqlite 3.7.14.1. +# Generated by GNU Autoconf 2.68 for sqlcipher 3.7.17. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -704,10 +704,10 @@ MFLAGS= MAKEFLAGS= # Identity of this package. -PACKAGE_NAME='sqlite' -PACKAGE_TARNAME='sqlite' -PACKAGE_VERSION='3.7.14.1' -PACKAGE_STRING='sqlite 3.7.14.1' +PACKAGE_NAME='sqlcipher' +PACKAGE_TARNAME='sqlcipher' +PACKAGE_VERSION='3.7.17' +PACKAGE_STRING='sqlcipher 3.7.17' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -765,7 +765,6 @@ TCL_LIB_SPEC TCL_LIB_FLAG TCL_LIB_FILE TCL_INCLUDE_SPEC -TCL_LIBS TCL_SRC_DIR TCL_BIN_DIR TCL_VERSION @@ -875,6 +874,7 @@ enable_libtool_lock enable_largefile with_hints enable_threadsafe +with_crypto_lib enable_cross_thread_connections enable_releasemode enable_tempstore @@ -1440,7 +1440,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures sqlite 3.7.14.1 to adapt to many kinds of systems. +\`configure' configures sqlcipher 3.7.17 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1488,7 +1488,7 @@ Fine tuning of the installation directories: --infodir=DIR info documentation [DATAROOTDIR/info] --localedir=DIR locale-dependent data [DATAROOTDIR/locale] --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root [DATAROOTDIR/doc/sqlite] + --docdir=DIR documentation root [DATAROOTDIR/doc/sqlcipher] --htmldir=DIR html documentation [DOCDIR] --dvidir=DIR dvi documentation [DOCDIR] --pdfdir=DIR pdf documentation [DOCDIR] @@ -1505,7 +1505,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of sqlite 3.7.14.1:";; + short | recursive ) echo "Configuration of sqlcipher 3.7.17:";; esac cat <<\_ACEOF @@ -1540,6 +1540,7 @@ Optional Packages: both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-hints=FILE Read configuration options from FILE + --with-crypto-lib Specify which crypto library to use --with-tcl=DIR directory containing tcl configuration (tclConfig.sh) --with-readline-lib specify readline library @@ -1622,7 +1623,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -sqlite configure 3.7.14.1 +sqlcipher configure 3.7.17 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2041,7 +2042,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by sqlite $as_me 3.7.14.1, which was +It was created by sqlcipher $as_me 3.7.17, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -3903,13 +3904,13 @@ if ${lt_cv_nm_interface+:} false; then : else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:3906: $ac_compile\"" >&5) + (eval echo "\"\$as_me:3907: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:3909: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:3910: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:3912: output\"" >&5) + (eval echo "\"\$as_me:3913: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -5115,7 +5116,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5118 "configure"' > conftest.$ac_ext + echo '#line 5119 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -6640,11 +6641,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6643: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6644: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6647: \$? = $ac_status" >&5 + echo "$as_me:6648: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6979,11 +6980,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6982: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6983: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6986: \$? = $ac_status" >&5 + echo "$as_me:6987: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7084,11 +7085,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7087: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7088: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7091: \$? = $ac_status" >&5 + echo "$as_me:7092: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -7139,11 +7140,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7142: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7143: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7146: \$? = $ac_status" >&5 + echo "$as_me:7147: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9519,7 +9520,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 9522 "configure" +#line 9523 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -9615,7 +9616,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 9618 "configure" +#line 9619 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10378,7 +10379,6 @@ if test "x${TCLLIBDIR+set}" != "xset" ; then TCLLIBDIR="${TCLLIBDIR}/sqlite3" fi - ######### # Set up an appropriate program prefix # @@ -10581,6 +10581,135 @@ fi fi +########## +# Which crypto library do we use +# + +# Check whether --with-crypto-lib was given. +if test "${with_crypto_lib+set}" = set; then : + withval=$with_crypto_lib; crypto_lib=$withval +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypto library to use" >&5 +$as_echo_n "checking for crypto library to use... " >&6; } +if test "$crypto_lib" = "none"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 +$as_echo "none" >&6; } +else + if test "$crypto_lib" = "commoncrypto"; then + CFLAGS+=" -DSQLCIPHER_CRYPTO_CC" + BUILD_CFLAGS+=" -DSQLCIPHER_CRYPTO_CC" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: commoncrypto" >&5 +$as_echo "commoncrypto" >&6; } + else + if test "$crypto_lib" = "libtomcrypt"; then + CFLAGS+=" -DSQLCIPHER_CRYPTO_LIBTOMCRYPT" + BUILD_CFLAGS+=" -DSQLCIPHER_CRYPTO_LIBTOMCRYPT" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: libtomcrypt" >&5 +$as_echo "libtomcrypt" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for register_cipher in -ltomcrypt" >&5 +$as_echo_n "checking for register_cipher in -ltomcrypt... " >&6; } +if ${ac_cv_lib_tomcrypt_register_cipher+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ltomcrypt $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char register_cipher (); +int +main () +{ +return register_cipher (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_tomcrypt_register_cipher=yes +else + ac_cv_lib_tomcrypt_register_cipher=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tomcrypt_register_cipher" >&5 +$as_echo "$ac_cv_lib_tomcrypt_register_cipher" >&6; } +if test "x$ac_cv_lib_tomcrypt_register_cipher" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBTOMCRYPT 1 +_ACEOF + + LIBS="-ltomcrypt $LIBS" + +else + as_fn_error $? "Library crypto not found. Install libtomcrypt!\"" "$LINENO" 5 +fi + + else + CFLAGS+=" -DSQLCIPHER_CRYPTO_OPENSSL" + BUILD_CFLAGS+=" -DSQLCIPHER_CRYPTO_OPENSSL" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: openssl" >&5 +$as_echo "openssl" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for HMAC_Init_ex in -lcrypto" >&5 +$as_echo_n "checking for HMAC_Init_ex in -lcrypto... " >&6; } +if ${ac_cv_lib_crypto_HMAC_Init_ex+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lcrypto $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char HMAC_Init_ex (); +int +main () +{ +return HMAC_Init_ex (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_crypto_HMAC_Init_ex=yes +else + ac_cv_lib_crypto_HMAC_Init_ex=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_HMAC_Init_ex" >&5 +$as_echo "$ac_cv_lib_crypto_HMAC_Init_ex" >&6; } +if test "x$ac_cv_lib_crypto_HMAC_Init_ex" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBCRYPTO 1 +_ACEOF + + LIBS="-lcrypto $LIBS" + +else + as_fn_error $? "Library crypto not found. Install openssl!\"" "$LINENO" 5 +fi + + fi + fi +fi + ########## # Do we want to allow a connection created in one thread to be used # in another thread. This does not work on many Linux systems (ex: RedHat 9) @@ -10898,7 +11027,6 @@ $as_echo "file not found" >&6; } - fi fi if test "${use_tcl}" = "no" ; then @@ -11350,7 +11478,7 @@ ac_config_headers="$ac_config_headers config.h" # Generate the output files. # -ac_config_files="$ac_config_files Makefile sqlite3.pc" +ac_config_files="$ac_config_files Makefile sqlcipher.pc" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -11870,7 +11998,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by sqlite $as_me 3.7.14.1, which was +This file was extended by sqlcipher $as_me 3.7.17, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -11936,7 +12064,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -sqlite config.status 3.7.14.1 +sqlcipher config.status 3.7.17 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" @@ -12321,7 +12449,7 @@ do "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "sqlite3.pc") CONFIG_FILES="$CONFIG_FILES sqlite3.pc" ;; + "sqlcipher.pc") CONFIG_FILES="$CONFIG_FILES sqlcipher.pc" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac -- cgit v1.2.3