1 diff -up sqlite-3.6.4/configure.ac.orig sqlite-3.6.4/configure.ac
2 --- sqlite-3.6.4/configure.ac.orig 2008-11-08 11:37:15.000000000 +0200
3 +++ sqlite-3.6.4/configure.ac 2008-11-08 11:35:50.000000000 +0200
4 @@ -606,6 +606,7 @@ AC_ARG_ENABLE(load-extension, AC_HELP_ST
5 [use_loadextension=$enableval],[use_loadextension=no])
6 if test "${use_loadextension}" = "yes" ; then
8 + AC_SEARCH_LIBS(dlopen, [dl])
10 OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1"
12 diff -up sqlite-3.6.4/configure.orig sqlite-3.6.4/configure
13 --- sqlite-3.6.4/configure.orig 2008-11-08 11:39:22.000000000 +0200
14 +++ sqlite-3.6.4/configure 2008-11-08 11:39:29.000000000 +0200
17 # Guess values for system-dependent variables and create Makefiles.
18 -# Generated by GNU Autoconf 2.59 for sqlite 3.6.1.
19 +# Generated by GNU Autoconf 2.59 for sqlite 3.6.4.
21 # Copyright (C) 2003 Free Software Foundation, Inc.
22 # This configure script is free software; the Free Software Foundation
23 @@ -416,8 +416,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
24 # Identity of this package.
26 PACKAGE_TARNAME='sqlite'
27 -PACKAGE_VERSION='3.6.1'
28 -PACKAGE_STRING='sqlite 3.6.1'
29 +PACKAGE_VERSION='3.6.4'
30 +PACKAGE_STRING='sqlite 3.6.4'
33 # Factoring default headers for most tests.
34 @@ -926,7 +926,7 @@ if test "$ac_init_help" = "long"; then
35 # Omit some internal or obsolete options to make the list less imposing.
36 # This message is too long to be a string in the A/UX 3.1 sh.
38 -\`configure' configures sqlite 3.6.1 to adapt to many kinds of systems.
39 +\`configure' configures sqlite 3.6.4 to adapt to many kinds of systems.
41 Usage: $0 [OPTION]... [VAR=VALUE]...
43 @@ -987,7 +987,7 @@ fi
45 if test -n "$ac_init_help"; then
47 - short | recursive ) echo "Configuration of sqlite 3.6.1:";;
48 + short | recursive ) echo "Configuration of sqlite 3.6.4:";;
52 @@ -1137,7 +1137,7 @@ fi
53 test -n "$ac_init_help" && exit 0
54 if $ac_init_version; then
56 -sqlite configure 3.6.1
57 +sqlite configure 3.6.4
58 generated by GNU Autoconf 2.59
60 Copyright (C) 2003 Free Software Foundation, Inc.
61 @@ -1151,7 +1151,7 @@ cat >&5 <<_ACEOF
62 This file contains any messages produced by compilers while
63 running configure, to aid debugging if configure makes a mistake.
65 -It was created by sqlite $as_me 3.6.1, which was
66 +It was created by sqlite $as_me 3.6.4, which was
67 generated by GNU Autoconf 2.59. Invocation command line was
70 @@ -1489,7 +1489,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
73 # The following RCS revision string applies to configure.in
79 @@ -11266,10 +11266,6 @@ if test "$TARGET_EXEEXT" = ".exe"; then
82 CFLAGS="$CFLAGS -DSQLITE_OS_OS2=1"
83 - if test "$ac_compiler_gnu" = "yes" ; then
84 - CFLAGS="$CFLAGS -Zomf -Zexe -Zmap"
85 - BUILD_CFLAGS="$BUILD_CFLAGS -Zomf -Zexe"
90 @@ -12066,6 +12062,132 @@ else
92 if test "${use_loadextension}" = "yes" ; then
94 + echo "$as_me:$LINENO: checking for library containing dlopen" >&5
95 +echo $ECHO_N "checking for library containing dlopen... $ECHO_C" >&6
96 +if test "${ac_cv_search_dlopen+set}" = set; then
97 + echo $ECHO_N "(cached) $ECHO_C" >&6
99 + ac_func_search_save_LIBS=$LIBS
100 +ac_cv_search_dlopen=no
101 +cat >conftest.$ac_ext <<_ACEOF
104 +cat confdefs.h >>conftest.$ac_ext
105 +cat >>conftest.$ac_ext <<_ACEOF
106 +/* end confdefs.h. */
108 +/* Override any gcc2 internal prototype to avoid an error. */
112 +/* We use char because int might match the return type of a gcc2
113 + builtin and then its argument prototype would still apply. */
123 +rm -f conftest.$ac_objext conftest$ac_exeext
124 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
125 + (eval $ac_link) 2>conftest.er1
127 + grep -v '^ *+' conftest.er1 >conftest.err
129 + cat conftest.err >&5
130 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
131 + (exit $ac_status); } &&
132 + { ac_try='test -z "$ac_c_werror_flag"
133 + || test ! -s conftest.err'
134 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
135 + (eval $ac_try) 2>&5
137 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
138 + (exit $ac_status); }; } &&
139 + { ac_try='test -s conftest$ac_exeext'
140 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
141 + (eval $ac_try) 2>&5
143 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
144 + (exit $ac_status); }; }; then
145 + ac_cv_search_dlopen="none required"
147 + echo "$as_me: failed program was:" >&5
148 +sed 's/^/| /' conftest.$ac_ext >&5
151 +rm -f conftest.err conftest.$ac_objext \
152 + conftest$ac_exeext conftest.$ac_ext
153 +if test "$ac_cv_search_dlopen" = no; then
154 + for ac_lib in dl; do
155 + LIBS="-l$ac_lib $ac_func_search_save_LIBS"
156 + cat >conftest.$ac_ext <<_ACEOF
159 +cat confdefs.h >>conftest.$ac_ext
160 +cat >>conftest.$ac_ext <<_ACEOF
161 +/* end confdefs.h. */
163 +/* Override any gcc2 internal prototype to avoid an error. */
167 +/* We use char because int might match the return type of a gcc2
168 + builtin and then its argument prototype would still apply. */
178 +rm -f conftest.$ac_objext conftest$ac_exeext
179 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
180 + (eval $ac_link) 2>conftest.er1
182 + grep -v '^ *+' conftest.er1 >conftest.err
184 + cat conftest.err >&5
185 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
186 + (exit $ac_status); } &&
187 + { ac_try='test -z "$ac_c_werror_flag"
188 + || test ! -s conftest.err'
189 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
190 + (eval $ac_try) 2>&5
192 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
193 + (exit $ac_status); }; } &&
194 + { ac_try='test -s conftest$ac_exeext'
195 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
196 + (eval $ac_try) 2>&5
198 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
199 + (exit $ac_status); }; }; then
200 + ac_cv_search_dlopen="-l$ac_lib"
203 + echo "$as_me: failed program was:" >&5
204 +sed 's/^/| /' conftest.$ac_ext >&5
207 +rm -f conftest.err conftest.$ac_objext \
208 + conftest$ac_exeext conftest.$ac_ext
211 +LIBS=$ac_func_search_save_LIBS
213 +echo "$as_me:$LINENO: result: $ac_cv_search_dlopen" >&5
214 +echo "${ECHO_T}$ac_cv_search_dlopen" >&6
215 +if test "$ac_cv_search_dlopen" != no; then
216 + test "$ac_cv_search_dlopen" = "none required" || LIBS="$ac_cv_search_dlopen $LIBS"
221 OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1"
223 @@ -12506,7 +12628,7 @@ _ASBOX
227 -This file was extended by sqlite $as_me 3.6.1, which was
228 +This file was extended by sqlite $as_me 3.6.4, which was
229 generated by GNU Autoconf 2.59. Invocation command line was
231 CONFIG_FILES = $CONFIG_FILES
232 @@ -12569,7 +12691,7 @@ _ACEOF
234 cat >>$CONFIG_STATUS <<_ACEOF
236 -sqlite config.status 3.6.1
237 +sqlite config.status 3.6.4
238 configured by $0, generated by GNU Autoconf 2.59,
239 with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"