diff options
| author | Thomas Haller <thaller@redhat.com> | 2018-09-12 21:01:24 +0200 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2018-09-13 14:35:35 +0200 |
| commit | 51d7ae2ba7fd1f812a2911200b6546d0ed1d5bfd (patch) | |
| tree | c820d776709284b815bec5352d719632c942edc8 /.travis.yml | |
| parent | 4fc3bdb45c69e84803e7ad6d9cadafc1c908adcf (diff) | |
| download | NetworkManager-51d7ae2ba7fd1f812a2911200b6546d0ed1d5bfd.tar.gz | |
build/autotools: fail configure if netconfig/resolveconf tool is not found
If the user explicitly passes --with-netconfig=$PATH or --with-resolvconf=$PATH,
the path is accepted as is. We only do autodetection, if the binary was not found.
In that case, if the binary cannot be found in the common paths fail compilation.
(cherry picked from commit 5b36585a3ddd9bc54419e71aef0c244c8015d6d6)
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 1bf7e8d515..de6ff770a0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -108,8 +108,8 @@ script: -D dhcpcanon=/bin/nowhere/dhcpcanon \ -D dhcpcd=/bin/nowhere/dhcpd \ \ - -D netconfig=true \ - -D resolvconf=true \ + -D netconfig=/bin/nowhere/netconfig \ + -D resolvconf=/bin/nowhere/resolvconf \ \ -D ifcfg_rh=false \ -D ibft=true \ @@ -146,8 +146,8 @@ script: --with-dhcpcd=yes \ --with-dhclient=yes \ \ - --with-netconfig=no \ - --with-resolvconf=yes \ + --with-netconfig=/bin/nowhere/netconfig \ + --with-resolvconf=/bin/nowhere/resolvconf \ \ --enable-ifcfg-rh=yes \ --enable-config-plugin-ibft=yes \ |