|
|
|
|
Index: configure
|
|
|
|
|
--- configure.orig 2016-03-07 21:35:07.000000000 +0100
|
|
|
|
|
+++ configure 2016-05-14 22:06:57.052220102 +0200
|
|
|
|
|
@@ -6780,10 +6780,7 @@
|
|
|
|
|
if $ac_preproc_ok; then :
|
|
|
|
|
|
|
|
|
|
else
|
|
|
|
|
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
|
|
|
|
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
|
|
|
|
-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
|
|
|
|
|
-See \`config.log' for more details" "$LINENO" 5; }
|
|
|
|
|
+ :
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
ac_ext=c
|
|
|
|
|
@@ -12855,7 +12852,7 @@
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
if test "${enable_fts3}" = "yes" ; then
|
|
|
|
|
- OPT_FEATURE_FLAGS+=" -DSQLITE_ENABLE_FTS3"
|
|
|
|
|
+ OPT_FEATURE_FLAGS="$OPT_FEATURE_FLAGS -DSQLITE_ENABLE_FTS3"
|
|
|
|
|
fi
|
|
|
|
|
# Check whether --enable-fts4 was given.
|
|
|
|
|
if test "${enable_fts4+set}" = set; then :
|
|
|
|
|
@@ -12865,7 +12862,7 @@
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
if test "${enable_fts4}" = "yes" ; then
|
|
|
|
|
- OPT_FEATURE_FLAGS+=" -DSQLITE_ENABLE_FTS4"
|
|
|
|
|
+ OPT_FEATURE_FLAGS="$OPT_FEATURE_FLAGS -DSQLITE_ENABLE_FTS4"
|
|
|
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing log" >&5
|
|
|
|
|
$as_echo_n "checking for library containing log... " >&6; }
|
|
|
|
|
if ${ac_cv_search_log+:} false; then :
|
|
|
|
|
@@ -12931,7 +12928,7 @@
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
if test "${enable_fts5}" = "yes" ; then
|
|
|
|
|
- OPT_FEATURE_FLAGS+=" -DSQLITE_ENABLE_FTS5"
|
|
|
|
|
+ OPT_FEATURE_FLAGS="$OPT_FEATURE_FLAGS -DSQLITE_ENABLE_FTS5"
|
|
|
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing log" >&5
|
|
|
|
|
$as_echo_n "checking for library containing log... " >&6; }
|
|
|
|
|
if ${ac_cv_search_log+:} false; then :
|
|
|
|
|
@@ -13000,7 +12997,7 @@
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
if test "${enable_json1}" = "yes" ; then
|
|
|
|
|
- OPT_FEATURE_FLAGS+=" -DSQLITE_ENABLE_JSON1"
|
|
|
|
|
+ OPT_FEATURE_FLAGS="$OPT_FEATURE_FLAGS -DSQLITE_ENABLE_JSON1"
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
#########
|
|
|
|
|
@@ -13013,7 +13010,7 @@
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
if test "${enable_rtree}" = "yes" ; then
|
|
|
|
|
- OPT_FEATURE_FLAGS+=" -DSQLITE_ENABLE_RTREE"
|
|
|
|
|
+ OPT_FEATURE_FLAGS="$OPT_FEATURE_FLAGS -DSQLITE_ENABLE_RTREE"
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
#########
|
|
|
|
|
Index: sqlcipher.pc.in
|
|
|
|
|
--- sqlcipher.pc.in.orig 2016-03-07 21:35:07.000000000 +0100
|
|
|
|
|
+++ sqlcipher.pc.in 2016-05-14 22:07:13.682541483 +0200
|
|
|
|
|
@@ -8,6 +8,5 @@
|
|
|
|
|
Name: SQLCipher
|
|
|
|
|
Description: SQL database engine
|
|
|
|
|
Version: @PACKAGE_VERSION@
|
|
|
|
|
-Libs: -L${libdir} -lsqlcipher
|
|
|
|
|
-Libs.private: @LIBS@
|
|
|
|
|
+Libs: -L${libdir} -lsqlcipher @LIBS@
|
|
|
|
|
Cflags: -I${includedir}/sqlcipher
|
|
|
|
|
Index: sqlite.pc.in
|
|
|
|
|
--- sqlite.pc.in.orig 2016-03-07 21:35:07.000000000 +0100
|
|
|
|
|
+++ sqlite.pc.in 2016-05-14 22:06:57.052220102 +0200
|
|
|
|
|
@@ -8,6 +8,5 @@
|
|
|
|
|
Name: SQLite
|
|
|
|
|
Description: SQL database engine
|
|
|
|
|
Version: @RELEASE@
|
|
|
|
|
-Libs: -L${libdir} -lsqlite
|
|
|
|
|
-Libs.private: @LIBS@
|
|
|
|
|
+Libs: -L${libdir} -lsqlite @LIBS@
|
|
|
|
|
Cflags: -I${includedir}
|
