iperf: fix out of tree configuration

The configure step uses a package header to check for support
of types/declares, this package header encapsulates all the
required system headers for providing the needed resources.
When configured from an out of tree directory the package
header is not found due to the hard path.
We now make the path for package header relative to 'srcdir' so
it is found appropriately.

Signed-off-by: Awais Belal <awais_belal@mentor.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Belal, Awais 2014-12-12 12:21:51 +05:00 committed by Martin Jansa
parent e2f8425e2d
commit af8ff37714
2 changed files with 53 additions and 0 deletions

View File

@ -0,0 +1,52 @@
iperf: fix out of tree configuration
The configure step uses a package header to check for support of types/declares,
this package header encapsulates all the required system header for providing
the needed resources. When configured from an out of tree directory the package
header is not found due to the hard path.
We now make the path for package header relative to our 'srcdir' so it is
found appropriately.
Signed-off-by: Awais Belal <awais_belal@mentor.com>
---
diff --git a/configure.ac b/configure.ac
index 2b3fd20..d420f9e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -176,8 +176,8 @@ dnl Check for system services
dnl check for multicast
if test "$ac_cv_multicast" != no; then
- AC_CHECK_TYPES(struct ip_mreq,,,[#include "compat/headers_slim.h"])
- AC_CHECK_DECLS(IP_ADD_MEMBERSHIP,,,[#include "compat/headers_slim.h"])
+ AC_CHECK_TYPES(struct ip_mreq,,,[#include "${srcdir}/compat/headers_slim.h"])
+ AC_CHECK_DECLS(IP_ADD_MEMBERSHIP,,,[#include "${srcdir}/compat/headers_slim.h"])
AC_MSG_CHECKING(for multicast support)
ac_cv_multicast=no
if test "$ac_cv_have_decl_IP_ADD_MEMBERSHIP" = yes; then
@@ -193,9 +193,9 @@ fi
dnl check for IPv6
if test "$ac_cv_have_ipv6" != no; then
- AC_CHECK_TYPES(struct sockaddr_storage,,,[#include "compat/headers_slim.h"])
- AC_CHECK_TYPES(struct sockaddr_in6,,,[#include "compat/headers_slim.h"])
- AC_CHECK_DECLS(AF_INET6,,,[#include "compat/headers_slim.h"])
+ AC_CHECK_TYPES(struct sockaddr_storage,,,[#include "${srcdir}/compat/headers_slim.h"])
+ AC_CHECK_TYPES(struct sockaddr_in6,,,[#include "${srcdir}/compat/headers_slim.h"])
+ AC_CHECK_DECLS(AF_INET6,,,[#include "${srcdir}/compat/headers_slim.h"])
AC_MSG_CHECKING(for IPv6 headers and structures)
ac_cv_have_ipv6=no
if test "$ac_cv_type_struct_sockaddr_storage" = yes; then
@@ -211,9 +211,9 @@ fi
if test "$ac_cv_have_ipv6" = yes; then
if test "$ac_cv_multicast" = yes; then
- AC_CHECK_TYPES(struct ipv6_mreq,,,[#include "compat/headers_slim.h"])
- AC_CHECK_DECLS(IPV6_ADD_MEMBERSHIP,,,[#include "compat/headers_slim.h"])
- AC_CHECK_DECLS(IPV6_MULTICAST_HOPS,,,[#include "compat/headers_slim.h"])
+ AC_CHECK_TYPES(struct ipv6_mreq,,,[#include "${srcdir}/compat/headers_slim.h"])
+ AC_CHECK_DECLS(IPV6_ADD_MEMBERSHIP,,,[#include "${srcdir}/compat/headers_slim.h"])
+ AC_CHECK_DECLS(IPV6_MULTICAST_HOPS,,,[#include "${srcdir}/compat/headers_slim.h"])
AC_MSG_CHECKING(for IPv6 multicast support)
ac_cv_have_ipv6_multicast=no
if test "$ac_cv_type_struct_ipv6_mreq" = yes; then

View File

@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e8478eae9f479e39bc34975193360298"
SRC_URI = " ${SOURCEFORGE_MIRROR}/iperf/${BP}.tar.gz \
file://iperf-2.0.5_ManPage.patch \
file://0001-fix-out-of-tree-config.patch \
"
SRC_URI[md5sum] = "44b5536b67719f4250faed632a3cd016"