summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSadie Powell <sadie@witchery.services>2020-01-18 13:27:09 +0000
committerSadie Powell <sadie@witchery.services>2020-01-18 13:27:24 +0000
commit2c33a3027b3db65961e58f4b45e61496ff988897 (patch)
tree388c26274755fb5955a3bc8c361097c8839ee95c
parent47fe6c5540352fd5eafc2ae5c4ec6c4b61984591 (diff)
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.
-rw-r--r--.github/workflows/ci-linux.yml2
-rw-r--r--.github/workflows/ci-macos.yml2
-rwxr-xr-xconfigure8
3 files changed, 8 insertions, 4 deletions
diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml
index f35605662..0d7de4708 100644
--- 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 c706b7542..ab16f5d56 100644
--- 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 a53d0ee6d..326f69e93 100755
--- 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) {