build: setup plugin selection logic

5 files changed, 865 insertions, 451 deletions

diff --git a/configure.ac b/configure.ac
index 07fb86d7..f869b9da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -399,7 +399,88 @@ dnl
 AM_CONDITIONAL(QCDM_STANDALONE, test "yes" = "no")
 
 dnl-----------------------------------------------------------------------------
-dnl Protocol libs
+dnl Plugins
+dnl
+dnl By default all plugins are built and installed. If the user wants to build only
+dnl some specific plugins, this can be done by disabling all first and then enabling
+dnl only the ones required, e.g.:
+dnl   $ ./configure               \
+dnl       --disable-all-plugins   \
+dnl       --enable-plugin-generic \
+dnl       --enable-plugin-zte ...
+dnl
+dnl If the user wants all plugins except for some specific ones, those can be
+dnl explicitly disabled, e.g.:
+dnl   $ ./configure \
+dnl       --disable-plugin-generic \
+dnl       --disable-plugin-zte ...
+dnl
+
+MM_ENABLE_ALL_PLUGINS
+
+MM_ENABLE_PLUGIN([generic])
+MM_ENABLE_PLUGIN([altair-lte])
+MM_ENABLE_PLUGIN([anydata])
+MM_ENABLE_PLUGIN([cinterion])
+MM_ENABLE_PLUGIN([dell],
+                 [with_shared_sierra,
+                  with_shared_novatel,
+                  with_shared_xmm,
+                  with_shared_telit,
+                  with_shared_foxconn])
+MM_ENABLE_PLUGIN([dlink])
+MM_ENABLE_PLUGIN([fibocom],
+                 [with_shared_xmm])
+MM_ENABLE_PLUGIN([foxconn],
+                 [with_shared_foxconn])
+MM_ENABLE_PLUGIN([haier])
+MM_ENABLE_PLUGIN([huawei])
+MM_ENABLE_PLUGIN([iridium])
+MM_ENABLE_PLUGIN([linktop])
+MM_ENABLE_PLUGIN([longcheer])
+MM_ENABLE_PLUGIN([mbm])
+MM_ENABLE_PLUGIN([motorola])
+MM_ENABLE_PLUGIN([mtk])
+MM_ENABLE_PLUGIN([nokia])
+MM_ENABLE_PLUGIN([nokia-icera],
+                 [with_shared_icera])
+MM_ENABLE_PLUGIN([novatel],
+                 [with_shared_novatel])
+MM_ENABLE_PLUGIN([novatel-lte])
+MM_ENABLE_PLUGIN([option],
+                 [with_shared_option])
+MM_ENABLE_PLUGIN([option-hso],
+                 [with_shared_option])
+MM_ENABLE_PLUGIN([pantech])
+MM_ENABLE_PLUGIN([quectel])
+MM_ENABLE_PLUGIN([samsung],
+                 [with_shared_icera])
+MM_ENABLE_PLUGIN([sierra-legacy],
+                 [with_shared_icera,
+                  with_shared_sierra])
+MM_ENABLE_PLUGIN([sierra])
+MM_ENABLE_PLUGIN([simtech])
+MM_ENABLE_PLUGIN([telit],
+                 [with_shared_telit])
+MM_ENABLE_PLUGIN([thuraya])
+MM_ENABLE_PLUGIN([tplink])
+MM_ENABLE_PLUGIN([ublox])
+MM_ENABLE_PLUGIN([via])
+MM_ENABLE_PLUGIN([wavecom])
+MM_ENABLE_PLUGIN([x22x])
+MM_ENABLE_PLUGIN([zte],
+                 [with_shared_icera])
+
+MM_BUILD_SHARED([icera])
+MM_BUILD_SHARED([sierra])
+MM_BUILD_SHARED([option])
+MM_BUILD_SHARED([novatel])
+MM_BUILD_SHARED([xmm])
+MM_BUILD_SHARED([telit])
+MM_BUILD_SHARED([foxconn])
+
+dnl-----------------------------------------------------------------------------
+dnl Output
 dnl
 
 AC_CONFIG_FILES([
@@ -467,6 +548,53 @@ echo "
       systemd journal:         ${with_systemd_journal}
       at command via dbus:     ${with_at_command_via_dbus}
 
+    Shared utils:
+      icera:                   ${with_shared_icera}
+      sierra:                  ${with_shared_sierra}
+      option:                  ${with_shared_option}
+      novatel:                 ${with_shared_novatel}
+      xmm:                     ${with_shared_xmm}
+      telit:                   ${with_shared_telit}
+      foxconn:                 ${with_shared_foxconn}
+
+    Plugins:
+      generic:                 ${enable_plugin_generic}
+      altair lte:              ${enable_plugin_altair_lte}
+      anydata:                 ${enable_plugin_anydata}
+      cinterion:               ${enable_plugin_cinterion}
+      dell:                    ${enable_plugin_dell}
+      dlink:                   ${enable_plugin_dlink}
+      fibocom:                 ${enable_plugin_fibocom}
+      foxconn:                 ${enable_plugin_foxconn}
+      haier:                   ${enable_plugin_haier}
+      huawei:                  ${enable_plugin_huawei}
+      iridium:                 ${enable_plugin_iridium}
+      linktop:                 ${enable_plugin_linktop}
+      longcheer:               ${enable_plugin_longcheer}
+      mbm:                     ${enable_plugin_mbm}
+      motorola:                ${enable_plugin_motorola}
+      mtk:                     ${enable_plugin_mtk}
+      nokia:                   ${enable_plugin_nokia}
+      nokia icera:             ${enable_plugin_nokia_icera}
+      novatel:                 ${enable_plugin_novatel}
+      novatel lte:             ${enable_plugin_novatel_lte}
+      option:                  ${enable_plugin_option}
+      option hso:              ${enable_plugin_option_hso}
+      pantech:                 ${enable_plugin_pantech}
+      quectel:                 ${enable_plugin_quectel}
+      samsung:                 ${enable_plugin_samsung}
+      sierra legacy:           ${enable_plugin_sierra_legacy}
+      sierra:                  ${enable_plugin_sierra}
+      simtech:                 ${enable_plugin_simtech}
+      telit:                   ${enable_plugin_telit}
+      thuraya:                 ${enable_plugin_thuraya}
+      tplink:                  ${enable_plugin_tplink}
+      ublox:                   ${enable_plugin_ublox}
+      via:                     ${enable_plugin_via}
+      wavecom:                 ${enable_plugin_wavecom}
+      x22x:                    ${enable_plugin_x22x}
+      zte:                     ${enable_plugin_zte}
+
     Miscellaneous:
       gobject introspection:   ${found_introspection}
       vala bindings:           ${enable_vala}
diff --git a/m4/mm-enable-plugin.m4 b/m4/mm-enable-plugin.m4
new file mode 100644
index 00000000..0ea09da2
--- /dev/null
+++ b/m4/mm-enable-plugin.m4
@@ -0,0 +1,57 @@
+dnl -*- mode: autoconf -*-
+dnl Copyright 2019 Aleksander Morgado
+dnl
+dnl This file is free software; the author(s) gives unlimited
+dnl permission to copy and/or distribute it, with or without
+dnl modifications, as long as this notice is preserved.
+dnl
+
+# serial 1
+
+dnl Usage:
+dnl  MM_ENABLE_ALL_PLUGINS
+AC_DEFUN([MM_ENABLE_ALL_PLUGINS],
+[dnl
+AC_ARG_ENABLE(all-plugins,
+              AS_HELP_STRING([--enable-all-plugins],
+              [Build all plugins [[default=yes]]]),
+              [],
+              [enable_all_plugins=yes])
+])
+
+dnl Usage:
+dnl  MM_ENABLE_PLUGIN([NAME],[WITH_SHARED_NAME_1,WITH_SHARED_NAME_2,...])
+AC_DEFUN([MM_ENABLE_PLUGIN],
+[dnl
+m4_pushdef([var_enable_plugin], patsubst([enable_plugin_$1], -, _))dnl
+m4_pushdef([VAR_ENABLE_PLUGIN], patsubst(translit([enable_plugin_$1], [a-z], [A-Z]), -, _))dnl
+AC_ARG_ENABLE(plugin-$1,
+              AS_HELP_STRING([--enable-plugin-$1], [Build $1 plugin]),
+              [],
+              [var_enable_plugin=$enable_all_plugins])
+if test "x$var_enable_plugin" = "xyes"; then
+  AC_DEFINE([VAR_ENABLE_PLUGIN], 1, [Define if $1 plugin is enabled])
+m4_ifval([$2],[m4_foreach(with_shared,[$2],[dnl
+  with_shared="yes"
+])])dnl
+fi
+AM_CONDITIONAL(VAR_ENABLE_PLUGIN, [test "x$var_enable_plugin" = "xyes"])
+m4_popdef([VAR_ENABLE_PLUGIN])dnl
+m4_popdef([var_enable_plugin])dnl
+])
+
+dnl Usage:
+dnl  MM_BUILD_SHARED([NAME])
+AC_DEFUN([MM_BUILD_SHARED],
+[dnl
+m4_pushdef([with_shared], patsubst([with_shared_$1], -, _))dnl
+m4_pushdef([WITH_SHARED], patsubst(translit([with_shared_$1], [a-z], [A-Z]), -, _))dnl
+AM_CONDITIONAL(WITH_SHARED, test "x$with_shared" = "xyes")
+if test "x$with_shared" = "xyes"; then
+  AC_DEFINE([WITH_SHARED], 1, [Define if $1 utils are built])
+else
+  with_shared="no"
+fi
+m4_popdef([WITH_SHARED])dnl
+m4_popdef([with_shared])dnl
+])
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 616989df..c50ee3b4 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -119,6 +119,8 @@ TEST_COMMON_LIBADD_FLAGS = \
 # common icera support
 ################################################################################
 
+if WITH_SHARED_ICERA
+
 noinst_LTLIBRARIES += libhelpers-icera.la
 libhelpers_icera_la_SOURCES = \
 	icera/mm-modem-helpers-icera.c \
@@ -154,10 +156,14 @@ libmm_shared_icera_la_LIBADD = \
 
 ICERA_COMMON_COMPILER_FLAGS = -I$(top_srcdir)/plugins/icera
 
+endif
+
 ################################################################################
 # common sierra support
 ################################################################################
 
+if WITH_SHARED_SIERRA
+
 noinst_LTLIBRARIES += libhelpers-sierra.la
 libhelpers_sierra_la_SOURCES = \
 	sierra/mm-modem-helpers-sierra.c \
@@ -197,10 +203,14 @@ libmm_shared_sierra_la_LIBADD = \
 
 SIERRA_COMMON_COMPILER_FLAGS = -I$(top_srcdir)/plugins/sierra
 
+endif
+
 ################################################################################
 # common option support
 ################################################################################
 
+if WITH_SHARED_OPTION
+
 pkglib_LTLIBRARIES += libmm-shared-option.la
 libmm_shared_option_la_SOURCES = \
 	option/mm-shared.c \
@@ -212,10 +222,14 @@ libmm_shared_option_la_LDFLAGS = $(SHARED_COMMON_LINKER_FLAGS)
 
 OPTION_COMMON_COMPILER_FLAGS = -I$(top_srcdir)/plugins/option
 
+endif
+
 ################################################################################
 # common novatel support
 ################################################################################
 
+if WITH_SHARED_NOVATEL
+
 # Common Novatel modem support library
 pkglib_LTLIBRARIES += libmm-shared-novatel.la
 libmm_shared_novatel_la_SOURCES = \
@@ -230,10 +244,14 @@ libmm_shared_novatel_la_LDFLAGS = $(SHARED_COMMON_LINKER_FLAGS)
 
 NOVATEL_COMMON_COMPILER_FLAGS = -I$(top_srcdir)/plugins/novatel
 
+endif
+
 ################################################################################
 # common xmm support
 ################################################################################
 
+if WITH_SHARED_XMM
+
 noinst_LTLIBRARIES += libhelpers-xmm.la
 libhelpers_xmm_la_SOURCES = \
 	xmm/mm-modem-helpers-xmm.c \
@@ -277,10 +295,14 @@ libmm_shared_xmm_la_LIBADD = \
 
 XMM_COMMON_COMPILER_FLAGS = -I$(top_srcdir)/plugins/xmm
 
+endif
+
 ################################################################################
 # common telit support
 ################################################################################
 
+if WITH_SHARED_TELIT
+
 TELIT_ENUMS_INPUTS = \
 	$(top_srcdir)/plugins/telit/mm-modem-helpers-telit.h \
 	$(NULL)
@@ -370,11 +392,14 @@ TELIT_COMMON_COMPILER_FLAGS = \
 	-I$(top_builddir)/plugins/telit \
 	$(NULL)
 
+endif
+
 ################################################################################
 # common foxconn support
 ################################################################################
 
 # Common Foxconn modem support library (MBIM only)
+if WITH_SHARED_FOXCONN
 if WITH_MBIM
 pkglib_LTLIBRARIES += libmm-shared-foxconn.la
 libmm_shared_foxconn_la_SOURCES = \
@@ -387,11 +412,14 @@ libmm_shared_foxconn_la_LDFLAGS = $(SHARED_COMMON_LINKER_FLAGS)
 
 FOXCONN_COMMON_COMPILER_FLAGS = -I$(top_srcdir)/plugins/foxconn
 endif
+endif
 
 ################################################################################
 # plugin: generic
 ################################################################################
 
+if ENABLE_PLUGIN_GENERIC
+
 pkglib_LTLIBRARIES += libmm-plugin-generic.la
 libmm_plugin_generic_la_SOURCES = \
 	generic/mm-plugin-generic.c \
@@ -408,24 +436,239 @@ test_service_generic_LDADD    = \
 	$(TEST_COMMON_LIBADD_FLAGS) \
 	$(NULL)
 
+endif
+
 ################################################################################
-# plugin: motorola
+# plugin: altair lte
 ################################################################################
 
-pkglib_LTLIBRARIES += libmm-plugin-motorola.la
-libmm_plugin_motorola_la_SOURCES = \
-	motorola/mm-plugin-motorola.c \
-	motorola/mm-plugin-motorola.h \
-	motorola/mm-broadband-modem-motorola.c \
-	motorola/mm-broadband-modem-motorola.h \
+if ENABLE_PLUGIN_ALTAIR_LTE
+
+noinst_LTLIBRARIES += libhelpers-altair-lte.la
+libhelpers_altair_lte_la_SOURCES = \
+	altair/mm-modem-helpers-altair-lte.c \
+	altair/mm-modem-helpers-altair-lte.h \
 	$(NULL)
-libmm_plugin_motorola_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
-libmm_plugin_motorola_la_LDFLAGS  = $(PLUGIN_COMMON_LINKER_FLAGS)
+
+noinst_PROGRAMS += test-modem-helpers-altair-lte
+test_modem_helpers_altair_lte_SOURCES = \
+	altair/tests/test-modem-helpers-altair-lte.c \
+	$(NULL)
+test_modem_helpers_altair_lte_CPPFLAGS = \
+	-I$(top_srcdir)/plugins/altair \
+	$(NULL)
+test_modem_helpers_altair_lte_LDADD   = \
+	$(builddir)/libhelpers-altair-lte.la \
+	$(top_builddir)/src/libhelpers.la \
+	$(top_builddir)/libmm-glib/libmm-glib.la \
+	$(NULL)
+
+pkglib_LTLIBRARIES += libmm-plugin-altair-lte.la
+libmm_plugin_altair_lte_la_SOURCES = \
+	altair/mm-plugin-altair-lte.c \
+	altair/mm-plugin-altair-lte.h \
+	altair/mm-broadband-modem-altair-lte.c \
+	altair/mm-broadband-modem-altair-lte.h \
+	altair/mm-broadband-bearer-altair-lte.c \
+	altair/mm-broadband-bearer-altair-lte.h \
+	$(NULL)
+libmm_plugin_altair_lte_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
+libmm_plugin_altair_lte_la_LDFLAGS  = $(PLUGIN_COMMON_LINKER_FLAGS)
+libmm_plugin_altair_lte_la_LIBADD   = $(builddir)/libhelpers-altair-lte.la
+
+endif
+
+################################################################################
+# plugin: anydata
+################################################################################
+
+if ENABLE_PLUGIN_ANYDATA
+
+pkglib_LTLIBRARIES += libmm-plugin-anydata.la
+libmm_plugin_anydata_la_SOURCES = \
+	anydata/mm-plugin-anydata.c \
+	anydata/mm-plugin-anydata.h \
+	anydata/mm-broadband-modem-anydata.h \
+	anydata/mm-broadband-modem-anydata.c \
+	$(NULL)
+libmm_plugin_anydata_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
+libmm_plugin_anydata_la_LDFLAGS  = $(PLUGIN_COMMON_LINKER_FLAGS)
+
+endif
+
+################################################################################
+# plugin: cinterion (previously siemens)
+################################################################################
+
+if ENABLE_PLUGIN_CINTERION
+
+noinst_LTLIBRARIES += libhelpers-cinterion.la
+libhelpers_cinterion_la_SOURCES = \
+	cinterion/mm-modem-helpers-cinterion.c \
+	cinterion/mm-modem-helpers-cinterion.h \
+	$(NULL)
+
+noinst_PROGRAMS += test-modem-helpers-cinterion
+test_modem_helpers_cinterion_SOURCES = \
+	cinterion/tests/test-modem-helpers-cinterion.c \
+	$(NULL)
+test_modem_helpers_cinterion_CPPFLAGS = \
+	-I$(top_srcdir)/plugins/cinterion \
+	$(NULL)
+test_modem_helpers_cinterion_LDADD = \
+	$(builddir)/libhelpers-cinterion.la \
+	$(top_builddir)/src/libhelpers.la \
+	$(top_builddir)/libmm-glib/libmm-glib.la \
+	$(NULL)
+
+pkglib_LTLIBRARIES += libmm-plugin-cinterion.la
+libmm_plugin_cinterion_la_SOURCES = \
+	cinterion/mm-plugin-cinterion.c \
+	cinterion/mm-plugin-cinterion.h \
+	cinterion/mm-shared-cinterion.c \
+	cinterion/mm-shared-cinterion.h \
+	cinterion/mm-broadband-modem-cinterion.c \
+	cinterion/mm-broadband-modem-cinterion.h \
+	cinterion/mm-broadband-bearer-cinterion.c \
+	cinterion/mm-broadband-bearer-cinterion.h \
+	$(NULL)
+if WITH_QMI
+libmm_plugin_cinterion_la_SOURCES += \
+	cinterion/mm-broadband-modem-qmi-cinterion.c \
+	cinterion/mm-broadband-modem-qmi-cinterion.h \
+	$(NULL)
+endif
+libmm_plugin_cinterion_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
+libmm_plugin_cinterion_la_LDFLAGS  = $(PLUGIN_COMMON_LINKER_FLAGS)
+libmm_plugin_cinterion_la_LIBADD   = $(builddir)/libhelpers-cinterion.la
+
+dist_udevrules_DATA += cinterion/77-mm-cinterion-port-types.rules
+
+AM_CFLAGS += -DTESTUDEVRULESDIR_CINTERION=\"${srcdir}/cinterion\"
+
+endif
+
+################################################################################
+# plugin: dell (novatel, sierra, telit or foxconn)
+################################################################################
+
+if ENABLE_PLUGIN_DELL
+
+pkglib_LTLIBRARIES += libmm-plugin-dell.la
+libmm_plugin_dell_la_SOURCES = \
+	dell/mm-plugin-dell.c \
+	dell/mm-plugin-dell.h \
+	$(NULL)
+
+libmm_plugin_dell_la_CPPFLAGS = \
+	$(PLUGIN_COMMON_COMPILER_FLAGS) \
+	$(NOVATEL_COMMON_COMPILER_FLAGS) \
+	$(SIERRA_COMMON_COMPILER_FLAGS) \
+	$(TELIT_COMMON_COMPILER_FLAGS) \
+	$(XMM_COMMON_COMPILER_FLAGS) \
+	$(FOXCONN_COMMON_COMPILER_FLAGS) \
+	$(NULL)
+libmm_plugin_dell_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
+
+dist_udevrules_DATA += dell/77-mm-dell-port-types.rules
+
+AM_CFLAGS += \
+	-DTESTUDEVRULESDIR_DELL=\"${srcdir}/dell\" \
+	$(NULL)
+
+endif
+
+################################################################################
+# plugin: dlink
+################################################################################
+
+if ENABLE_PLUGIN_DLINK
+
+pkglib_LTLIBRARIES += libmm-plugin-dlink.la
+libmm_plugin_dlink_la_SOURCES = \
+	dlink/mm-plugin-dlink.c \
+	dlink/mm-plugin-dlink.h \
+	$(NULL)
+libmm_plugin_dlink_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
+libmm_plugin_dlink_la_LDFLAGS  = $(PLUGIN_COMMON_LINKER_FLAGS)
+
+dist_udevrules_DATA += dlink/77-mm-dlink-port-types.rules
+
+AM_CFLAGS += -DTESTUDEVRULESDIR_DLINK=\"${srcdir}/dlink\"
+
+endif
+
+################################################################################
+# plugin: fibocom
+################################################################################
+
+if ENABLE_PLUGIN_FIBOCOM
+
+pkglib_LTLIBRARIES += libmm-plugin-fibocom.la
+libmm_plugin_fibocom_la_SOURCES = \
+	fibocom/mm-plugin-fibocom.c \
+	fibocom/mm-plugin-fibocom.h \
+	$(NULL)
+libmm_plugin_fibocom_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS) $(XMM_COMMON_COMPILER_FLAGS)
+libmm_plugin_fibocom_la_LDFLAGS  = $(PLUGIN_COMMON_LINKER_FLAGS)
+
+dist_udevrules_DATA += fibocom/77-mm-fibocom-port-types.rules
+
+AM_CFLAGS += -DTESTUDEVRULESDIR_FIBOCOM=\"${srcdir}/fibocom\"
+
+endif
+
+################################################################################
+# plugin: foxconn
+################################################################################
+
+if ENABLE_PLUGIN_FOXCONN
+
+pkglib_LTLIBRARIES += libmm-plugin-foxconn.la
+libmm_plugin_foxconn_la_SOURCES = \
+	foxconn/mm-plugin-foxconn.c \
+	foxconn/mm-plugin-foxconn.h \
+	$(NULL)
+libmm_plugin_foxconn_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS) $(FOXCONN_COMMON_COMPILER_FLAGS)
+libmm_plugin_foxconn_la_LDFLAGS  = $(PLUGIN_COMMON_LINKER_FLAGS)
+
+dist_udevrules_DATA += foxconn/77-mm-foxconn-port-types.rules
+
+dist_pkgdata_DATA += foxconn/mm-foxconn-t77w968-carrier-mapping.conf
+
+AM_CFLAGS += \
+	-DTESTUDEVRULESDIR_FOXCONN=\"${srcdir}/foxconn\" \
+	-DTESTKEYFILE_FOXCONN_T77W968=\"${srcdir}/foxconn/mm-foxconn-t77w968-carrier-mapping.conf\" \
+	$(NULL)
+
+endif
+
+################################################################################
+# plugin: haier
+################################################################################
+
+if ENABLE_PLUGIN_HAIER
+
+pkglib_LTLIBRARIES += libmm-plugin-haier.la
+libmm_plugin_haier_la_SOURCES = \
+	haier/mm-plugin-haier.c \
+	haier/mm-plugin-haier.h \
+	$(NULL)
+libmm_plugin_haier_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
+libmm_plugin_haier_la_LDFLAGS  = $(PLUGIN_COMMON_LINKER_FLAGS)
+
+dist_udevrules_DATA += haier/77-mm-haier-port-types.rules
+
+AM_CFLAGS += -DTESTUDEVRULESDIR_HAIER=\"${srcdir}/haier\"
+
+endif
 
 ################################################################################
 # plugin: huawei
 ################################################################################
 
+if ENABLE_PLUGIN_HUAWEI
+
 noinst_LTLIBRARIES += libhelpers-huawei.la
 libhelpers_huawei_la_SOURCES = \
 	huawei/mm-modem-helpers-huawei.c \
@@ -464,10 +707,96 @@ dist_udevrules_DATA += huawei/77-mm-huawei-net-port-types.rules
 
 AM_CFLAGS += -DTESTUDEVRULESDIR_HUAWEI=\"${srcdir}/huawei\"
 
+endif
+
+################################################################################
+# plugin: iridium
+################################################################################
+
+if ENABLE_PLUGIN_IRIDIUM
+
+pkglib_LTLIBRARIES += libmm-plugin-iridium.la
+libmm_plugin_iridium_la_SOURCES = \
+	iridium/mm-plugin-iridium.c \
+	iridium/mm-plugin-iridium.h \
+	iridium/mm-broadband-modem-iridium.c \
+	iridium/mm-broadband-modem-iridium.h \
+	iridium/mm-bearer-iridium.c \
+	iridium/mm-bearer-iridium.h \
+	iridium/mm-sim-iridium.c \
+	iridium/mm-sim-iridium.h \
+	$(NULL)
+libmm_plugin_iridium_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
+libmm_plugin_iridium_la_LDFLAGS  = $(PLUGIN_COMMON_LINKER_FLAGS)
+
+endif
+
+################################################################################
+# plugin: linktop
+################################################################################
+
+if ENABLE_PLUGIN_LINKTOP
+
+noinst_LTLIBRARIES += libhelpers-linktop.la
+libhelpers_linktop_la_SOURCES = \
+	linktop/mm-modem-helpers-linktop.c \
+	linktop/mm-modem-helpers-linktop.h \
+	$(NULL)
+
+noinst_PROGRAMS += test-modem-helpers-linktop
+test_modem_helpers_linktop_SOURCES = \
+	linktop/tests/test-modem-helpers-linktop.c \
+	$(NULL)
+test_modem_helpers_linktop_CPPFLAGS = \
+	-I$(top_srcdir)/plugins/linktop \
+	$(NULL)
+test_modem_helpers_linktop_LDADD = \
+	$(builddir)/libhelpers-linktop.la \
+	$(top_builddir)/src/libhelpers.la \
+	$(top_builddir)/libmm-glib/libmm-glib.la \
+	$(NULL)
+
+pkglib_LTLIBRARIES += libmm-plugin-linktop.la
+libmm_plugin_linktop_la_SOURCES = \
+	linktop/mm-plugin-linktop.c \
+	linktop/mm-plugin-linktop.h \
+	linktop/mm-broadband-modem-linktop.h \
+	linktop/mm-broadband-modem-linktop.c \
+	$(NULL)
+libmm_plugin_linktop_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
+libmm_plugin_linktop_la_LDFLAGS  = $(PLUGIN_COMMON_LINKER_FLAGS)
+libmm_plugin_linktop_la_LIBADD   = $(builddir)/libhelpers-linktop.la
+
+endif
+
+################################################################################
+# plugin: longcheer (and rebranded dongles)
+################################################################################
+
+if ENABLE_PLUGIN_LONGCHEER
+
+pkglib_LTLIBRARIES += libmm-plugin-longcheer.la
+libmm_plugin_longcheer_la_SOURCES = \
+	longcheer/mm-plugin-longcheer.c \
+	longcheer/mm-plugin-longcheer.h \
+	longcheer/mm-broadband-modem-longcheer.h \
+	longcheer/mm-broadband-modem-longcheer.c \
+	$(NULL)
+libmm_plugin_longcheer_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
+libmm_plugin_longcheer_la_LDFLAGS  = $(PLUGIN_COMMON_LINKER_FLAGS)
+
+dist_udevrules_DATA += longcheer/77-mm-longcheer-port-types.rules
+
+AM_CFLAGS += -DTESTUDEVRULESDIR_LONGCHEER=\"${srcdir}/longcheer\"
+
+endif
+
 ################################################################################
 # plugin: ericsson mbm
 ################################################################################
 
+if ENABLE_PLUGIN_MBM
+
 noinst_LTLIBRARIES += libhelpers-mbm.la
 libhelpers_mbm_la_SOURCES = \
 	mbm/mm-modem-helpers-mbm.c \
@@ -506,80 +835,54 @@ dist_udevrules_DATA += mbm/77-mm-ericsson-mbm.rules
 
 AM_CFLAGS += -DTESTUDEVRULESDIR_MBM=\"${srcdir}/mbm\"
 
-################################################################################
-# plugin: option
-################################################################################
-
-pkglib_LTLIBRARIES += libmm-plugin-option.la
-libmm_plugin_option_la_SOURCES = \
-	option/mm-plugin-option.c \
-	option/mm-plugin-option.h \
-	$(NULL)
-libmm_plugin_option_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS) $(OPTION_COMMON_COMPILER_FLAGS)
-libmm_plugin_option_la_LDFLAGS  = $(PLUGIN_COMMON_LINKER_FLAGS)
+endif
 
 ################################################################################
-# plugin: option hso
+# plugin: motorola
 ################################################################################
 
-pkglib_LTLIBRARIES += libmm-plugin-option-hso.la
-libmm_plugin_option_hso_la_SOURCES = \
-	option/mm-plugin-hso.c \
-	option/mm-plugin-hso.h \
-	option/mm-broadband-bearer-hso.c \
-	option/mm-broadband-bearer-hso.h \
-	option/mm-broadband-modem-hso.c \
-	option/mm-broadband-modem-hso.h \
+if ENABLE_PLUGIN_MOTOROLA
+
+pkglib_LTLIBRARIES += libmm-plugin-motorola.la
+libmm_plugin_motorola_la_SOURCES = \
+	motorola/mm-plugin-motorola.c \
+	motorola/mm-plugin-motorola.h \
+	motorola/mm-broadband-modem-motorola.c \
+	motorola/mm-broadband-modem-motorola.h \
 	$(NULL)
-libmm_plugin_option_hso_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS) $(OPTION_COMMON_COMPILER_FLAGS)
-libmm_plugin_option_hso_la_LDFLAGS  = $(PLUGIN_COMMON_LINKER_FLAGS)
+libmm_plugin_motorola_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
+libmm_plugin_motorola_la_LDFLAGS  = $(PLUGIN_COMMON_LINKER_FLAGS)
+
+endif
 
 ################################################################################
-# plugin: sierra (new QMI or MBIM modems)
+# plugin: mtk
 ################################################################################
 
-dist_udevrules_DATA += sierra/77-mm-sierra.rules
+if ENABLE_PLUGIN_MTK
 
-pkglib_LTLIBRARIES += libmm-plugin-sierra.la
-libmm_plugin_sierra_la_SOURCES = \
-	sierra/mm-plugin-sierra.c \
-	sierra/mm-plugin-sierra.h \
+pkglib_LTLIBRARIES += libmm-plugin-mtk.la
+libmm_plugin_mtk_la_SOURCES = \
+	mtk/mm-plugin-mtk.c \
+	mtk/mm-plugin-mtk.h \
+	mtk/mm-broadband-modem-mtk.h \
+	mtk/mm-broadband-modem-mtk.c \
 	$(NULL)
-libmm_plugin_sierra_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
-libmm_plugin_sierra_la_LDFLAGS  = $(PLUGIN_COMMON_LINKER_FLAGS)
-
-################################################################################
-# plugin: sierra (legacy)
-################################################################################
+libmm_plugin_mtk_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
+libmm_plugin_mtk_la_LDFLAGS  = $(PLUGIN_COMMON_LINKER_FLAGS)
 
-pkglib_LTLIBRARIES += libmm-plugin-sierra-legacy.la
-libmm_plugin_sierra_legacy_la_SOURCES = \
-	sierra/mm-plugin-sierra-legacy.c \
-	sierra/mm-plugin-sierra-legacy.h \
-	sierra/mm-broadband-modem-sierra-icera.c \
-	sierra/mm-broadband-modem-sierra-icera.h \
-	$(NULL)
-libmm_plugin_sierra_legacy_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS) $(ICERA_COMMON_COMPILER_FLAGS) $(SIERRA_COMMON_COMPILER_FLAGS)
-libmm_plugin_sierra_legacy_la_LDFLAGS  = $(PLUGIN_COMMON_LINKER_FLAGS)
+dist_udevrules_DATA += mtk/77-mm-mtk-port-types.rules
 
-################################################################################
-# plugin: wavecom (now sierra airlink)
-################################################################################
+AM_CFLAGS += -DTESTUDEVRULESDIR_MTK=\"${srcdir}/mtk\"
 
-pkglib_LTLIBRARIES += libmm-plugin-wavecom.la
-libmm_plugin_wavecom_la_SOURCES = \
-	wavecom/mm-plugin-wavecom.c \
-	wavecom/mm-plugin-wavecom.h \
-	wavecom/mm-broadband-modem-wavecom.c \
-	wavecom/mm-broadband-modem-wavecom.h \
-	$(NULL)
-libmm_plugin_wavecom_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
-libmm_plugin_wavecom_la_LDFLAGS  = $(PLUGIN_COMMON_LINKER_FLAGS)
+endif
 
 ################################################################################
 # plugin: nokia
 ################################################################################
 
+if ENABLE_PLUGIN_NOKIA
+
 pkglib_LTLIBRARIES += libmm-plugin-nokia.la
 libmm_plugin_nokia_la_SOURCES = \
 	nokia/mm-plugin-nokia.c \
@@ -592,10 +895,14 @@ libmm_plugin_nokia_la_SOURCES = \
 libmm_plugin_nokia_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
 libmm_plugin_nokia_la_LDFLAGS  = $(PLUGIN_COMMON_LINKER_FLAGS)
 
+endif
+
 ################################################################################
 # plugin: nokia (icera)
 ################################################################################
 
+if ENABLE_PLUGIN_NOKIA_ICERA
+
 pkglib_LTLIBRARIES += libmm-plugin-nokia-icera.la
 libmm_plugin_nokia_icera_la_SOURCES = \
 	nokia/mm-plugin-nokia-icera.c \
@@ -606,100 +913,192 @@ libmm_plugin_nokia_icera_la_LDFLAGS  = $(PLUGIN_COMMON_LINKER_FLAGS)
 
 dist_udevrules_DATA += nokia/77-mm-nokia-port-types.rules
 
-AM_CFLAGS += -DTESTUDEVRULESDIR_NOKIA=\"${srcdir}/nokia\"
+AM_CFLAGS += -DTESTUDEVRULESDIR_NOKIA_ICERA=\"${srcdir}/nokia\"
+
+endif
 
 ################################################################################
-# plugin: zte
+# plugin: novatel non-lte
 ################################################################################
 
-pkglib_LTLIBRARIES += libmm-plugin-zte.la
-libmm_plugin_zte_la_SOURCES = \
-	zte/mm-plugin-zte.c \
-	zte/mm-plugin-zte.h \
-	zte/mm-common-zte.h \
-	zte/mm-common-zte.c \
-	zte/mm-broadband-modem-zte.h \
-	zte/mm-broadband-modem-zte.c \
-	zte/mm-broadband-modem-zte-icera.h \
-	zte/mm-broadband-modem-zte-icera.c \
-	$(NULL)
-libmm_plugin_zte_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS) $(ICERA_COMMON_COMPILER_FLAGS)
-libmm_plugin_zte_la_LDFLAGS  = $(PLUGIN_COMMON_LINKER_FLAGS)
+if ENABLE_PLUGIN_NOVATEL
 
-dist_udevrules_DATA += zte/77-mm-zte-port-types.rules
+pkglib_LTLIBRARIES += libmm-plugin-novatel.la
+libmm_plugin_novatel_la_SOURCES = \
+	novatel/mm-plugin-novatel.c \
+	novatel/mm-plugin-novatel.h \
+	$(NULL)
+libmm_plugin_novatel_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS) $(NOVATEL_COMMON_COMPILER_FLAGS)
+libmm_plugin_novatel_la_LDFLAGS  = $(PLUGIN_COMMON_LINKER_FLAGS)
 
-AM_CFLAGS += -DTESTUDEVRULESDIR_ZTE=\"${srcdir}/zte\"
+endif
 
 ################################################################################
-# plugin: longcheer (and rebranded dongles)
+# plugin: novatel lte
 ################################################################################
 
-pkglib_LTLIBRARIES += libmm-plugin-longcheer.la
-libmm_plugin_longcheer_la_SOURCES = \
-	longcheer/mm-plugin-longcheer.c \
-	longcheer/mm-plugin-longcheer.h \
-	longcheer/mm-broadband-modem-longcheer.h \
-	longcheer/mm-broadband-modem-longcheer.c \
+if ENABLE_PLUGIN_NOVATEL_LTE
+
+pkglib_LTLIBRARIES += libmm-plugin-novatel-lte.la
+libmm_plugin_novatel_lte_la_SOURCES = \
+	novatel/mm-plugin-novatel-lte.c \
+	novatel/mm-plugin-novatel-lte.h \
+	novatel/mm-broadband-modem-novatel-lte.c \
+	novatel/mm-broadband-modem-novatel-lte.h \
+	novatel/mm-broadband-bearer-novatel-lte.c \
+	novatel/mm-broadband-bearer-novatel-lte.h \
+	novatel/mm-sim-novatel-lte.c \
+	novatel/mm-sim-novatel-lte.h \
 	$(NULL)
-libmm_plugin_longcheer_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
-libmm_plugin_longcheer_la_LDFLAGS  = $(PLUGIN_COMMON_LINKER_FLAGS)
+libmm_plugin_novatel_lte_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
+libmm_plugin_novatel_lte_la_LDFLAGS  = $(PLUGIN_COMMON_LINKER_FLAGS)
 
-dist_udevrules_DATA += longcheer/77-mm-longcheer-port-types.rules
+endif
 
-AM_CFLAGS += -DTESTUDEVRULESDIR_LONGCHEER=\"${srcdir}/longcheer\"
+################################################################################
+# plugin: option
+################################################################################
+
+if ENABLE_PLUGIN_OPTION
+
+pkglib_LTLIBRARIES += libmm-plugin-option.la
+libmm_plugin_option_la_SOURCES = \
+	option/mm-plugin-option.c \
+	option/mm-plugin-option.h \
+	$(NULL)
+libmm_plugin_option_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS) $(OPTION_COMMON_COMPILER_FLAGS)
+libmm_plugin_option_la_LDFLAGS  = $(PLUGIN_COMMON_LINKER_FLAGS)
+
+endif
 
 ################################################################################
-# plugin: anydata cdma
+# plugin: option hso
 ################################################################################
 
-pkglib_LTLIBRARIES += libmm-plugin-anydata.la
-libmm_plugin_anydata_la_SOURCES = \
-	anydata/mm-plugin-anydata.c \
-	anydata/mm-plugin-anydata.h \
-	anydata/mm-broadband-modem-anydata.h \
-	anydata/mm-broadband-modem-anydata.c \
+if ENABLE_PLUGIN_OPTION_HSO
+
+pkglib_LTLIBRARIES += libmm-plugin-option-hso.la
+libmm_plugin_option_hso_la_SOURCES = \
+	option/mm-plugin-hso.c \
+	option/mm-plugin-hso.h \
+	option/mm-broadband-bearer-hso.c \
+	option/mm-broadband-bearer-hso.h \
+	option/mm-broadband-modem-hso.c \
+	option/mm-broadband-modem-hso.h \
 	$(NULL)
-libmm_plugin_anydata_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
-libmm_plugin_anydata_la_LDFLAGS  = $(PLUGIN_COMMON_LINKER_FLAGS)
+libmm_plugin_option_hso_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS) $(OPTION_COMMON_COMPILER_FLAGS)
+libmm_plugin_option_hso_la_LDFLAGS  = $(PLUGIN_COMMON_LINKER_FLAGS)
+
+endif
 
 ################################################################################
-# plugin: linktop cdma
+# plugin: pantech
 ################################################################################
 
-noinst_LTLIBRARIES += libhelpers-linktop.la
-libhelpers_linktop_la_SOURCES = \
-	linktop/mm-modem-helpers-linktop.c \
-	linktop/mm-modem-helpers-linktop.h \
+if ENABLE_PLUGIN_PANTECH
+
+pkglib_LTLIBRARIES += libmm-plugin-pantech.la
+libmm_plugin_pantech_la_SOURCES = \
+	pantech/mm-plugin-pantech.c \
+	pantech/mm-plugin-pantech.h \
+	pantech/mm-sim-pantech.c \
+	pantech/mm-sim-pantech.h \
+	pantech/mm-broadband-modem-pantech.c \
+	pantech/mm-broadband-modem-pantech.h \
 	$(NULL)
+libmm_plugin_pantech_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
+libmm_plugin_pantech_la_LDFLAGS  = $(PLUGIN_COMMON_LINKER_FLAGS)
 
-noinst_PROGRAMS += test-modem-helpers-linktop
-test_modem_helpers_linktop_SOURCES = \
-	linktop/tests/test-modem-helpers-linktop.c \
+endif
+
+################################################################################
+# plugin: quectel
+################################################################################
+
+if ENABLE_PLUGIN_QUECTEL
+
+dist_udevrules_DATA += quectel/77-mm-quectel-port-types.rules
+
+pkglib_LTLIBRARIES += libmm-plugin-quectel.la
+libmm_plugin_quectel_la_SOURCES = \
+	quectel/mm-plugin-quectel.c \
+	quectel/mm-plugin-quectel.h \
+	quectel/mm-shared-quectel.c \
+	quectel/mm-shared-quectel.h \
+	quectel/mm-broadband-modem-quectel.c \
+	quectel/mm-broadband-modem-quectel.h \
 	$(NULL)
-test_modem_helpers_linktop_CPPFLAGS = \
-	-I$(top_srcdir)/plugins/linktop \
+if WITH_QMI
+libmm_plugin_quectel_la_SOURCES += \
+	quectel/mm-broadband-modem-qmi-quectel.c \
+	quectel/mm-broadband-modem-qmi-quectel.h \
 	$(NULL)
-test_modem_helpers_linktop_LDADD = \
-	$(builddir)/libhelpers-linktop.la \
-	$(top_builddir)/src/libhelpers.la \
-	$(top_builddir)/libmm-glib/libmm-glib.la \
+endif
+libmm_plugin_quectel_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
+libmm_plugin_quectel_la_LDFLAGS  = $(PLUGIN_COMMON_LINKER_FLAGS)
+
+endif
+
+################################################################################
+# plugin: samsung
+################################################################################
+
+if ENABLE_PLUGIN_SAMSUNG
+
+pkglib_LTLIBRARIES += libmm-plugin-samsung.la
+libmm_plugin_samsung_la_SOURCES = \
+	samsung/mm-plugin-samsung.c \
+	samsung/mm-plugin-samsung.h \
+	samsung/mm-broadband-modem-samsung.c \
+	samsung/mm-broadband-modem-samsung.h \
 	$(NULL)
+libmm_plugin_samsung_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS) $(ICERA_COMMON_COMPILER_FLAGS)
+libmm_plugin_samsung_la_LDFLAGS  = $(PLUGIN_COMMON_LINKER_FLAGS)
 
-pkglib_LTLIBRARIES += libmm-plugin-linktop.la
-libmm_plugin_linktop_la_SOURCES = \
-	linktop/mm-plugin-linktop.c \
-	linktop/mm-plugin-linktop.h \
-	linktop/mm-broadband-modem-linktop.h \
-	linktop/mm-broadband-modem-linktop.c \
+endif
+
+################################################################################
+# plugin: sierra (legacy)
+################################################################################
+
+if ENABLE_PLUGIN_SIERRA_LEGACY
+
+pkglib_LTLIBRARIES += libmm-plugin-sierra-legacy.la
+libmm_plugin_sierra_legacy_la_SOURCES = \
+	sierra/mm-plugin-sierra-legacy.c \
+	sierra/mm-plugin-sierra-legacy.h \
+	sierra/mm-broadband-modem-sierra-icera.c \
+	sierra/mm-broadband-modem-sierra-icera.h \
 	$(NULL)
-libmm_plugin_linktop_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
-libmm_plugin_linktop_la_LDFLAGS  = $(PLUGIN_COMMON_LINKER_FLAGS)
-libmm_plugin_linktop_la_LIBADD   = $(builddir)/libhelpers-linktop.la
+libmm_plugin_sierra_legacy_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS) $(ICERA_COMMON_COMPILER_FLAGS) $(SIERRA_COMMON_COMPILER_FLAGS)
+libmm_plugin_sierra_legacy_la_LDFLAGS  = $(PLUGIN_COMMON_LINKER_FLAGS)
+
+endif
+
+################################################################################
+# plugin: sierra (new QMI or MBIM modems)
+################################################################################
+
+if ENABLE_PLUGIN_SIERRA
+
+dist_udevrules_DATA += sierra/77-mm-sierra.rules
+
+pkglib_LTLIBRARIES += libmm-plugin-sierra.la
+libmm_plugin_sierra_la_SOURCES = \
+	sierra/mm-plugin-sierra.c \
+	sierra/mm-plugin-sierra.h \
+	$(NULL)
+libmm_plugin_sierra_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
+libmm_plugin_sierra_la_LDFLAGS  = $(PLUGIN_COMMON_LINKER_FLAGS)
+
+endif
 
 ################################################################################
 # plugin: simtech
 ################################################################################
 
+if ENABLE_PLUGIN_SIMTECH
+
 noinst_LTLIBRARIES += libhelpers-simtech.la
 libhelpers_simtech_la_SOURCES = \
 	simtech/mm-modem-helpers-simtech.c \
@@ -742,124 +1141,34 @@ dist_udevrules_DATA += simtech/77-mm-simtech-port-types.rules
 
 AM_CFLAGS += -DTESTUDEVRULESDIR_SIMTECH=\"${srcdir}/simtech\"
 
-################################################################################
-# plugin: alcatel/TCT/JRD x220D and possibly others
-################################################################################
-
-pkglib_LTLIBRARIES += libmm-plugin-x22x.la
-libmm_plugin_x22x_la_SOURCES = \
-	x22x/mm-plugin-x22x.c \
-	x22x/mm-plugin-x22x.h \
-	x22x/mm-broadband-modem-x22x.h \
-	x22x/mm-broadband-modem-x22x.c \
-	$(NULL)
-libmm_plugin_x22x_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
-libmm_plugin_x22x_la_LDFLAGS  = $(PLUGIN_COMMON_LINKER_FLAGS)
-
-dist_udevrules_DATA += x22x/77-mm-x22x-port-types.rules
-
-AM_CFLAGS += -DTESTUDEVRULESDIR_X22X=\"${srcdir}/x22x\"
+endif
 
 ################################################################################
-# plugin: pantech
+# plugin: telit
 ################################################################################
 
-pkglib_LTLIBRARIES += libmm-plugin-pantech.la
-libmm_plugin_pantech_la_SOURCES = \
-	pantech/mm-plugin-pantech.c \
-	pantech/mm-plugin-pantech.h \
-	pantech/mm-sim-pantech.c \
-	pantech/mm-sim-pantech.h \
-	pantech/mm-broadband-modem-pantech.c \
-	pantech/mm-broadband-modem-pantech.h \
-	$(NULL)
-libmm_plugin_pantech_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
-libmm_plugin_pantech_la_LDFLAGS  = $(PLUGIN_COMMON_LINKER_FLAGS)
+if ENABLE_PLUGIN_TELIT
 
-################################################################################
-# plugin: samsung
-################################################################################
-
-pkglib_LTLIBRARIES += libmm-plugin-samsung.la
-libmm_plugin_samsung_la_SOURCES = \
-	samsung/mm-plugin-samsung.c \
-	samsung/mm-plugin-samsung.h \
-	samsung/mm-broadband-modem-samsung.c \
-	samsung/mm-broadband-modem-samsung.h \
+pkglib_LTLIBRARIES += libmm-plugin-telit.la
+libmm_plugin_telit_la_SOURCES = \
+	telit/mm-plugin-telit.c \
+	telit/mm-plugin-telit.h \
 	$(NULL)
-libmm_plugin_samsung_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS) $(ICERA_COMMON_COMPILER_FLAGS)
-libmm_plugin_samsung_la_LDFLAGS  = $(PLUGIN_COMMON_LINKER_FLAGS)
-
-################################################################################
-# plugin: cinterion (previously siemens)
-################################################################################
+libmm_plugin_telit_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS) $(TELIT_COMMON_COMPILER_FLAGS)
+libmm_plugin_telit_la_LDFLAGS  = $(PLUGIN_COMMON_LINKER_FLAGS)
 
-noinst_LTLIBRARIES += libhelpers-cinterion.la
-libhelpers_cinterion_la_SOURCES = \
-	cinterion/mm-modem-helpers-cinterion.c \
-	cinterion/mm-modem-helpers-cinterion.h \
-	$(NULL)
+dist_udevrules_DATA += telit/77-mm-telit-port-types.rules
 
-noinst_PROGRAMS += test-modem-helpers-cinterion
-test_modem_helpers_cinterion_SOURCES = \
-	cinterion/tests/test-modem-helpers-cinterion.c \
-	$(NULL)
-test_modem_helpers_cinterion_CPPFLAGS = \
-	-I$(top_srcdir)/plugins/cinterion \
-	$(NULL)
-test_modem_helpers_cinterion_LDADD = \
-	$(builddir)/libhelpers-cinterion.la \
-	$(top_builddir)/src/libhelpers.la \
-	$(top_builddir)/libmm-glib/libmm-glib.la \
-	$(NULL)
+AM_CFLAGS += -DTESTUDEVRULESDIR_TELIT=\"${srcdir}/telit\"
 
-pkglib_LTLIBRARIES += libmm-plugin-cinterion.la
-libmm_plugin_cinterion_la_SOURCES = \
-	cinterion/mm-plugin-cinterion.c \
-	cinterion/mm-plugin-cinterion.h \
-	cinterion/mm-shared-cinterion.c \
-	cinterion/mm-shared-cinterion.h \
-	cinterion/mm-broadband-modem-cinterion.c \
-	cinterion/mm-broadband-modem-cinterion.h \
-	cinterion/mm-broadband-bearer-cinterion.c \
-	cinterion/mm-broadband-bearer-cinterion.h \
-	$(NULL)
-if WITH_QMI
-libmm_plugin_cinterion_la_SOURCES += \
-	cinterion/mm-broadband-modem-qmi-cinterion.c \
-	cinterion/mm-broadband-modem-qmi-cinterion.h \
-	$(NULL)
 endif
-libmm_plugin_cinterion_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
-libmm_plugin_cinterion_la_LDFLAGS  = $(PLUGIN_COMMON_LINKER_FLAGS)
-libmm_plugin_cinterion_la_LIBADD   = $(builddir)/libhelpers-cinterion.la
-
-dist_udevrules_DATA += cinterion/77-mm-cinterion-port-types.rules
-
-AM_CFLAGS += -DTESTUDEVRULESDIR_CINTERION=\"${srcdir}/cinterion\"
-
-################################################################################
-# plugin: iridium
-################################################################################
-
-pkglib_LTLIBRARIES += libmm-plugin-iridium.la
-libmm_plugin_iridium_la_SOURCES = \
-	iridium/mm-plugin-iridium.c \
-	iridium/mm-plugin-iridium.h \
-	iridium/mm-broadband-modem-iridium.c \
-	iridium/mm-broadband-modem-iridium.h \
-	iridium/mm-bearer-iridium.c \
-	iridium/mm-bearer-iridium.h \
-	iridium/mm-sim-iridium.c \
-	iridium/mm-sim-iridium.h \
-	$(NULL)
-libmm_plugin_iridium_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
-libmm_plugin_iridium_la_LDFLAGS  = $(PLUGIN_COMMON_LINKER_FLAGS)
 
 ################################################################################
 # plugin: thuraya xt
 ################################################################################
 
+if ENABLE_PLUGIN_THURAYA
+
 noinst_LTLIBRARIES += libhelpers-thuraya.la
 libhelpers_thuraya_la_SOURCES = \
 	thuraya/mm-modem-helpers-thuraya.c \
@@ -891,161 +1200,34 @@ libmm_plugin_thuraya_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
 libmm_plugin_thuraya_la_LDFLAGS  = $(PLUGIN_COMMON_LINKER_FLAGS)
 libmm_plugin_thuraya_la_LIBADD   = $(builddir)/libhelpers-thuraya.la
 
-################################################################################
-# plugin: novatel lte
-################################################################################
-
-pkglib_LTLIBRARIES += libmm-plugin-novatel-lte.la
-libmm_plugin_novatel_lte_la_SOURCES = \
-	novatel/mm-plugin-novatel-lte.c \
-	novatel/mm-plugin-novatel-lte.h \
-	novatel/mm-broadband-modem-novatel-lte.c \
-	novatel/mm-broadband-modem-novatel-lte.h \
-	novatel/mm-broadband-bearer-novatel-lte.c \
-	novatel/mm-broadband-bearer-novatel-lte.h \
-	novatel/mm-sim-novatel-lte.c \
-	novatel/mm-sim-novatel-lte.h \
-	$(NULL)
-libmm_plugin_novatel_lte_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
-libmm_plugin_novatel_lte_la_LDFLAGS  = $(PLUGIN_COMMON_LINKER_FLAGS)
-
-################################################################################
-# plugin: novatel non-lte
-################################################################################
-
-pkglib_LTLIBRARIES += libmm-plugin-novatel.la
-libmm_plugin_novatel_la_SOURCES = \
-	novatel/mm-plugin-novatel.c \
-	novatel/mm-plugin-novatel.h \
-	$(NULL)
-libmm_plugin_novatel_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS) $(NOVATEL_COMMON_COMPILER_FLAGS)
-libmm_plugin_novatel_la_LDFLAGS  = $(PLUGIN_COMMON_LINKER_FLAGS)
-
-################################################################################
-# plugin: foxconn
-################################################################################
-
-pkglib_LTLIBRARIES += libmm-plugin-foxconn.la
-libmm_plugin_foxconn_la_SOURCES = \
-	foxconn/mm-plugin-foxconn.c \
-	foxconn/mm-plugin-foxconn.h \
-	$(NULL)
-libmm_plugin_foxconn_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS) $(FOXCONN_COMMON_COMPILER_FLAGS)
-libmm_plugin_foxconn_la_LDFLAGS  = $(PLUGIN_COMMON_LINKER_FLAGS)
-
-dist_udevrules_DATA += foxconn/77-mm-foxconn-port-types.rules
-
-dist_pkgdata_DATA += foxconn/mm-foxconn-t77w968-carrier-mapping.conf
-
-AM_CFLAGS += \
-	-DTESTUDEVRULESDIR_FOXCONN=\"${srcdir}/foxconn\" \
-	-DTESTKEYFILE_FOXCONN_T77W968=\"${srcdir}/foxconn/mm-foxconn-t77w968-carrier-mapping.conf\" \
-	$(NULL)
-
-################################################################################
-# plugin: altair lte
-################################################################################
-
-noinst_LTLIBRARIES += libhelpers-altair-lte.la
-libhelpers_altair_lte_la_SOURCES = \
-	altair/mm-modem-helpers-altair-lte.c \
-	altair/mm-modem-helpers-altair-lte.h \
-	$(NULL)
-
-noinst_PROGRAMS += test-modem-helpers-altair-lte
-test_modem_helpers_altair_lte_SOURCES = \
-	altair/tests/test-modem-helpers-altair-lte.c \
-	$(NULL)
-test_modem_helpers_altair_lte_CPPFLAGS = \
-	-I$(top_srcdir)/plugins/altair \
-	$(NULL)
-test_modem_helpers_altair_lte_LDADD   = \
-	$(builddir)/libhelpers-altair-lte.la \
-	$(top_builddir)/src/libhelpers.la \
-	$(top_builddir)/libmm-glib/libmm-glib.la \
-	$(NULL)
-
-pkglib_LTLIBRARIES += libmm-plugin-altair-lte.la
-libmm_plugin_altair_lte_la_SOURCES = \
-	altair/mm-plugin-altair-lte.c \
-	altair/mm-plugin-altair-lte.h \
-	altair/mm-broadband-modem-altair-lte.c \
-	altair/mm-broadband-modem-altair-lte.h \
-	altair/mm-broadband-bearer-altair-lte.c \
-	altair/mm-broadband-bearer-altair-lte.h \
-	$(NULL)
-libmm_plugin_altair_lte_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
-libmm_plugin_altair_lte_la_LDFLAGS  = $(PLUGIN_COMMON_LINKER_FLAGS)
-libmm_plugin_altair_lte_la_LIBADD   = $(builddir)/libhelpers-altair-lte.la
-
-################################################################################
-# plugin: via
-################################################################################
-
-pkglib_LTLIBRARIES += libmm-plugin-via.la
-libmm_plugin_via_la_SOURCES = \
-	via/mm-plugin-via.c \
-	via/mm-plugin-via.h \
-	via/mm-broadband-modem-via.c \
-	via/mm-broadband-modem-via.h \
-	$(NULL)
-libmm_plugin_via_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
-libmm_plugin_via_la_LDFLAGS  = $(PLUGIN_COMMON_LINKER_FLAGS)
+endif
 
 ################################################################################
-# plugin: telit
+# plugin: tplink
 ################################################################################
 
-pkglib_LTLIBRARIES += libmm-plugin-telit.la
-libmm_plugin_telit_la_SOURCES = \
-	telit/mm-plugin-telit.c \
-	telit/mm-plugin-telit.h \
-	$(NULL)
-libmm_plugin_telit_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS) $(TELIT_COMMON_COMPILER_FLAGS)
-libmm_plugin_telit_la_LDFLAGS  = $(PLUGIN_COMMON_LINKER_FLAGS)
-
-dist_udevrules_DATA += telit/77-mm-telit-port-types.rules
+if ENABLE_PLUGIN_TPLINK
 
-AM_CFLAGS += -DTESTUDEVRULESDIR_TELIT=\"${srcdir}/telit\"
-
-################################################################################
-# plugin: mtk
-################################################################################
-
-pkglib_LTLIBRARIES += libmm-plugin-mtk.la
-libmm_plugin_mtk_la_SOURCES = \
-	mtk/mm-plugin-mtk.c \
-	mtk/mm-plugin-mtk.h \
-	mtk/mm-broadband-modem-mtk.h \
-	mtk/mm-broadband-modem-mtk.c \
+pkglib_LTLIBRARIES += libmm-plugin-tplink.la
+libmm_plugin_tplink_la_SOURCES = \
+	tplink/mm-plugin-tplink.c \
+	tplink/mm-plugin-tplink.h \
 	$(NULL)
-libmm_plugin_mtk_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
-libmm_plugin_mtk_la_LDFLAGS  = $(PLUGIN_COMMON_LINKER_FLAGS)
-
-dist_udevrules_DATA += mtk/77-mm-mtk-port-types.rules
-
-AM_CFLAGS += -DTESTUDEVRULESDIR_MTK=\"${srcdir}/mtk\"
-
-################################################################################
-# plugin: haier
-################################################################################
+libmm_plugin_tplink_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
+libmm_plugin_tplink_la_LDFLAGS  = $(PLUGIN_COMMON_LINKER_FLAGS)
 
-pkglib_LTLIBRARIES += libmm-plugin-haier.la
-libmm_plugin_haier_la_SOURCES = \
-	haier/mm-plugin-haier.c \
-	haier/mm-plugin-haier.h \
-	$(NULL)
-libmm_plugin_haier_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
-libmm_plugin_haier_la_LDFLAGS  = $(PLUGIN_COMMON_LINKER_FLAGS)
+dist_udevrules_DATA += tplink/77-mm-tplink-port-types.rules
 
-dist_udevrules_DATA += haier/77-mm-haier-port-types.rules
+AM_CFLAGS += -DTESTUDEVRULESDIR_TPLINK=\"${srcdir}/tplink\"
 
-AM_CFLAGS += -DTESTUDEVRULESDIR_HAIER=\"${srcdir}/haier\"
+endif
 
 ################################################################################
 # plugin: u-blox
 ################################################################################
 
+if ENABLE_PLUGIN_UBLOX
+
 dist_udevrules_DATA += ublox/77-mm-ublox-port-types.rules
 
 PLUGIN_UBLOX_COMPILER_FLAGS = \
@@ -1123,103 +1305,91 @@ libmm_plugin_ublox_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS) $(PLUGIN_UBLOX_
 libmm_plugin_ublox_la_LDFLAGS  = $(PLUGIN_COMMON_LINKER_FLAGS)
 libmm_plugin_ublox_la_LIBADD   = $(builddir)/libhelpers-ublox.la
 
+endif
+
 ################################################################################
-# plugin: dell (novatel, sierra, telit or foxconn)
+# plugin: via
 ################################################################################
 
-pkglib_LTLIBRARIES += libmm-plugin-dell.la
-libmm_plugin_dell_la_SOURCES = \
-	dell/mm-plugin-dell.c \
-	dell/mm-plugin-dell.h \
-	$(NULL)
+if ENABLE_PLUGIN_VIA
 
-libmm_plugin_dell_la_CPPFLAGS = \
-	$(PLUGIN_COMMON_COMPILER_FLAGS) \
-	$(NOVATEL_COMMON_COMPILER_FLAGS) \
-	$(SIERRA_COMMON_COMPILER_FLAGS) \
-	$(TELIT_COMMON_COMPILER_FLAGS) \
-	$(XMM_COMMON_COMPILER_FLAGS) \
-	$(FOXCONN_COMMON_COMPILER_FLAGS) \
+pkglib_LTLIBRARIES += libmm-plugin-via.la
+libmm_plugin_via_la_SOURCES = \
+	via/mm-plugin-via.c \
+	via/mm-plugin-via.h \
+	via/mm-broadband-modem-via.c \
+	via/mm-broadband-modem-via.h \
 	$(NULL)
-libmm_plugin_dell_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
-
-dist_udevrules_DATA += dell/77-mm-dell-port-types.rules
+libmm_plugin_via_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
+libmm_plugin_via_la_LDFLAGS  = $(PLUGIN_COMMON_LINKER_FLAGS)
 
-AM_CFLAGS += \
-	-DTESTUDEVRULESDIR_DELL=\"${srcdir}/dell\" \
-	$(NULL)
+endif
 
 ################################################################################
-# plugin: quectel
+# plugin: wavecom (now sierra airlink)
 ################################################################################
 
-dist_udevrules_DATA += quectel/77-mm-quectel-port-types.rules
+if ENABLE_PLUGIN_WAVECOM
 
-pkglib_LTLIBRARIES += libmm-plugin-quectel.la
-libmm_plugin_quectel_la_SOURCES = \
-	quectel/mm-plugin-quectel.c \
-	quectel/mm-plugin-quectel.h \
-	quectel/mm-shared-quectel.c \
-	quectel/mm-shared-quectel.h \
-	quectel/mm-broadband-modem-quectel.c \
-	quectel/mm-broadband-modem-quectel.h \
-	$(NULL)
-if WITH_QMI
-libmm_plugin_quectel_la_SOURCES += \
-	quectel/mm-broadband-modem-qmi-quectel.c \
-	quectel/mm-broadband-modem-qmi-quectel.h \
+pkglib_LTLIBRARIES += libmm-plugin-wavecom.la
+libmm_plugin_wavecom_la_SOURCES = \
+	wavecom/mm-plugin-wavecom.c \
+	wavecom/mm-plugin-wavecom.h \
+	wavecom/mm-broadband-modem-wavecom.c \
+	wavecom/mm-broadband-modem-wavecom.h \
 	$(NULL)
+libmm_plugin_wavecom_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
+libmm_plugin_wavecom_la_LDFLAGS  = $(PLUGIN_COMMON_LINKER_FLAGS)
+
 endif
-libmm_plugin_quectel_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
-libmm_plugin_quectel_la_LDFLAGS  = $(PLUGIN_COMMON_LINKER_FLAGS)
 
 ################################################################################
-# plugin: fibocom
+# plugin: alcatel/TCT/JRD x220D and possibly others
 ################################################################################
 
-pkglib_LTLIBRARIES += libmm-plugin-fibocom.la
-libmm_plugin_fibocom_la_SOURCES = \
-	fibocom/mm-plugin-fibocom.c \
-	fibocom/mm-plugin-fibocom.h \
-	$(NULL)
-libmm_plugin_fibocom_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS) $(XMM_COMMON_COMPILER_FLAGS)
-libmm_plugin_fibocom_la_LDFLAGS  = $(PLUGIN_COMMON_LINKER_FLAGS)
-
-dist_udevrules_DATA += fibocom/77-mm-fibocom-port-types.rules
-
-AM_CFLAGS += -DTESTUDEVRULESDIR_FIBOCOM=\"${srcdir}/fibocom\"
-
-################################################################################
-# plugin: dlink
-################################################################################
+if ENABLE_PLUGIN_X22X
 
-pkglib_LTLIBRARIES += libmm-plugin-dlink.la
-libmm_plugin_dlink_la_SOURCES = \
-	dlink/mm-plugin-dlink.c \
-	dlink/mm-plugin-dlink.h \
+pkglib_LTLIBRARIES += libmm-plugin-x22x.la
+libmm_plugin_x22x_la_SOURCES = \
+	x22x/mm-plugin-x22x.c \
+	x22x/mm-plugin-x22x.h \
+	x22x/mm-broadband-modem-x22x.h \
+	x22x/mm-broadband-modem-x22x.c \
 	$(NULL)
-libmm_plugin_dlink_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
-libmm_plugin_dlink_la_LDFLAGS  = $(PLUGIN_COMMON_LINKER_FLAGS)
+libmm_plugin_x22x_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
+libmm_plugin_x22x_la_LDFLAGS  = $(PLUGIN_COMMON_LINKER_FLAGS)
 
-dist_udevrules_DATA += dlink/77-mm-dlink-port-types.rules
+dist_udevrules_DATA += x22x/77-mm-x22x-port-types.rules
 
-AM_CFLAGS += -DTESTUDEVRULESDIR_DLINK=\"${srcdir}/dlink\"
+AM_CFLAGS += -DTESTUDEVRULESDIR_X22X=\"${srcdir}/x22x\"
+
+endif
 
 ################################################################################
-# plugin: tplink
+# plugin: zte
 ################################################################################
 
-pkglib_LTLIBRARIES += libmm-plugin-tplink.la
-libmm_plugin_tplink_la_SOURCES = \
-	tplink/mm-plugin-tplink.c \
-	tplink/mm-plugin-tplink.h \
+if ENABLE_PLUGIN_ZTE
+
+pkglib_LTLIBRARIES += libmm-plugin-zte.la
+libmm_plugin_zte_la_SOURCES = \
+	zte/mm-plugin-zte.c \
+	zte/mm-plugin-zte.h \
+	zte/mm-common-zte.h \
+	zte/mm-common-zte.c \
+	zte/mm-broadband-modem-zte.h \
+	zte/mm-broadband-modem-zte.c \
+	zte/mm-broadband-modem-zte-icera.h \
+	zte/mm-broadband-modem-zte-icera.c \
 	$(NULL)
-libmm_plugin_tplink_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
-libmm_plugin_tplink_la_LDFLAGS  = $(PLUGIN_COMMON_LINKER_FLAGS)
+libmm_plugin_zte_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS) $(ICERA_COMMON_COMPILER_FLAGS)
+libmm_plugin_zte_la_LDFLAGS  = $(PLUGIN_COMMON_LINKER_FLAGS)
 
-dist_udevrules_DATA += tplink/77-mm-tplink-port-types.rules
+dist_udevrules_DATA += zte/77-mm-zte-port-types.rules
 
-AM_CFLAGS += -DTESTUDEVRULESDIR_TPLINK=\"${srcdir}/tplink\"
+AM_CFLAGS += -DTESTUDEVRULESDIR_ZTE=\"${srcdir}/zte\"
+
+endif
 
 ################################################################################
 # udev rules tester
diff --git a/plugins/tests/test-keyfiles.c b/plugins/tests/test-keyfiles.c
index 18037f1f..89ecbb30 100644
--- a/plugins/tests/test-keyfiles.c
+++ b/plugins/tests/test-keyfiles.c
@@ -12,6 +12,7 @@
  *
  * Copyright (C) 2018 Aleksander Morgado <aleksander@aleksander.es>
  */
+#include <config.h>
 
 #include <glib.h>
 #include <glib-object.h>
@@ -42,11 +43,13 @@ common_test (const gchar *keyfile_path)
 
 /************************************************************/
 
+#if defined ENABLE_PLUGIN_FOXCONN
 static void
 test_foxconn_t77w968 (void)
 {
     common_test (TESTKEYFILE_FOXCONN_T77W968);
 }
+#endif
 
 /************************************************************/
 
@@ -76,7 +79,9 @@ int main (int argc, char **argv)
 
     g_test_init (&argc, &argv, NULL);
 
+#if defined ENABLE_PLUGIN_FOXCONN
     g_test_add_func ("/MM/test-keyfiles/foxconn/t77w968", test_foxconn_t77w968);
+#endif
 
     return g_test_run ();
 }
diff --git a/plugins/tests/test-udev-rules.c b/plugins/tests/test-udev-rules.c
index f6dc6f41..adc7f374 100644
--- a/plugins/tests/test-udev-rules.c
+++ b/plugins/tests/test-udev-rules.c
@@ -13,6 +13,8 @@
  * Copyright (C) 2016 Aleksander Morgado <aleksander@aleksander.es>
  */
 
+#include <config.h>
+
 #include <glib.h>
 #include <glib-object.h>
 #include <string.h>
@@ -43,83 +45,109 @@ common_test (const gchar *plugindir)
 
 /************************************************************/
 
+#if defined ENABLE_PLUGIN_HUAWEI
 static void
 test_huawei (void)
 {
     common_test (TESTUDEVRULESDIR_HUAWEI);
 }
+#endif
 
+#if defined ENABLE_PLUGIN_MBM
 static void
 test_mbm (void)
 {
     common_test (TESTUDEVRULESDIR_MBM);
 }
+#endif
 
+#if defined ENABLE_PLUGIN_NOKIA_ICERA
 static void
-test_nokia (void)
+test_nokia_icera (void)
 {
-    common_test (TESTUDEVRULESDIR_NOKIA);
+    common_test (TESTUDEVRULESDIR_NOKIA_ICERA);
 }
+#endif
 
+#if defined ENABLE_PLUGIN_ZTE
 static void
 test_zte (void)
 {
     common_test (TESTUDEVRULESDIR_ZTE);
 }
+#endif
 
+#if defined ENABLE_PLUGIN_LONGCHEER
 static void
 test_longcheer (void)
 {
     common_test (TESTUDEVRULESDIR_LONGCHEER);
 }
+#endif
 
+#if defined ENABLE_PLUGIN_SIMTECH
 static void
 test_simtech (void)
 {
     common_test (TESTUDEVRULESDIR_SIMTECH);
 }
+#endif
 
+#if defined ENABLE_PLUGIN_X22X
 static void
 test_x22x (void)
 {
     common_test (TESTUDEVRULESDIR_X22X);
 }
+#endif
 
+#if defined ENABLE_PLUGIN_CINTERION
 static void
 test_cinterion (void)
 {
     common_test (TESTUDEVRULESDIR_CINTERION);
 }
+#endif
 
+#if defined ENABLE_PLUGIN_DELL
 static void
 test_dell (void)
 {
     common_test (TESTUDEVRULESDIR_DELL);
 }
+#endif
 
+#if defined ENABLE_PLUGIN_TELIT
 static void
 test_telit (void)
 {
     common_test (TESTUDEVRULESDIR_TELIT);
 }
+#endif
 
+#if defined ENABLE_PLUGIN_MTK
 static void
 test_mtk (void)
 {
     common_test (TESTUDEVRULESDIR_MTK);
 }
+#endif
 
+#if defined ENABLE_PLUGIN_HAIER
 static void
 test_haier (void)
 {
     common_test (TESTUDEVRULESDIR_HAIER);
 }
+#endif
 
+#if defined ENABLE_PLUGIN_FIBOCOM
 static void
 test_fibocom (void)
 {
     common_test (TESTUDEVRULESDIR_FIBOCOM);
 }
+#endif
 
 /************************************************************/
 
@@ -149,19 +177,45 @@ int main (int argc, char **argv)
 
     g_test_init (&argc, &argv, NULL);
 
-    g_test_add_func ("/MM/test-udev-rules/huawei",    test_huawei);
-    g_test_add_func ("/MM/test-udev-rules/mbm",       test_mbm);
-    g_test_add_func ("/MM/test-udev-rules/nokia",     test_nokia);
-    g_test_add_func ("/MM/test-udev-rules/zte",       test_zte);
+#if defined ENABLE_PLUGIN_HUAWEI
+    g_test_add_func ("/MM/test-udev-rules/huawei", test_huawei);
+#endif
+#if defined ENABLE_PLUGIN_MBM
+    g_test_add_func ("/MM/test-udev-rules/mbm", test_mbm);
+#endif
+#if defined ENABLE_PLUGIN_NOKIA_ICERA
+    g_test_add_func ("/MM/test-udev-rules/nokia-icera", test_nokia_icera);
+#endif
+#if defined ENABLE_PLUGIN_ZTE
+    g_test_add_func ("/MM/test-udev-rules/zte", test_zte);
+#endif
+#if defined ENABLE_PLUGIN_LONGCHEER
     g_test_add_func ("/MM/test-udev-rules/longcheer", test_longcheer);
-    g_test_add_func ("/MM/test-udev-rules/simtech",   test_simtech);
-    g_test_add_func ("/MM/test-udev-rules/x22x",      test_x22x);
+#endif
+#if defined ENABLE_PLUGIN_SIMTECH
+    g_test_add_func ("/MM/test-udev-rules/simtech", test_simtech);
+#endif
+#if defined ENABLE_PLUGIN_X22X
+    g_test_add_func ("/MM/test-udev-rules/x22x", test_x22x);
+#endif
+#if defined ENABLE_PLUGIN_CINTERION
     g_test_add_func ("/MM/test-udev-rules/cinterion", test_cinterion);
-    g_test_add_func ("/MM/test-udev-rules/dell",      test_dell);
-    g_test_add_func ("/MM/test-udev-rules/telit",     test_telit);
-    g_test_add_func ("/MM/test-udev-rules/mtk",       test_mtk);
-    g_test_add_func ("/MM/test-udev-rules/haier",     test_haier);
-    g_test_add_func ("/MM/test-udev-rules/fibocom",   test_fibocom);
+#endif
+#if defined ENABLE_PLUGIN_DELL
+    g_test_add_func ("/MM/test-udev-rules/dell", test_dell);
+#endif
+#if defined ENABLE_PLUGIN_TELIT
+    g_test_add_func ("/MM/test-udev-rules/telit", test_telit);
+#endif
+#if defined ENABLE_PLUGIN_MTK
+    g_test_add_func ("/MM/test-udev-rules/mtk", test_mtk);
+#endif
+#if defined ENABLE_PLUGIN_HAIER
+    g_test_add_func ("/MM/test-udev-rules/haier", test_haier);
+#endif
+#if defined ENABLE_PLUGIN_FIBOCOM
+    g_test_add_func ("/MM/test-udev-rules/fibocom", test_fibocom);
+#endif
 
     return g_test_run ();
 }