auth: don't build .so for non-dyn modules

fixes #14027

diff --git a/configure.ac b/configure.ac
index 011b5a7ec61e7a2def8629ee7f228d7d12b85718..6cd518a10f7ec0ce7ef8a35ba6988eae38f27848 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -341,6 +341,19 @@ AS_IF([test "x$PACKAGEVERSION" != "x"],
 
 export moduledirs moduleobjects modulelibs
 
+AM_CONDITIONAL([BINDBACKEND_DYNMODULE],     [echo $dynmodules | grep -w bind])
+AM_CONDITIONAL([GEOIPBACKEND_DYNMODULE],    [echo $dynmodules | grep -w geoip])
+AM_CONDITIONAL([GMYSQLBACKEND_DYNMODULE],   [echo $dynmodules | grep -w gmysql])
+AM_CONDITIONAL([GODBCBACKEND_DYNMODULE],    [echo $dynmodules | grep -w godbc])
+AM_CONDITIONAL([GPGSQLBACKEND_DYNMODULE],   [echo $dynmodules | grep -w gpgsql])
+AM_CONDITIONAL([GSQLITE3BACKEND_DYNMODULE], [echo $dynmodules | grep -w gsqlite3])
+AM_CONDITIONAL([LDAPBACKEND_DYNMODULE],     [echo $dynmodules | grep -w ldap])
+AM_CONDITIONAL([LMDBBACKEND_DYNMODULE],     [echo $dynmodules | grep -w lmdb])
+AM_CONDITIONAL([LUA2BACKEND_DYNMODULE],     [echo $dynmodules | grep -w lua2])
+AM_CONDITIONAL([PIPEBACKEND_DYNMODULE],     [echo $dynmodules | grep -w pipe])
+AM_CONDITIONAL([REMOTEBACKEND_DYNMODULE],   [echo $dynmodules | grep -w remote])
+AM_CONDITIONAL([TINYDNSBACKEND_DYNMODULE],  [echo $dynmodules | grep -w tinydns])
+
 AC_CONFIG_FILES([
   Makefile
   modules/Makefile

diff --git a/modules/bindbackend/Makefile.am b/modules/bindbackend/Makefile.am
index 7906e2078cb90d8c163975cd67eee3a94725083e..a41769b0bdac982b881238a23d4c35f5c602a333 100644 (file)
--- a/modules/bindbackend/Makefile.am
+++ b/modules/bindbackend/Makefile.am
@@ -18,4 +18,8 @@ libbindbackend_la_SOURCES = \
        bindbackend2.cc bindbackend2.hh \
        binddnssec.cc
 
+if BINDBACKEND_DYNMODULE
 libbindbackend_la_LDFLAGS = -module -avoid-version
+else
+libbindbackend_la_LDFLAGS = -static -avoid-version
+endif

diff --git a/modules/geoipbackend/Makefile.am b/modules/geoipbackend/Makefile.am
index f7ea40739f69f4d2ace76f8fff9401869e34e2d4..0c32f2922abc1a15b1aacb6ebc11c02a21208eff 100644 (file)
--- a/modules/geoipbackend/Makefile.am
+++ b/modules/geoipbackend/Makefile.am
@@ -10,5 +10,9 @@ libgeoipbackend_la_SOURCES = \
        geoipinterface-mmdb.cc \
        geoipinterface.cc geoipinterface.hh
 
+if GEOIPBACKEND_DYNMODULE
 libgeoipbackend_la_LDFLAGS = -module -avoid-version
+else
+libgeoipbackend_la_LDFLAGS = -static -avoid-version
+endif
 libgeoipbackend_la_LIBADD = $(YAML_LIBS) $(GEOIP_LIBS) $(MMDB_LIBS) $(CXXFS_LIBS)

diff --git a/modules/gmysqlbackend/Makefile.am b/modules/gmysqlbackend/Makefile.am
index 2fbbc5c4c88928ea5719a10f1a852707cee88388..431160f6f4f02129b6cf688475c8c7d0dbff9bdf 100644 (file)
--- a/modules/gmysqlbackend/Makefile.am
+++ b/modules/gmysqlbackend/Makefile.am
@@ -20,5 +20,9 @@ libgmysqlbackend_la_SOURCES = \
        gmysqlbackend.cc gmysqlbackend.hh \
        smysql.cc smysql.hh
 
+if GMYSQLBACKEND_DYNMODULE
 libgmysqlbackend_la_LDFLAGS = -module -avoid-version $(LIBCRYPTO_LDFLAGS) $(LIBSSL_LDFLAGS)
+else
+libgmysqlbackend_la_LDFLAGS = -static -avoid-version $(LIBCRYPTO_LDFLAGS) $(LIBSSL_LDFLAGS)
+endif
 libgmysqlbackend_la_LIBADD = $(MYSQL_LIBS)

diff --git a/modules/godbcbackend/Makefile.am b/modules/godbcbackend/Makefile.am
index 3941d4e1979c77e172f66026d99dc35f57ca6f1f..ed4f765e50ce347317df05b9f6d668e2eb1e4348 100644 (file)
--- a/modules/godbcbackend/Makefile.am
+++ b/modules/godbcbackend/Makefile.am
@@ -15,5 +15,9 @@ libgodbcbackend_la_SOURCES = \
        godbcbackend.cc godbcbackend.hh \
        sodbc.cc sodbc.hh
 
+if GODBCBACKEND_DYNMODULE
 libgodbcbackend_la_LDFLAGS = -module -avoid-version
+else
+libgodbcbackend_la_LDFLAGS = -static -avoid-version
+endif
 libgodbcbackend_la_LIBADD = $(UNIXODBC_LIBS)

diff --git a/modules/gpgsqlbackend/Makefile.am b/modules/gpgsqlbackend/Makefile.am
index b9663a530a0115f32918bd61fbba3f3e30a46a3a..0d190862fb45accef708e904ae6831e622d4fd1f 100644 (file)
--- a/modules/gpgsqlbackend/Makefile.am
+++ b/modules/gpgsqlbackend/Makefile.am
@@ -19,5 +19,9 @@ libgpgsqlbackend_la_SOURCES = \
        gpgsqlbackend.cc gpgsqlbackend.hh \
        spgsql.cc spgsql.hh
 
+if GPGSQLBACKEND_DYNMODULE
 libgpgsqlbackend_la_LDFLAGS = -module -avoid-version
+else
+libgpgsqlbackend_la_LDFLAGS = -static -avoid-version
+endif
 libgpgsqlbackend_la_LIBADD = $(PGSQL_LIBS)

diff --git a/modules/gsqlite3backend/Makefile.am b/modules/gsqlite3backend/Makefile.am
index 4f2b46c58a1413619cd19abcb979484b05ccceba..8f3a1dfffa6a630faff3f480d96242a6919c6905 100644 (file)
--- a/modules/gsqlite3backend/Makefile.am
+++ b/modules/gsqlite3backend/Makefile.am
@@ -18,4 +18,8 @@ dist_doc_DATA = \
 
 libgsqlite3backend_la_SOURCES = gsqlite3backend.cc gsqlite3backend.hh
 
+if GSQLITE3BACKEND_DYNMODULE
 libgsqlite3backend_la_LDFLAGS = -module -avoid-version
+else
+libgsqlite3backend_la_LDFLAGS = -static -avoid-version
+endif

diff --git a/modules/ldapbackend/Makefile.am b/modules/ldapbackend/Makefile.am
index ae2fb7a6b6977ba40a7e454d75492e3da8dcc724..685b05743cf5ccf5f7d6ebaa0af74a0d6cd7d0b3 100644 (file)
--- a/modules/ldapbackend/Makefile.am
+++ b/modules/ldapbackend/Makefile.am
@@ -22,5 +22,9 @@ libldapbackend_la_SOURCES = \
        primary.cc \
        utils.hh
 
+if LDAPBACKEND_DYNMODULE
 libldapbackend_la_LDFLAGS = -module -avoid-version
+else
+libldapbackend_la_LDFLAGS = -static -avoid-version
+endif
 libldapbackend_la_LIBADD = $(LDAP_LIBS) $(KRB5_LIBS)

diff --git a/modules/lmdbbackend/Makefile.am b/modules/lmdbbackend/Makefile.am
index d097aee8df7c13efcfd5bacb3f5e4375ee6db89a..0211a80650f503de7e0cc26e9f01a49b7e6be51a 100644 (file)
--- a/modules/lmdbbackend/Makefile.am
+++ b/modules/lmdbbackend/Makefile.am
@@ -8,5 +8,9 @@ liblmdbbackend_la_SOURCES = \
        ../../ext/lmdb-safe/lmdb-safe.hh ../../ext/lmdb-safe/lmdb-safe.cc \
        ../../ext/lmdb-safe/lmdb-typed.hh ../../ext/lmdb-safe/lmdb-typed.cc \
        lmdbbackend.cc lmdbbackend.hh
+if LMDBBACKEND_DYNMODULE
 liblmdbbackend_la_LDFLAGS = -module -avoid-version $(BOOST_SERIALIZATION_LDFLAGS)
+else
+liblmdbbackend_la_LDFLAGS = -static -avoid-version $(BOOST_SERIALIZATION_LDFLAGS)
+endif
 liblmdbbackend_la_LIBADD = $(LMDB_LIBS) $(BOOST_SERIALIZATION_LIBS) $(SYSTEMD_LIBS)

diff --git a/modules/lua2backend/Makefile.am b/modules/lua2backend/Makefile.am
index 0a0d6c7b8f686618dafb18d411108ecefb726f98..22cdcb05939587162cbc03b453a9348d623e5b77 100644 (file)
--- a/modules/lua2backend/Makefile.am
+++ b/modules/lua2backend/Makefile.am
@@ -10,5 +10,9 @@ liblua2backend_la_SOURCES = \
        lua2api2.hh lua2api2.cc \
        lua2backend.cc lua2backend.hh
 
+if LUA2BACKEND_DYNMODULE
 liblua2backend_la_LDFLAGS = -module -avoid-version
+else
+liblua2backend_la_LDFLAGS = -static -avoid-version
+endif
 liblua2backend_la_LIBADD = $(LUA_LIBS)

diff --git a/modules/pipebackend/Makefile.am b/modules/pipebackend/Makefile.am
index 8dbf30dbb8dda26652b1322b8fb7f4a3aff48893..3b25f497a769d1022add14e23d31bc9d155e8db6 100644 (file)
--- a/modules/pipebackend/Makefile.am
+++ b/modules/pipebackend/Makefile.am
@@ -11,5 +11,9 @@ libpipebackend_la_SOURCES = \
        coprocess.cc coprocess.hh \
        pipebackend.cc pipebackend.hh
 
+if PIPEBACKEND_DYNMODULE
 libpipebackend_la_LDFLAGS = -module -avoid-version
+else
+libpipebackend_la_LDFLAGS = -static -avoid-version
+endif
 

diff --git a/modules/remotebackend/Makefile.am b/modules/remotebackend/Makefile.am
index db6a4a4ac46fbea28db1e2a3c0b91b3b1bd6a122..a342a87cf63c0c3acb6a33a76fb642d53acd9bf0 100644 (file)
--- a/modules/remotebackend/Makefile.am
+++ b/modules/remotebackend/Makefile.am
@@ -53,7 +53,11 @@ libremotebackend_la_SOURCES = \
        unixconnector.cc \
        zmqconnector.cc
 
+if REMOTEBACKEND_DYNMODULE
 libremotebackend_la_LDFLAGS = -module -avoid-version
+else
+libremotebackend_la_LDFLAGS = -static -avoid-version
+endif
 
 libremotebackend_la_LIBADD = $(YAHTTP_LIBS) $(JSON11_LIBS)
 

diff --git a/modules/tinydnsbackend/Makefile.am b/modules/tinydnsbackend/Makefile.am
index 013c4d942b215884209c48f7306eed8168a7f77a..7b9dbfc30d3b3e0e268053705bb94ef1bd158358 100644 (file)
--- a/modules/tinydnsbackend/Makefile.am
+++ b/modules/tinydnsbackend/Makefile.am
@@ -8,5 +8,9 @@ libtinydnsbackend_la_SOURCES = \
        ../../pdns/cdb.cc ../../pdns/cdb.hh \
        tinydnsbackend.cc tinydnsbackend.hh
 
+if TINYDNSBACKEND_DYNMODULE
 libtinydnsbackend_la_LDFLAGS = -module -avoid-version $(LIBCRYPTO_LDFLAGS) $(LIBSSL_LDFLAGS)
+else
+libtinydnsbackend_la_LDFLAGS = -static -avoid-version $(LIBCRYPTO_LDFLAGS) $(LIBSSL_LDFLAGS)
+endif
 libtinydnsbackend_la_LIBADD = $(CDB_LIBS)