Repository: lucy Updated Branches: refs/heads/master a50b90e92 -> 8513ba7e5
Remove --disable-threads configure option This option is only used by Clownfish. Project: http://git-wip-us.apache.org/repos/asf/lucy/repo Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/40ab3291 Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/40ab3291 Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/40ab3291 Branch: refs/heads/master Commit: 40ab3291272959a7e9dfa8c2b793536fc35d88bf Parents: a50b90e Author: Nick Wellnhofer <[email protected]> Authored: Wed Nov 5 18:22:19 2014 +0100 Committer: Nick Wellnhofer <[email protected]> Committed: Wed Nov 5 18:22:19 2014 +0100 ---------------------------------------------------------------------- c/INSTALL | 2 -- common/charmonizer.main | 7 +------ 2 files changed, 1 insertion(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucy/blob/40ab3291/c/INSTALL ---------------------------------------------------------------------- diff --git a/c/INSTALL b/c/INSTALL index 0134d1f..01dd841 100644 --- a/c/INSTALL +++ b/c/INSTALL @@ -70,8 +70,6 @@ Options include --enable-coverage Enable code coverage. Create HTML pages with coverage data using lcov by running "make coverage". - --disable-threads - Disable thread support. --clownfish-prefix=path Specify an alternative location for Clownfish if it isn't installed in a system directory. http://git-wip-us.apache.org/repos/asf/lucy/blob/40ab3291/common/charmonizer.main ---------------------------------------------------------------------- diff --git a/common/charmonizer.main b/common/charmonizer.main index 78da384..25c3fe4 100644 --- a/common/charmonizer.main +++ b/common/charmonizer.main @@ -459,12 +459,7 @@ int main(int argc, const char **argv) { int i; for (i = 0; i < argc; i++) { const char *arg = argv[i]; - if (strncmp(arg, "--disable-threads", 17) == 0) { - chaz_CFlags *extra_cflags = chaz_CC_get_extra_cflags(); - chaz_CFlags_append(extra_cflags, "-DCFISH_NOTHREADS"); - break; - } - else if (memcmp(arg, "--clownfish-prefix=", 19) == 0) { + if (memcmp(arg, "--clownfish-prefix=", 19) == 0) { lucy_args.clownfish_prefix = arg + 19; } }
