configure.ac: dpdk: tolerate no pkg-config #2405
Conversation
Since pull request collectd#2400 pkg-config works great for dpdk, but not if there is no pkg-config around at all. To fix that the PKG_CHECK_MODULES macro needs to define a valid fourth argument, otherwise it will error out. This closes 2404 Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
|
Sorry once again, on the former PR the first CI check was good so none of us took the time to evaluate the former ones. Fortunately I've seen this and can provide the fix right away to clean up my mess. |
|
Closes #2404 I forgot the # in the commit message, let me know if I shall fix that. |
|
Ok, the comment linked it up correctly I think. |
|
With the fix in place in a case without pkg-config for dpdk it will now go like: That is so much better than aborting |
configure.ac
Outdated
| @@ -2360,7 +2360,8 @@ AC_ARG_WITH([libdpdk], | |||
| ) | |||
|
|
|||
| if test "x$with_libdpdk" != "xno"; then | |||
| PKG_CHECK_MODULES([DPDK], [libdpdk]) | |||
| PKG_CHECK_MODULES([DPDK], [libdpdk], [], | |||
| [AC_MSG_NOTICE([no DPDK pkg-config, using defaults])]) | |||
There was a problem hiding this comment.
Please use 2 spaces for indentation.
There was a problem hiding this comment.
Fixing to spaces, but the actual indent should be aligned with the [DPDK above right?
There was a problem hiding this comment.
No it shouldn't, the rest of configure.ac also uses 2 spaces.
There was a problem hiding this comment.
My re-upload and this comment raced by seconds, pushing another fix to make it 2 as requested.
Fix tab indents to be space based as they should, but keep the effective indent at the level of the context it belongs to in PKG_CHECK_MODULES. Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
|
Pushed an indent fix as requested. |
The rest of configure.ac indents not to the context, but by 2 spaces. Follow that rule to stay in style. Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
|
Commit added following 2 spaces now. |
Backport and adapt patches from upstream to use pkg-config when querying for DPDK: collectd/collectd#2400 collectd/collectd#2405 This allows DPDK in Debian to fix an upstream multi-arch issue, where arch-dependents headers are installed in /usr/include breaking multi-arch co-installability of libdpdk-dev. The arch-dependent DPDK headers will be moved under /usr/include/<arch> to fix the issue, and pkg-config --cflags will return the correct -I values. Closes #872482
Since pull request #2400 pkg-config works great for dpdk, but not if
there is no pkg-config around at all.
To fix that the PKG_CHECK_MODULES macro needs to define a valid fourth
argument, otherwise it will error out.
This closes 2404
Signed-off-by: Christian Ehrhardt christian.ehrhardt@canonical.com