diff options
| author | Christian Ehrhardt <christian.ehrhardt@canonical.com> | 2017-07-14 08:36:39 +0200 |
|---|---|---|
| committer | Ben Pfaff <blp@ovn.org> | 2017-08-07 11:42:14 -0700 |
| commit | 96195c09cd2db4262f240a6a8ca7f7c9ef52b416 (patch) | |
| tree | 8f0ed458a89661e5425345cab662f6e75aa18a28 /acinclude.m4 | |
| parent | f2d3fef3d90253dda3e03822df2e921ec853192d (diff) | |
| download | openvswitch-96195c09cd2db4262f240a6a8ca7f7c9ef52b416.tar.gz | |
acinclude: Also support pkg-config for configuring dpdk.
If available use dpdk pkg-config info of libdpdk to set the right
include paths.
That for example, allows packagers to provide non default include
paths in a common way (pkg-config).
Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
Suggested-by: Luca Boccassi <luca.boccassi@gmail.com>
Acked-by: Luca Boccassi <luca.boccassi@gmail.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index cf79fef9b..7195fbf86 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -208,16 +208,19 @@ AC_DEFUN([OVS_CHECK_DPDK], [ case "$with_dpdk" in yes) DPDK_AUTO_DISCOVER="true" - DPDK_INCLUDE="/usr/local/include/dpdk -I/usr/include/dpdk" + PKG_CHECK_MODULES([DPDK], [libdpdk], + [DPDK_INCLUDE="$DPDK_CFLAGS"], + [DPDK_INCLUDE="-I/usr/local/include/dpdk -I/usr/include/dpdk"]) ;; *) DPDK_AUTO_DISCOVER="false" - DPDK_INCLUDE="$with_dpdk/include" + DPDK_INCLUDE_PATH="$with_dpdk/include" # If 'with_dpdk' is passed install directory, point to headers # installed in $DESTDIR/$prefix/include/dpdk - if test ! -e "$DPDK_INCLUDE/rte_config.h" && \ - test -e "$DPDK_INCLUDE/dpdk/rte_config.h"; then - DPDK_INCLUDE=$DPDK_INCLUDE/dpdk + if test -e "$DPDK_INCLUDE_PATH/rte_config.h"; then + DPDK_INCLUDE="-I$DPDK_INCLUDE_PATH" + elif test -e "$DPDK_INCLUDE_PATH/dpdk/rte_config.h"; then + DPDK_INCLUDE="-I$DPDK_INCLUDE_PATH/dpdk" fi DPDK_LIB_DIR="$with_dpdk/lib" ;; @@ -228,7 +231,7 @@ AC_DEFUN([OVS_CHECK_DPDK], [ ovs_save_CFLAGS="$CFLAGS" ovs_save_LDFLAGS="$LDFLAGS" - CFLAGS="$CFLAGS -I$DPDK_INCLUDE" + CFLAGS="$CFLAGS $DPDK_INCLUDE" if test "$DPDK_AUTO_DISCOVER" = "false"; then LDFLAGS="$LDFLAGS -L${DPDK_LIB_DIR}" fi @@ -304,7 +307,7 @@ AC_DEFUN([OVS_CHECK_DPDK], [ if test "$DPDK_AUTO_DISCOVER" = "false"; then OVS_LDFLAGS="$OVS_LDFLAGS -L$DPDK_LIB_DIR" fi - OVS_CFLAGS="$OVS_CFLAGS -I$DPDK_INCLUDE" + OVS_CFLAGS="$OVS_CFLAGS $DPDK_INCLUDE" OVS_ENABLE_OPTION([-mssse3]) # DPDK pmd drivers are not linked unless --whole-archive is used. |