diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2018-10-24 22:03:57 +0200 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2018-10-24 22:03:57 +0200 |
| commit | 587e0e37b2905c405088be6048f483d517d393f1 (patch) | |
| tree | 56daf9d0da202716d13ebf609fa4860098020dcd | |
| parent | 25f625b4fc58f56b7ab84dbcfc155bc210f3ee66 (diff) | |
| parent | 0677b51549cc29e487f7bee2dd7614780aed8a7d (diff) | |
| download | NetworkManager-587e0e37b2905c405088be6048f483d517d393f1.tar.gz | |
build: merge branch 'bg/issue65'
ibft-related build fixes.
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/issues/65
| -rw-r--r-- | Makefile.am | 22 | ||||
| -rwxr-xr-x | contrib/fedora/rpm/build_clean.sh | 2 |
2 files changed, 12 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am index d735627b67..b69acc73a5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -167,7 +167,9 @@ DISTCHECK_CONFIGURE_FLAGS = \ --with-wext=no \ --enable-ifcfg-rh \ --enable-ifupdown \ - --disable-dependency-tracking + --enable-config-plugin-ibft \ + --disable-dependency-tracking \ + $(NULL) dist-configure-check: @echo "*** 'make dist' requires '--enable-gtk-doc --enable-introspection --with-libnm-glib'. ***" @@ -2460,6 +2462,13 @@ src_settings_plugins_ibft_tests_test_ibft_LDADD = \ $(src_settings_plugins_ibft_tests_test_ibft_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +check-local-symbols-settings-ibft: src/settings/plugins/ibft/libnm-settings-plugin-ibft.la + $(call check_so_symbols,$(builddir)/src/settings/plugins/ibft/.libs/libnm-settings-plugin-ibft.so) + +check_local += check-local-symbols-settings-ibft + +endif + EXTRA_DIST += \ src/settings/plugins/ibft/tests/iscsiadm-test-dhcp \ src/settings/plugins/ibft/tests/iscsiadm-test-static \ @@ -2469,16 +2478,7 @@ EXTRA_DIST += \ src/settings/plugins/ibft/tests/iscsiadm-test-bad-dns2 \ src/settings/plugins/ibft/tests/iscsiadm-test-bad-entry \ src/settings/plugins/ibft/tests/iscsiadm-test-bad-record \ - src/settings/plugins/ibft/tests/iscsiadm-test-vlan - -check-local-symbols-settings-ibft: src/settings/plugins/ibft/libnm-settings-plugin-ibft.la - $(call check_so_symbols,$(builddir)/src/settings/plugins/ibft/.libs/libnm-settings-plugin-ibft.so) - -check_local += check-local-symbols-settings-ibft - -endif - -EXTRA_DIST += \ + src/settings/plugins/ibft/tests/iscsiadm-test-vlan \ src/settings/plugins/ibft/meson.build \ src/settings/plugins/ibft/tests/meson.build diff --git a/contrib/fedora/rpm/build_clean.sh b/contrib/fedora/rpm/build_clean.sh index 4ceedf40ac..c486be5129 100755 --- a/contrib/fedora/rpm/build_clean.sh +++ b/contrib/fedora/rpm/build_clean.sh @@ -151,7 +151,7 @@ if [[ $NO_DIST != 1 ]]; then --with-libnm-glib \ --enable-ifcfg-rh \ --enable-ifupdown \ - --enable-ibft \ + --enable-config-plugin-ibft \ --with-config-logging-backend-default=syslog \ --with-libaudit=yes-disabled-by-default \ --enable-polkit=yes \ |