diff options
-rwxr-xr-x | configure | 10 | ||||
-rw-r--r-- | make/configure.pm | 2 | ||||
-rw-r--r-- | src/users.cpp | 1 |
3 files changed, 6 insertions, 7 deletions
@@ -101,7 +101,6 @@ exit 1 unless GetOptions( 'system' => \$opt_system, 'uid=s' => \$opt_uid, - # TODO: when the modulemanager rewrite is done these should be removed. 'disable-extras=s@' => \@opt_disableextras, 'enable-extras=s@' => \@opt_enableextras, 'list-extras' => sub { list_extras; exit 0; }, @@ -385,10 +384,13 @@ if (prompt_bool $interactive, $question, 0) { } } } elsif (!defined $opt_disable_auto_extras) { - # TODO: finish modulemanager rewrite and replace this code with: - # system './modulemanager', 'enable', '--auto'; my %modules = ( - # Missing: m_ldap, m_regex_stdlib, m_ssl_mbedtls + # We can't automatically enable the following modules because there is + # no way to autodetect their dependencies: + # + # * ldap (no pkg-config support) + # * regex_stdlib (no C++11 compiler detection) + # * ssl_mbedtls (no pkg-config support) 'm_argon2.cpp' => 'pkg-config --exists libargon2', 'm_geo_maxmind.cpp' => 'pkg-config --exists libmaxminddb', 'm_mysql.cpp' => 'mysql_config --version', diff --git a/make/configure.pm b/make/configure.pm index 656c98097..a49ad1318 100644 --- a/make/configure.pm +++ b/make/configure.pm @@ -65,8 +65,6 @@ sub __get_socketengines { return @socketengines; } -# TODO: when buildtool is done this can be mostly removed with -# the remainder being merged into parse_templates. sub __get_template_settings($$$) { # These are actually hash references diff --git a/src/users.cpp b/src/users.cpp index de9271c87..7029accc0 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -469,7 +469,6 @@ void OperInfo::init() } // Compatibility for older configs that don't have the snomasks field. - // TODO: remove this before v4 is released. if (defaultsnomasks) AllowedSnomasks.set(); } |