1
diff -Naur sqlite-3.6.12.orig/configure sqlite-3.6.12/configure
2
--- sqlite-3.6.12.orig/configure 2009-04-01 01:48:57.000000000 +0200
3
+++ sqlite-3.6.12/configure 2009-05-04 09:12:45.815333164 +0200
10
enable_cross_thread_connections
11
enable_threads_override_locks
16
-enable_load_extension
19
ac_precious_vars='build_alias
21
optimize for fast installation [default=yes]
22
--disable-libtool-lock avoid locking (might break parallel builds)
23
--disable-largefile omit support for large files
24
+ --enable-load-extension Include SQL functions for loading extension
26
--enable-threadsafe Support threadsafe operation
27
--enable-cross-thread-connections
28
Allow connection sharing across threads
32
# The following RCS revision string applies to configure.in
38
@@ -3725,13 +3727,13 @@
40
lt_cv_nm_interface="BSD nm"
41
echo "int some_variable = 0;" > conftest.$ac_ext
42
- (eval echo "\"\$as_me:3728: $ac_compile\"" >&5)
43
+ (eval echo "\"\$as_me:3730: $ac_compile\"" >&5)
44
(eval "$ac_compile" 2>conftest.err)
46
- (eval echo "\"\$as_me:3731: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
47
+ (eval echo "\"\$as_me:3733: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
48
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
50
- (eval echo "\"\$as_me:3734: output\"" >&5)
51
+ (eval echo "\"\$as_me:3736: output\"" >&5)
53
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
54
lt_cv_nm_interface="MS dumpbin"
58
# Find out which ABI we are using.
59
- echo '#line 4940 "configure"' > conftest.$ac_ext
60
+ echo '#line 4942 "configure"' > conftest.$ac_ext
61
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
62
(eval $ac_compile) 2>&5
64
@@ -6790,11 +6792,11 @@
65
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
66
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
67
-e 's:$: $lt_compiler_flag:'`
68
- (eval echo "\"\$as_me:6793: $lt_compile\"" >&5)
69
+ (eval echo "\"\$as_me:6795: $lt_compile\"" >&5)
70
(eval "$lt_compile" 2>conftest.err)
73
- echo "$as_me:6797: \$? = $ac_status" >&5
74
+ echo "$as_me:6799: \$? = $ac_status" >&5
75
if (exit $ac_status) && test -s "$ac_outfile"; then
76
# The compiler can only warn and ignore the option if not recognized
77
# So say no if there are warnings other than the usual output.
78
@@ -7129,11 +7131,11 @@
79
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
80
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
81
-e 's:$: $lt_compiler_flag:'`
82
- (eval echo "\"\$as_me:7132: $lt_compile\"" >&5)
83
+ (eval echo "\"\$as_me:7134: $lt_compile\"" >&5)
84
(eval "$lt_compile" 2>conftest.err)
87
- echo "$as_me:7136: \$? = $ac_status" >&5
88
+ echo "$as_me:7138: \$? = $ac_status" >&5
89
if (exit $ac_status) && test -s "$ac_outfile"; then
90
# The compiler can only warn and ignore the option if not recognized
91
# So say no if there are warnings other than the usual output.
92
@@ -7234,11 +7236,11 @@
93
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
94
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
95
-e 's:$: $lt_compiler_flag:'`
96
- (eval echo "\"\$as_me:7237: $lt_compile\"" >&5)
97
+ (eval echo "\"\$as_me:7239: $lt_compile\"" >&5)
98
(eval "$lt_compile" 2>out/conftest.err)
100
cat out/conftest.err >&5
101
- echo "$as_me:7241: \$? = $ac_status" >&5
102
+ echo "$as_me:7243: \$? = $ac_status" >&5
103
if (exit $ac_status) && test -s out/conftest2.$ac_objext
105
# The compiler can only warn and ignore the option if not recognized
106
@@ -7289,11 +7291,11 @@
107
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
108
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
109
-e 's:$: $lt_compiler_flag:'`
110
- (eval echo "\"\$as_me:7292: $lt_compile\"" >&5)
111
+ (eval echo "\"\$as_me:7294: $lt_compile\"" >&5)
112
(eval "$lt_compile" 2>out/conftest.err)
114
cat out/conftest.err >&5
115
- echo "$as_me:7296: \$? = $ac_status" >&5
116
+ echo "$as_me:7298: \$? = $ac_status" >&5
117
if (exit $ac_status) && test -s out/conftest2.$ac_objext
119
# The compiler can only warn and ignore the option if not recognized
120
@@ -10102,7 +10104,7 @@
121
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
122
lt_status=$lt_dlunknown
123
cat > conftest.$ac_ext <<_LT_EOF
124
-#line 10105 "configure"
125
+#line 10107 "configure"
126
#include "confdefs.h"
129
@@ -10198,7 +10200,7 @@
130
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
131
lt_status=$lt_dlunknown
132
cat > conftest.$ac_ext <<_LT_EOF
133
-#line 10201 "configure"
134
+#line 10203 "configure"
135
#include "confdefs.h"
138
@@ -12400,6 +12402,136 @@
142
+# Do we want to support load_extension()?
144
+# Check whether --enable-load-extension was given.
145
+if test "${enable_load_extension+set}" = set; then
146
+ enableval=$enable_load_extension;
148
+ enable_load_extension=auto
152
+if test "x$enable_load_extension" = xyes ||
153
+ test "x$enable_load_extension" = xauto; then
155
+ can_load_extension=yes
156
+ # libtool will already have looked for <dlfcn.h>
157
+ if test $ac_cv_header_dlfcn_h = no; then
158
+ can_load_extension=no
160
+ { $as_echo "$as_me:$LINENO: checking for library containing dlopen" >&5
161
+$as_echo_n "checking for library containing dlopen... " >&6; }
162
+if test "${ac_cv_search_dlopen+set}" = set; then
163
+ $as_echo_n "(cached) " >&6
165
+ ac_func_search_save_LIBS=$LIBS
166
+cat >conftest.$ac_ext <<_ACEOF
169
+cat confdefs.h >>conftest.$ac_ext
170
+cat >>conftest.$ac_ext <<_ACEOF
171
+/* end confdefs.h. */
173
+/* Override any GCC internal prototype to avoid an error.
174
+ Use char because int might match the return type of a GCC
175
+ builtin and then its argument prototype would still apply. */
188
+for ac_lib in '' dl; do
189
+ if test -z "$ac_lib"; then
190
+ ac_res="none required"
193
+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
195
+ rm -f conftest.$ac_objext conftest$ac_exeext
196
+if { (ac_try="$ac_link"
198
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
199
+ *) ac_try_echo=$ac_try;;
201
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
202
+$as_echo "$ac_try_echo") >&5
203
+ (eval "$ac_link") 2>conftest.er1
205
+ grep -v '^ *+' conftest.er1 >conftest.err
207
+ cat conftest.err >&5
208
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
209
+ (exit $ac_status); } && {
210
+ test -z "$ac_c_werror_flag" ||
211
+ test ! -s conftest.err
212
+ } && test -s conftest$ac_exeext && {
213
+ test "$cross_compiling" = yes ||
214
+ $as_test_x conftest$ac_exeext
216
+ ac_cv_search_dlopen=$ac_res
218
+ $as_echo "$as_me: failed program was:" >&5
219
+sed 's/^/| /' conftest.$ac_ext >&5
224
+rm -rf conftest.dSYM
225
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
227
+ if test "${ac_cv_search_dlopen+set}" = set; then
231
+if test "${ac_cv_search_dlopen+set}" = set; then
234
+ ac_cv_search_dlopen=no
237
+LIBS=$ac_func_search_save_LIBS
239
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_dlopen" >&5
240
+$as_echo "$ac_cv_search_dlopen" >&6; }
241
+ac_res=$ac_cv_search_dlopen
242
+if test "$ac_res" != no; then
243
+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
246
+ can_load_extension=no
250
+elif test "x$enable_load_extension" = xno; then
251
+ can_load_extension=no
253
+ { { $as_echo "$as_me:$LINENO: error: invalid argument to --enable-load-extension" >&5
254
+$as_echo "$as_me: error: invalid argument to --enable-load-extension" >&2;}
255
+ { (exit 1); exit 1; }; }
258
+if test $can_load_extension = no; then
259
+ if test "x$enable_load_extension" = xyes; then
260
+ { { $as_echo "$as_me:$LINENO: error: <dlfcn.h> routines missing, load_extension() not supported" >&5
261
+$as_echo "$as_me: error: <dlfcn.h> routines missing, load_extension() not supported" >&2;}
262
+ { (exit 1); exit 1; }; }
265
+cat >>confdefs.h <<\_ACEOF
266
+#define SQLITE_OMIT_LOAD_EXTENSION 1
272
# Do we want to support multithreaded use of sqlite
274
# Check whether --enable-threadsafe was given.
275
diff -Naur sqlite-3.6.12.orig/configure.ac sqlite-3.6.12/configure.ac
276
--- sqlite-3.6.12.orig/configure.ac 2009-02-15 14:07:08.000000000 +0100
277
+++ sqlite-3.6.12/configure.ac 2009-05-04 09:12:22.277336345 +0200
282
+# Do we want to support load_extension()?
284
+AC_ARG_ENABLE(load-extension,
285
+AC_HELP_STRING([--enable-load-extension],
286
+ [Include SQL functions for loading extension libraries]),,
287
+ enable_load_extension=auto)
289
+if test "x$enable_load_extension" = xyes ||
290
+ test "x$enable_load_extension" = xauto; then
292
+ can_load_extension=yes
293
+ # libtool will already have looked for <dlfcn.h>
294
+ if test $ac_cv_header_dlfcn_h = no; then
295
+ can_load_extension=no
297
+ AC_SEARCH_LIBS(dlopen, dl, , [can_load_extension=no])
299
+elif test "x$enable_load_extension" = xno; then
300
+ can_load_extension=no
302
+ AC_MSG_ERROR([invalid argument to --enable-load-extension])
305
+if test $can_load_extension = no; then
306
+ if test "x$enable_load_extension" = xyes; then
307
+ AC_MSG_ERROR([<dlfcn.h> routines missing, load_extension() not supported])
309
+ AC_DEFINE(SQLITE_OMIT_LOAD_EXTENSION, 1,
310
+ [Define if the load_extension() sql function should be omitted.])
314
# Do we want to support multithreaded use of sqlite
316
AC_ARG_ENABLE(threadsafe,
added
removed
patches/sqlite-3.6.12.dlsym.patch
