Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Fix various --enable and --disable options on the top-level configure script. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
6fd7e8ceb96981cff023653a54b85bea |
| User & Date: | drh 2018-06-11 19:47:14 |
Context
|
2018-06-11
| ||
| 21:33 | Improvements to the --enable and --disable options for the amalgamation tarball. check-in: 02e337e080 user: drh tags: trunk | |
| 19:47 | Fix various --enable and --disable options on the top-level configure script. check-in: 6fd7e8ceb9 user: drh tags: trunk | |
| 18:06 | Fix the column cache invalidation logic in the code for ROWID uniqueness constraint checking in the INSERT command. This fixes ticket [c2432ef9089ee73bd]. check-in: 0b485a571c user: drh tags: trunk | |
Changes
Changes to configure.
10451 10451 10452 10452 ########## 10453 10453 # Do we want to support multithreaded use of sqlite 10454 10454 # 10455 10455 # Check whether --enable-threadsafe was given. 10456 10456 if test "${enable_threadsafe+set}" = set; then : 10457 10457 enableval=$enable_threadsafe; 10458 -else 10459 - enable_threadsafe=yes 10460 10458 fi 10461 10459 10462 10460 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to support threadsafe operation" >&5 10463 10461 $as_echo_n "checking whether to support threadsafe operation... " >&6; } 10464 10462 if test "$enable_threadsafe" = "no"; then 10465 10463 SQLITE_THREADSAFE=0 10466 10464 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ................................................................................ 11245 11243 fi 11246 11244 11247 11245 11248 11246 ######### 11249 11247 # check for debug enabled 11250 11248 # Check whether --enable-debug was given. 11251 11249 if test "${enable_debug+set}" = set; then : 11252 - enableval=$enable_debug; use_debug=$enableval 11253 -else 11254 - use_debug=no 11250 + enableval=$enable_debug; 11255 11251 fi 11256 11252 11257 -if test "${use_debug}" = "yes" ; then 11253 +if test "${enable_debug}" = "yes" ; then 11258 11254 TARGET_DEBUG="-DSQLITE_DEBUG=1 -DSQLITE_ENABLE_SELECTTRACE -DSQLITE_ENABLE_WHERETRACE -O0" 11259 11255 else 11260 11256 TARGET_DEBUG="-DNDEBUG" 11261 11257 fi 11262 11258 11263 11259 11264 11260 ######### 11265 11261 # See whether we should use the amalgamation to build 11266 11262 # Check whether --enable-amalgamation was given. 11267 11263 if test "${enable_amalgamation+set}" = set; then : 11268 - enableval=$enable_amalgamation; use_amalgamation=$enableval 11269 -else 11270 - use_amalgamation=yes 11264 + enableval=$enable_amalgamation; 11271 11265 fi 11272 11266 11273 -if test "${use_amalgamation}" != "yes" ; then 11267 +if test "${enable_amalgamation}" == "no" ; then 11274 11268 USE_AMALGAMATION=0 11275 11269 fi 11276 11270 11277 11271 11278 11272 ######### 11279 11273 # Look for zlib. Only needed by extensions and by the sqlite3.exe shell 11280 11274 for ac_header in zlib.h ................................................................................ 11349 11343 11350 11344 11351 11345 11352 11346 ######### 11353 11347 # See whether we should allow loadable extensions 11354 11348 # Check whether --enable-load-extension was given. 11355 11349 if test "${enable_load_extension+set}" = set; then : 11356 - enableval=$enable_load_extension; use_loadextension=$enableval 11350 + enableval=$enable_load_extension; 11357 11351 else 11358 - use_loadextension=yes 11352 + enable_load_extension=yes 11359 11353 fi 11360 11354 11361 -if test "${use_loadextension}" = "yes" ; then 11355 +if test "${enable_load_extension}" = "yes" ; then 11362 11356 OPT_FEATURE_FLAGS="" 11363 11357 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5 11364 11358 $as_echo_n "checking for library containing dlopen... " >&6; } 11365 11359 if ${ac_cv_search_dlopen+:} false; then : 11366 11360 $as_echo_n "(cached) " >&6 11367 11361 else 11368 11362 ac_func_search_save_LIBS=$LIBS ................................................................................ 11421 11415 fi 11422 11416 11423 11417 ########## 11424 11418 # Do we want to support memsys3 and/or memsys5 11425 11419 # 11426 11420 # Check whether --enable-memsys5 was given. 11427 11421 if test "${enable_memsys5+set}" = set; then : 11428 - enableval=$enable_memsys5; enable_memsys5=yes 11429 -else 11430 - enable_memsys5=no 11422 + enableval=$enable_memsys5; 11431 11423 fi 11432 11424 11433 11425 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to support MEMSYS5" >&5 11434 11426 $as_echo_n "checking whether to support MEMSYS5... " >&6; } 11435 11427 if test "${enable_memsys5}" = "yes"; then 11436 11428 OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_MEMSYS5" 11437 11429 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ................................................................................ 11438 11430 $as_echo "yes" >&6; } 11439 11431 else 11440 11432 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 11441 11433 $as_echo "no" >&6; } 11442 11434 fi 11443 11435 # Check whether --enable-memsys3 was given. 11444 11436 if test "${enable_memsys3+set}" = set; then : 11445 - enableval=$enable_memsys3; enable_memsys3=yes 11446 -else 11447 - enable_memsys3=no 11437 + enableval=$enable_memsys3; 11448 11438 fi 11449 11439 11450 11440 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to support MEMSYS3" >&5 11451 11441 $as_echo_n "checking whether to support MEMSYS3... " >&6; } 11452 11442 if test "${enable_memsys3}" = "yes" -a "${enable_memsys5}" = "no"; then 11453 11443 OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_MEMSYS3" 11454 11444 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ................................................................................ 11458 11448 $as_echo "no" >&6; } 11459 11449 fi 11460 11450 11461 11451 ######### 11462 11452 # See whether we should enable Full Text Search extensions 11463 11453 # Check whether --enable-fts3 was given. 11464 11454 if test "${enable_fts3+set}" = set; then : 11465 - enableval=$enable_fts3; enable_fts3=yes 11466 -else 11467 - enable_fts3=no 11455 + enableval=$enable_fts3; 11468 11456 fi 11469 11457 11470 11458 if test "${enable_fts3}" = "yes" ; then 11471 11459 OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_FTS3" 11472 11460 fi 11473 11461 # Check whether --enable-fts4 was given. 11474 11462 if test "${enable_fts4+set}" = set; then : 11475 - enableval=$enable_fts4; enable_fts4=yes 11476 -else 11477 - enable_fts4=no 11463 + enableval=$enable_fts4; 11478 11464 fi 11479 11465 11480 11466 if test "${enable_fts4}" = "yes" ; then 11481 11467 OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_FTS4" 11482 11468 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing log" >&5 11483 11469 $as_echo_n "checking for library containing log... " >&6; } 11484 11470 if ${ac_cv_search_log+:} false; then : ................................................................................ 11534 11520 test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" 11535 11521 11536 11522 fi 11537 11523 11538 11524 fi 11539 11525 # Check whether --enable-fts5 was given. 11540 11526 if test "${enable_fts5+set}" = set; then : 11541 - enableval=$enable_fts5; enable_fts5=yes 11542 -else 11543 - enable_fts5=no 11527 + enableval=$enable_fts5; 11544 11528 fi 11545 11529 11546 11530 if test "${enable_fts5}" = "yes" ; then 11547 11531 OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_FTS5" 11548 11532 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing log" >&5 11549 11533 $as_echo_n "checking for library containing log... " >&6; } 11550 11534 if ${ac_cv_search_log+:} false; then : ................................................................................ 11603 11587 11604 11588 fi 11605 11589 11606 11590 ######### 11607 11591 # See whether we should enable JSON1 11608 11592 # Check whether --enable-json1 was given. 11609 11593 if test "${enable_json1+set}" = set; then : 11610 - enableval=$enable_json1; enable_json1=yes 11611 -else 11612 - enable_json1=no 11594 + enableval=$enable_json1; 11613 11595 fi 11614 11596 11615 11597 if test "${enable_json1}" = "yes" ; then 11616 11598 OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_JSON1" 11617 11599 fi 11618 11600 11619 11601 ######### 11620 11602 # See whether we should enable the LIMIT clause on UPDATE and DELETE 11621 11603 # statements. 11622 11604 # Check whether --enable-update-limit was given. 11623 11605 if test "${enable_update_limit+set}" = set; then : 11624 - enableval=$enable_update_limit; enable_udlimit=yes 11625 -else 11626 - enable_udlimit=no 11606 + enableval=$enable_update_limit; 11627 11607 fi 11628 11608 11629 11609 if test "${enable_udlimit}" = "yes" ; then 11630 11610 OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT" 11631 11611 fi 11632 11612 11633 11613 ######### 11634 11614 # See whether we should enable RTREE 11635 11615 # Check whether --enable-rtree was given. 11636 11616 if test "${enable_rtree+set}" = set; then : 11637 - enableval=$enable_rtree; enable_rtree=yes 11638 -else 11639 - enable_rtree=no 11617 + enableval=$enable_rtree; 11640 11618 fi 11641 11619 11642 11620 if test "${enable_rtree}" = "yes" ; then 11643 11621 OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_RTREE" 11644 11622 fi 11645 11623 11646 11624 ######### 11647 11625 # See whether we should enable the SESSION extension 11648 11626 # Check whether --enable-session was given. 11649 11627 if test "${enable_session+set}" = set; then : 11650 - enableval=$enable_session; enable_session=yes 11651 -else 11652 - enable_session=no 11628 + enableval=$enable_session; 11653 11629 fi 11654 11630 11655 11631 if test "${enable_session}" = "yes" ; then 11656 11632 OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_SESSION" 11657 11633 OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_PREUPDATE_HOOK" 11658 11634 fi 11659 11635 ................................................................................ 11708 11684 BUILD_CFLAGS=$ac_temp_BUILD_CFLAGS 11709 11685 11710 11686 11711 11687 ######### 11712 11688 # See whether we should use GCOV 11713 11689 # Check whether --enable-gcov was given. 11714 11690 if test "${enable_gcov+set}" = set; then : 11715 - enableval=$enable_gcov; use_gcov=$enableval 11716 -else 11717 - use_gcov=no 11691 + enableval=$enable_gcov; 11718 11692 fi 11719 11693 11720 11694 if test "${use_gcov}" = "yes" ; then 11721 11695 USE_GCOV=1 11722 11696 else 11723 11697 USE_GCOV=0 11724 11698 fi
Changes to configure.ac.
178 178 fi 179 179 AC_SUBST(BUILD_CC) 180 180 181 181 ########## 182 182 # Do we want to support multithreaded use of sqlite 183 183 # 184 184 AC_ARG_ENABLE(threadsafe, 185 -AC_HELP_STRING([--disable-threadsafe],[Disable mutexing]),,enable_threadsafe=yes) 185 +AC_HELP_STRING([--disable-threadsafe],[Disable mutexing])) 186 186 AC_MSG_CHECKING([whether to support threadsafe operation]) 187 187 if test "$enable_threadsafe" = "no"; then 188 188 SQLITE_THREADSAFE=0 189 189 AC_MSG_RESULT([no]) 190 190 else 191 191 SQLITE_THREADSAFE=1 192 192 AC_MSG_RESULT([yes]) ................................................................................ 553 553 # Figure out what C libraries are required to compile programs 554 554 # that use "fdatasync()" function. 555 555 # 556 556 AC_SEARCH_LIBS(fdatasync, [rt]) 557 557 558 558 ######### 559 559 # check for debug enabled 560 -AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug],[enable debugging & verbose explain]), 561 - [use_debug=$enableval],[use_debug=no]) 562 -if test "${use_debug}" = "yes" ; then 560 +AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug],[enable debugging & verbose explain])) 561 +if test "${enable_debug}" = "yes" ; then 563 562 TARGET_DEBUG="-DSQLITE_DEBUG=1 -DSQLITE_ENABLE_SELECTTRACE -DSQLITE_ENABLE_WHERETRACE -O0" 564 563 else 565 564 TARGET_DEBUG="-DNDEBUG" 566 565 fi 567 566 AC_SUBST(TARGET_DEBUG) 568 567 569 568 ######### 570 569 # See whether we should use the amalgamation to build 571 570 AC_ARG_ENABLE(amalgamation, AC_HELP_STRING([--disable-amalgamation], 572 - [Disable the amalgamation and instead build all files separately]), 573 - [use_amalgamation=$enableval],[use_amalgamation=yes]) 574 -if test "${use_amalgamation}" != "yes" ; then 571 + [Disable the amalgamation and instead build all files separately])) 572 +if test "${enable_amalgamation}" == "no" ; then 575 573 USE_AMALGAMATION=0 576 574 fi 577 575 AC_SUBST(USE_AMALGAMATION) 578 576 579 577 ######### 580 578 # Look for zlib. Only needed by extensions and by the sqlite3.exe shell 581 579 AC_CHECK_HEADERS(zlib.h) 582 580 AC_SEARCH_LIBS(deflate, z, [HAVE_ZLIB="-DSQLITE_HAVE_ZLIB=1"], [HAVE_ZLIB=""]) 583 581 AC_SUBST(HAVE_ZLIB) 584 582 585 583 ######### 586 584 # See whether we should allow loadable extensions 587 585 AC_ARG_ENABLE(load-extension, AC_HELP_STRING([--disable-load-extension], 588 - [Disable loading of external extensions]), 589 - [use_loadextension=$enableval],[use_loadextension=yes]) 590 -if test "${use_loadextension}" = "yes" ; then 586 + [Disable loading of external extensions]),,[enable_load_extension=yes]) 587 +if test "${enable_load_extension}" = "yes" ; then 591 588 OPT_FEATURE_FLAGS="" 592 589 AC_SEARCH_LIBS(dlopen, dl) 593 590 else 594 591 OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1" 595 592 fi 596 593 597 594 ########## 598 595 # Do we want to support memsys3 and/or memsys5 599 596 # 600 597 AC_ARG_ENABLE(memsys5, 601 - AC_HELP_STRING([--enable-memsys5],[Enable MEMSYS5]), 602 - [enable_memsys5=yes],[enable_memsys5=no]) 598 + AC_HELP_STRING([--enable-memsys5],[Enable MEMSYS5])) 603 599 AC_MSG_CHECKING([whether to support MEMSYS5]) 604 600 if test "${enable_memsys5}" = "yes"; then 605 601 OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_MEMSYS5" 606 602 AC_MSG_RESULT([yes]) 607 603 else 608 604 AC_MSG_RESULT([no]) 609 605 fi 610 606 AC_ARG_ENABLE(memsys3, 611 - AC_HELP_STRING([--enable-memsys3],[Enable MEMSYS3]), 612 - [enable_memsys3=yes],[enable_memsys3=no]) 607 + AC_HELP_STRING([--enable-memsys3],[Enable MEMSYS3])) 613 608 AC_MSG_CHECKING([whether to support MEMSYS3]) 614 609 if test "${enable_memsys3}" = "yes" -a "${enable_memsys5}" = "no"; then 615 610 OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_MEMSYS3" 616 611 AC_MSG_RESULT([yes]) 617 612 else 618 613 AC_MSG_RESULT([no]) 619 614 fi 620 615 621 616 ######### 622 617 # See whether we should enable Full Text Search extensions 623 618 AC_ARG_ENABLE(fts3, AC_HELP_STRING([--enable-fts3], 624 - [Enable the FTS3 extension]), 625 - [enable_fts3=yes],[enable_fts3=no]) 619 + [Enable the FTS3 extension])) 626 620 if test "${enable_fts3}" = "yes" ; then 627 621 OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_FTS3" 628 622 fi 629 623 AC_ARG_ENABLE(fts4, AC_HELP_STRING([--enable-fts4], 630 - [Enable the FTS4 extension]), 631 - [enable_fts4=yes],[enable_fts4=no]) 624 + [Enable the FTS4 extension])) 632 625 if test "${enable_fts4}" = "yes" ; then 633 626 OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_FTS4" 634 627 AC_SEARCH_LIBS([log],[m]) 635 628 fi 636 629 AC_ARG_ENABLE(fts5, AC_HELP_STRING([--enable-fts5], 637 - [Enable the FTS5 extension]), 638 - [enable_fts5=yes],[enable_fts5=no]) 630 + [Enable the FTS5 extension])) 639 631 if test "${enable_fts5}" = "yes" ; then 640 632 OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_FTS5" 641 633 AC_SEARCH_LIBS([log],[m]) 642 634 fi 643 635 644 636 ######### 645 637 # See whether we should enable JSON1 646 -AC_ARG_ENABLE(json1, AC_HELP_STRING([--enable-json1], 647 - [Enable the JSON1 extension]), 648 - [enable_json1=yes],[enable_json1=no]) 638 +AC_ARG_ENABLE(json1, AC_HELP_STRING([--enable-json1],[Enable the JSON1 extension])) 649 639 if test "${enable_json1}" = "yes" ; then 650 640 OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_JSON1" 651 641 fi 652 642 653 643 ######### 654 644 # See whether we should enable the LIMIT clause on UPDATE and DELETE 655 645 # statements. 656 646 AC_ARG_ENABLE(update-limit, AC_HELP_STRING([--enable-update-limit], 657 - [Enable the UPDATE/DELETE LIMIT clause]), 658 - [enable_udlimit=yes],[enable_udlimit=no]) 647 + [Enable the UPDATE/DELETE LIMIT clause])) 659 648 if test "${enable_udlimit}" = "yes" ; then 660 649 OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT" 661 650 fi 662 651 663 652 ######### 664 653 # See whether we should enable RTREE 665 654 AC_ARG_ENABLE(rtree, AC_HELP_STRING([--enable-rtree], 666 - [Enable the RTREE extension]), 667 - [enable_rtree=yes],[enable_rtree=no]) 655 + [Enable the RTREE extension])) 668 656 if test "${enable_rtree}" = "yes" ; then 669 657 OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_RTREE" 670 658 fi 671 659 672 660 ######### 673 661 # See whether we should enable the SESSION extension 674 662 AC_ARG_ENABLE(session, AC_HELP_STRING([--enable-session], 675 - [Enable the SESSION extension]), 676 - [enable_session=yes],[enable_session=no]) 663 + [Enable the SESSION extension])) 677 664 if test "${enable_session}" = "yes" ; then 678 665 OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_SESSION" 679 666 OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_PREUPDATE_HOOK" 680 667 fi 681 668 682 669 ######### 683 670 # attempt to duplicate any OMITS and ENABLES into the ${OPT_FEATURE_FLAGS} parameter ................................................................................ 729 716 done 730 717 BUILD_CFLAGS=$ac_temp_BUILD_CFLAGS 731 718 732 719 733 720 ######### 734 721 # See whether we should use GCOV 735 722 AC_ARG_ENABLE(gcov, AC_HELP_STRING([--enable-gcov], 736 - [Enable coverage testing using gcov]), 737 - [use_gcov=$enableval],[use_gcov=no]) 723 + [Enable coverage testing using gcov])) 738 724 if test "${use_gcov}" = "yes" ; then 739 725 USE_GCOV=1 740 726 else 741 727 USE_GCOV=0 742 728 fi 743 729 AC_SUBST(USE_GCOV) 744 730