Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Pthread is now conditionally included in makefile, see ticket #910 (CVS 1974) |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
a35e52276998f8db2407115b07f30bd4 |
User & Date: | dougcurrie 2004-09-20 14:57:23.000 |
Context
2004-09-24
| ||
12:24 | Fix for tickets #912 and #922. Problem introduced by check-in (1973). (CVS 1975) (check-in: 9001e2220d user: drh tags: trunk) | |
2004-09-20
| ||
14:57 | Pthread is now conditionally included in makefile, see ticket #910 (CVS 1974) (check-in: a35e522769 user: dougcurrie tags: trunk) | |
2004-09-19
| ||
02:15 | Add comments to unused P3 fields of selected instructions when NDEBUG is not defined. This makes VDBE program dumps more readable during debugging. (CVS 1973) (check-in: 4871c77f8f user: drh tags: trunk) | |
Changes
Changes to Makefile.in.
︙ | ︙ | |||
57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 | # The library that programs using readline() must link against. # LIBREADLINE = @TARGET_READLINE_LIBS@ # Should the database engine be compiled threadsafe # THREADSAFE = -DTHREADSAFE=@THREADSAFE@ # Flags controlling use of the in memory btree implementation # # TEMP_STORE is 0 to force temporary tables to be in a file, 1 to # default to file, 2 to default to memory, and 3 to force temporary # tables to always be in memory. # TEMP_STORE = -DTEMP_STORE=@TEMP_STORE@ # You should not have to change anything below this line ############################################################################### | > > > > < < < < | 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 | # The library that programs using readline() must link against. # LIBREADLINE = @TARGET_READLINE_LIBS@ # Should the database engine be compiled threadsafe # THREADSAFE = -DTHREADSAFE=@THREADSAFE@ # The pthreads library if needed # LIBPTHREAD=@TARGET_THREAD_LIB@ # Flags controlling use of the in memory btree implementation # # TEMP_STORE is 0 to force temporary tables to be in a file, 1 to # default to file, 2 to default to memory, and 3 to force temporary # tables to always be in memory. # TEMP_STORE = -DTEMP_STORE=@TEMP_STORE@ # You should not have to change anything below this line ############################################################################### # Object files for the SQLite library. # LIBOBJ = attach.lo auth.lo btree.lo build.lo date.lo delete.lo \ expr.lo func.lo hash.lo insert.lo \ main.lo opcodes.lo os_mac.lo os_unix.lo os_win.lo \ pager.lo parse.lo pragma.lo printf.lo random.lo \ select.lo table.lo tokenize.lo trigger.lo update.lo util.lo vacuum.lo \ |
︙ | ︙ |
Changes to configure.
︙ | ︙ | |||
459 460 461 462 463 464 465 | # include <stdint.h> # endif #endif #if HAVE_UNISTD_H # include <unistd.h> #endif" | | | 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 | # include <stdint.h> # endif #endif #if HAVE_UNISTD_H # include <unistd.h> #endif" ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CPP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA program_prefix VERSION BUILD_CC BUILD_CFLAGS BUILD_LIBS TARGET_CC TARGET_CFLAGS TARGET_LINK TARGET_LFLAGS TARGET_RANLIB TARGET_AR THREADSAFE TARGET_THREAD_LIB ALLOWRELEASE TEMP_STORE BUILD_EXEEXT OS_UNIX OS_WIN TARGET_EXEEXT TARGET_LIBS TARGET_TCL_LIBS TARGET_TCL_INC TARGET_READLINE_LIBS TARGET_READLINE_INC TARGET_HAVE_READLINE LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. ac_init_help= ac_init_version=false # The variables have the same names as the options, with # dashes changed to underlines. |
︙ | ︙ | |||
1489 1490 1491 1492 1493 1494 1495 | # The following RCS revision string applies to configure.in | | | 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 | # The following RCS revision string applies to configure.in # $Revision: 1.25 $ ######### # Programs needed # # Check whether --enable-shared or --disable-shared was given. if test "${enable_shared+set}" = set; then enableval="$enable_shared" |
︙ | ︙ | |||
19402 19403 19404 19405 19406 19407 19408 19409 19410 19411 19412 19413 19414 19415 | echo "${ECHO_T}no" >&6 else THREADSAFE=1 echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 fi ########## # Do we want to support release # # Check whether --enable-releasemode or --disable-releasemode was given. if test "${enable_releasemode+set}" = set; then enableval="$enable_releasemode" | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 19402 19403 19404 19405 19406 19407 19408 19409 19410 19411 19412 19413 19414 19415 19416 19417 19418 19419 19420 19421 19422 19423 19424 19425 19426 19427 19428 19429 19430 19431 19432 19433 19434 19435 19436 19437 19438 19439 19440 19441 19442 19443 19444 19445 19446 19447 19448 19449 19450 19451 19452 19453 19454 19455 19456 19457 19458 19459 19460 19461 19462 19463 19464 19465 19466 19467 19468 19469 19470 19471 19472 19473 19474 19475 19476 19477 19478 19479 19480 19481 19482 19483 19484 19485 19486 19487 19488 19489 19490 19491 19492 19493 19494 19495 19496 19497 19498 | echo "${ECHO_T}no" >&6 else THREADSAFE=1 echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 fi if test "$THREADSAFE" = "1"; then LIBS="" echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6 if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lpthread $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char pthread_create (); int main () { pthread_create (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_pthread_pthread_create=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_pthread_pthread_create=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5 echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6 if test $ac_cv_lib_pthread_pthread_create = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBPTHREAD 1 _ACEOF LIBS="-lpthread $LIBS" fi TARGET_THREAD_LIB="$LIBS" LIBS="" else TARGET_THREAD_LIB="" fi ########## # Do we want to support release # # Check whether --enable-releasemode or --disable-releasemode was given. if test "${enable_releasemode+set}" = set; then enableval="$enable_releasemode" |
︙ | ︙ | |||
21267 21268 21269 21270 21271 21272 21273 21274 21275 21276 21277 21278 21279 21280 | s,@TARGET_CC@,$TARGET_CC,;t t s,@TARGET_CFLAGS@,$TARGET_CFLAGS,;t t s,@TARGET_LINK@,$TARGET_LINK,;t t s,@TARGET_LFLAGS@,$TARGET_LFLAGS,;t t s,@TARGET_RANLIB@,$TARGET_RANLIB,;t t s,@TARGET_AR@,$TARGET_AR,;t t s,@THREADSAFE@,$THREADSAFE,;t t s,@ALLOWRELEASE@,$ALLOWRELEASE,;t t s,@TEMP_STORE@,$TEMP_STORE,;t t s,@BUILD_EXEEXT@,$BUILD_EXEEXT,;t t s,@OS_UNIX@,$OS_UNIX,;t t s,@OS_WIN@,$OS_WIN,;t t s,@TARGET_EXEEXT@,$TARGET_EXEEXT,;t t s,@TARGET_LIBS@,$TARGET_LIBS,;t t | > | 21350 21351 21352 21353 21354 21355 21356 21357 21358 21359 21360 21361 21362 21363 21364 | s,@TARGET_CC@,$TARGET_CC,;t t s,@TARGET_CFLAGS@,$TARGET_CFLAGS,;t t s,@TARGET_LINK@,$TARGET_LINK,;t t s,@TARGET_LFLAGS@,$TARGET_LFLAGS,;t t s,@TARGET_RANLIB@,$TARGET_RANLIB,;t t s,@TARGET_AR@,$TARGET_AR,;t t s,@THREADSAFE@,$THREADSAFE,;t t s,@TARGET_THREAD_LIB@,$TARGET_THREAD_LIB,;t t s,@ALLOWRELEASE@,$ALLOWRELEASE,;t t s,@TEMP_STORE@,$TEMP_STORE,;t t s,@BUILD_EXEEXT@,$BUILD_EXEEXT,;t t s,@OS_UNIX@,$OS_UNIX,;t t s,@OS_WIN@,$OS_WIN,;t t s,@TARGET_EXEEXT@,$TARGET_EXEEXT,;t t s,@TARGET_LIBS@,$TARGET_LIBS,;t t |
︙ | ︙ |
Changes to configure.ac.
︙ | ︙ | |||
134 135 136 137 138 139 140 | # the corresponding code. # AC_INIT(src/sqlite.h.in) dnl Put the RCS revision string after AC_INIT so that it will also dnl show in in configure. # The following RCS revision string applies to configure.in | | | 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 | # the corresponding code. # AC_INIT(src/sqlite.h.in) dnl Put the RCS revision string after AC_INIT so that it will also dnl show in in configure. # The following RCS revision string applies to configure.in # $Revision: 1.11 $ ######### # Programs needed # AC_PROG_LIBTOOL AC_PROG_INSTALL |
︙ | ︙ | |||
300 301 302 303 304 305 306 307 308 309 310 311 312 313 | THREADSAFE=0 AC_MSG_RESULT([no]) else THREADSAFE=1 AC_MSG_RESULT([yes]) fi AC_SUBST(THREADSAFE) ########## # Do we want to support release # AC_ARG_ENABLE(releasemode, [ --enable-releasemode Support libtool link to release mode],,enable_releasemode=no) AC_MSG_CHECKING([whether to support shared library linked as release mode or not]) | > > > > > > > > > > | 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 | THREADSAFE=0 AC_MSG_RESULT([no]) else THREADSAFE=1 AC_MSG_RESULT([yes]) fi AC_SUBST(THREADSAFE) if test "$THREADSAFE" = "1"; then LIBS="" AC_CHECK_LIB(pthread, pthread_create) TARGET_THREAD_LIB="$LIBS" LIBS="" else TARGET_THREAD_LIB="" fi AC_SUBST(TARGET_THREAD_LIB) ########## # Do we want to support release # AC_ARG_ENABLE(releasemode, [ --enable-releasemode Support libtool link to release mode],,enable_releasemode=no) AC_MSG_CHECKING([whether to support shared library linked as release mode or not]) |
︙ | ︙ |