| OLD | NEW |
| 1 # | 1 # |
| 2 # The build process allows for using a cross-compiler. But the default | 2 # The build process allows for using a cross-compiler. But the default |
| 3 # action is to target the same platform that we are running on. The | 3 # action is to target the same platform that we are running on. The |
| 4 # configure script needs to discover the following properties of the | 4 # configure script needs to discover the following properties of the |
| 5 # build and target systems: | 5 # build and target systems: |
| 6 # | 6 # |
| 7 # srcdir | 7 # srcdir |
| 8 # | 8 # |
| 9 # The is the name of the directory that contains the | 9 # The is the name of the directory that contains the |
| 10 # "configure" shell script. All source files are | 10 # "configure" shell script. All source files are |
| (...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 132 ######### | 132 ######### |
| 133 # By default, we use the amalgamation (this may be changed below...) | 133 # By default, we use the amalgamation (this may be changed below...) |
| 134 # | 134 # |
| 135 USE_AMALGAMATION=1 | 135 USE_AMALGAMATION=1 |
| 136 | 136 |
| 137 ######### | 137 ######### |
| 138 # See whether we can run specific tclsh versions known to work well; | 138 # See whether we can run specific tclsh versions known to work well; |
| 139 # if not, then we fall back to plain tclsh. | 139 # if not, then we fall back to plain tclsh. |
| 140 # TODO: try other versions before falling back? | 140 # TODO: try other versions before falling back? |
| 141 # | 141 # |
| 142 AC_CHECK_PROGS(TCLSH_CMD, [tclsh8.4 tclsh], none) | 142 AC_CHECK_PROGS(TCLSH_CMD, [tclsh8.5 tclsh], none) |
| 143 if test "$TCLSH_CMD" = "none"; then | 143 if test "$TCLSH_CMD" = "none"; then |
| 144 # If we can't find a local tclsh, then building the amalgamation will fail. | 144 # If we can't find a local tclsh, then building the amalgamation will fail. |
| 145 # We act as though --disable-amalgamation has been used. | 145 # We act as though --disable-amalgamation has been used. |
| 146 echo "Warning: can't find tclsh - defaulting to non-amalgamation build." | 146 echo "Warning: can't find tclsh - defaulting to non-amalgamation build." |
| 147 USE_AMALGAMATION=0 | 147 USE_AMALGAMATION=0 |
| 148 TCLSH_CMD="tclsh" | 148 TCLSH_CMD="tclsh" |
| 149 fi | 149 fi |
| 150 AC_SUBST(TCLSH_CMD) | 150 AC_SUBST(TCLSH_CMD) |
| 151 | 151 |
| 152 AC_ARG_VAR([TCLLIBDIR], [Where to install tcl plugin]) | 152 AC_ARG_VAR([TCLLIBDIR], [Where to install tcl plugin]) |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 262 if test "$enable_xthreadconnect" = "no"; then | 262 if test "$enable_xthreadconnect" = "no"; then |
| 263 XTHREADCONNECT='' | 263 XTHREADCONNECT='' |
| 264 AC_MSG_RESULT([no]) | 264 AC_MSG_RESULT([no]) |
| 265 else | 265 else |
| 266 XTHREADCONNECT='-DSQLITE_ALLOW_XTHREAD_CONNECT=1' | 266 XTHREADCONNECT='-DSQLITE_ALLOW_XTHREAD_CONNECT=1' |
| 267 AC_MSG_RESULT([yes]) | 267 AC_MSG_RESULT([yes]) |
| 268 fi | 268 fi |
| 269 AC_SUBST(XTHREADCONNECT) | 269 AC_SUBST(XTHREADCONNECT) |
| 270 | 270 |
| 271 ########## | 271 ########## |
| 272 # Do we want to set threadsOverrideEachOthersLocks variable to be 1 (true) by | |
| 273 # default. Normally, a test at runtime is performed to determine the | |
| 274 # appropriate value of this variable. Use this option only if you're sure that | |
| 275 # threads can safely override each others locks in all runtime situations. | |
| 276 # | |
| 277 AC_ARG_ENABLE(threads-override-locks, | |
| 278 AC_HELP_STRING([--enable-threads-override-locks],[Threads can override each othe
rs locks]),,enable_threads_override_locks=no) | |
| 279 AC_MSG_CHECKING([whether threads can override each others locks]) | |
| 280 if test "$enable_threads_override_locks" = "no"; then | |
| 281 THREADSOVERRIDELOCKS='-1' | |
| 282 AC_MSG_RESULT([no]) | |
| 283 else | |
| 284 THREADSOVERRIDELOCKS='1' | |
| 285 AC_MSG_RESULT([yes]) | |
| 286 fi | |
| 287 AC_SUBST(THREADSOVERRIDELOCKS) | |
| 288 | |
| 289 ########## | |
| 290 # Do we want to support release | 272 # Do we want to support release |
| 291 # | 273 # |
| 292 AC_ARG_ENABLE(releasemode, | 274 AC_ARG_ENABLE(releasemode, |
| 293 AC_HELP_STRING([--enable-releasemode],[Support libtool link to release mode]),,e
nable_releasemode=no) | 275 AC_HELP_STRING([--enable-releasemode],[Support libtool link to release mode]),,e
nable_releasemode=no) |
| 294 AC_MSG_CHECKING([whether to support shared library linked as release mode or not
]) | 276 AC_MSG_CHECKING([whether to support shared library linked as release mode or not
]) |
| 295 if test "$enable_releasemode" = "no"; then | 277 if test "$enable_releasemode" = "no"; then |
| 296 ALLOWRELEASE="" | 278 ALLOWRELEASE="" |
| 297 AC_MSG_RESULT([no]) | 279 AC_MSG_RESULT([no]) |
| 298 else | 280 else |
| 299 ALLOWRELEASE="-release `cat $srcdir/VERSION`" | 281 ALLOWRELEASE="-release `cat $srcdir/VERSION`" |
| (...skipping 410 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 710 AC_CONFIG_HEADERS(config.h) | 692 AC_CONFIG_HEADERS(config.h) |
| 711 | 693 |
| 712 ######### | 694 ######### |
| 713 # Generate the output files. | 695 # Generate the output files. |
| 714 # | 696 # |
| 715 AC_SUBST(BUILD_CFLAGS) | 697 AC_SUBST(BUILD_CFLAGS) |
| 716 AC_OUTPUT([ | 698 AC_OUTPUT([ |
| 717 Makefile | 699 Makefile |
| 718 sqlite3.pc | 700 sqlite3.pc |
| 719 ]) | 701 ]) |
| OLD | NEW |