Improve manually enabling extra modules.

- Allow modules to be specified without their prefix and extensions
  in --{disable,enable}-extras.
- Allow modules to be space delimited in --{disable,enable}-extras.

diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml
index f35605662bf5b114eeea66f1f70451a814826d13..0d7de47088159a5d9657a70f9134a245dd21f4b6 100644 (file)
--- a/.github/workflows/ci-linux.yml
+++ b/.github/workflows/ci-linux.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-16.04
     env:
       CXXFLAGS: -std=${{ matrix.standard }}
-      TEST_BUILD_MODULES: m_geo_maxmind.cpp,m_ldap.cpp,m_mysql.cpp,m_pgsql.cpp,m_regex_pcre.cpp,m_regex_posix.cpp,m_regex_re2.cpp,m_regex_stdlib.cpp,m_regex_tre.cpp,m_sqlite3.cpp,m_ssl_gnutls.cpp,m_ssl_mbedtls.cpp,m_ssl_openssl.cpp,m_sslrehashsignal.cpp
+      TEST_BUILD_MODULES: geo_maxmind ldap mysql pgsql regex_pcre regex_posix regex_re2 regex_stdlib regex_tre sqlite3 ssl_gnutls ssl_mbedtls ssl_openssl sslrehashsignal
     steps:
       - uses: actions/checkout@v2
       - name: Install dependencies

diff --git a/.github/workflows/ci-macos.yml b/.github/workflows/ci-macos.yml
index c706b754215b3e464e302d7ef2aa03c2e08e5eec..ab16f5d5607f183085d06413be2841e897bafed6 100644 (file)
--- a/.github/workflows/ci-macos.yml
+++ b/.github/workflows/ci-macos.yml
@@ -9,7 +9,7 @@ jobs:
       CXXFLAGS: -std=${{ matrix.standard }} -I/usr/local/opt/openssl@1.1/include -Wno-error=deprecated-declarations
       LDFLAGS: -L/usr/local/opt/openssl@1.1/lib
       PKG_CONFIG_PATH: /usr/local/opt/openssl@1.1/lib/pkgconfig
-      TEST_BUILD_MODULES: m_geo_maxmind.cpp,m_ldap.cpp,m_mysql.cpp,m_pgsql.cpp,m_regex_pcre.cpp,m_regex_posix.cpp,m_regex_re2.cpp,m_regex_stdlib.cpp,m_regex_tre.cpp,m_sqlite3.cpp,m_ssl_gnutls.cpp,m_ssl_mbedtls.cpp,m_ssl_openssl.cpp,m_sslrehashsignal.cpp
+      TEST_BUILD_MODULES: geo_maxmind ldap mysql pgsql regex_pcre regex_posix regex_re2 regex_stdlib regex_tre sqlite3 ssl_gnutls ssl_mbedtls ssl_openssl sslrehashsignal
     steps:
       - uses: actions/checkout@v2
       - name: Install dependencies

diff --git a/configure b/configure
index a53d0ee6d380be7e7ffa414b043006314f459e46..326f69e939bab0035e43159f7b98a8bef425f14f 100755 (executable)
--- a/configure
+++ b/configure
@@ -106,8 +106,8 @@ exit 1 unless GetOptions(
 );
 
 if (scalar(@opt_enableextras) + scalar(@opt_disableextras) > 0) {
-       @opt_enableextras = split /,/, join(',', @opt_enableextras);
-       @opt_disableextras = split /,/, join(',', @opt_disableextras);
+       @opt_enableextras = split /[, ]+/, join(',', @opt_enableextras);
+       @opt_disableextras = split /[, ]+/, join(',', @opt_disableextras);
        enable_extras(@opt_enableextras);
        disable_extras(@opt_disableextras);
        list_extras;
@@ -534,6 +534,8 @@ EXTRA:      for my $extra (@extras) {
 sub enable_extras (@) {
        my (@extras) = @_;
        for my $extra (@extras) {
+               $extra = "m_$extra" unless $extra =~ /^m_/;
+               $extra = "$extra.cpp" unless $extra =~ /\.cpp$/;
                my $extrapath = "src/modules/extra/$extra";
                if (!-e $extrapath) {
                        print STDERR "Cannot enable \e[32;1m$extra\e[0m : No such file or directory in src/modules/extra\n";
@@ -569,6 +571,8 @@ sub disable_extras (@)
        closedir $dd;
        my (@extras) = @_;
 EXTRA: for my $extra (@extras) {
+               $extra = "m_$extra" unless $extra =~ /^m_/;
+               $extra = "$extra.cpp" unless $extra =~ /\.cpp$/;
                my $extrapath = "src/modules/extra/$extra";
                my $source = "src/modules/$extra";
                if (!-e $extrapath) {