Supplicant: fix new (and more proper) libeap header locations

THis only applies to libeap0 > 0.7

4 files changed, 14 insertions, 14 deletions

diff --git a/InfraStack/OSAgnostic/WiMax/Agents/Supplicant/Source/SupplicantAgent.c b/InfraStack/OSAgnostic/WiMax/Agents/Supplicant/Source/SupplicantAgent.c
index f4df52d..5489ed4 100644
--- a/InfraStack/OSAgnostic/WiMax/Agents/Supplicant/Source/SupplicantAgent.c
+++ b/InfraStack/OSAgnostic/WiMax/Agents/Supplicant/Source/SupplicantAgent.c
@@ -48,10 +48,10 @@
 #if defined(WPA_OPEN_SOURCE)
 //open source supplicant include files
 #include "includes.h"
-#include <eap_peer/common.h>
+#include <eap_peer/util/common.h>
 #include <eap_peer/eap.h>
 #include <eap_peer/eap_config.h>
-#include "wpabuf.h"
+#include <eap_peer/util/wpabuf.h>
 #include "tls-wpa.h"
 #include "dlfcn.h"
 //////////////////////////////////////
diff --git a/configure b/configure
index a36acbe..253d2d3 100755
--- a/configure
+++ b/configure
@@ -12034,12 +12034,12 @@ if test -n "$LIBEAP0_CFLAGS"; then
     pkg_cv_LIBEAP0_CFLAGS="$LIBEAP0_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libeap0\"") >&5
-  ($PKG_CONFIG --exists --print-errors "libeap0") 2>&5
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libeap0 >= 0.7.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "libeap0 >= 0.7.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_LIBEAP0_CFLAGS=`$PKG_CONFIG --cflags "libeap0" 2>/dev/null`
+  pkg_cv_LIBEAP0_CFLAGS=`$PKG_CONFIG --cflags "libeap0 >= 0.7.0" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -12050,12 +12050,12 @@ if test -n "$LIBEAP0_LIBS"; then
     pkg_cv_LIBEAP0_LIBS="$LIBEAP0_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libeap0\"") >&5
-  ($PKG_CONFIG --exists --print-errors "libeap0") 2>&5
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libeap0 >= 0.7.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "libeap0 >= 0.7.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_LIBEAP0_LIBS=`$PKG_CONFIG --libs "libeap0" 2>/dev/null`
+  pkg_cv_LIBEAP0_LIBS=`$PKG_CONFIG --libs "libeap0 >= 0.7.0" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -12073,14 +12073,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        LIBEAP0_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libeap0" 2>&1`
+	        LIBEAP0_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libeap0 >= 0.7.0" 2>&1`
         else
-	        LIBEAP0_PKG_ERRORS=`$PKG_CONFIG --print-errors "libeap0" 2>&1`
+	        LIBEAP0_PKG_ERRORS=`$PKG_CONFIG --print-errors "libeap0 >= 0.7.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$LIBEAP0_PKG_ERRORS" >&5
 
-	{ { $as_echo "$as_me:$LINENO: error: Package requirements (libeap0) were not met:
+	{ { $as_echo "$as_me:$LINENO: error: Package requirements (libeap0 >= 0.7.0) were not met:
 
 $LIBEAP0_PKG_ERRORS
 
@@ -12091,7 +12091,7 @@ Alternatively, you may set the environment variables LIBEAP0_CFLAGS
 and LIBEAP0_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 " >&5
-$as_echo "$as_me: error: Package requirements (libeap0) were not met:
+$as_echo "$as_me: error: Package requirements (libeap0 >= 0.7.0) were not met:
 
 $LIBEAP0_PKG_ERRORS
 
diff --git a/configure.ac b/configure.ac
index e00aca2..b657067 100644
--- a/configure.ac
+++ b/configure.ac
@@ -169,7 +169,7 @@ then
         enable_sup_wpa=no
 else
         enable_sup_wpa=yes
-        PKG_CHECK_MODULES(LIBEAP0, libeap0)
+        PKG_CHECK_MODULES(LIBEAP0, libeap0 >= 0.7.0)
         libeap0_prefix=`pkg-config libeap0 --variable=prefix`
         AC_MSG_RESULT(Using EAP library from $libeap0_prefix)
         AC_SUBST(LIBEAP0_CFLAGS)
diff --git a/wimax.spec.in b/wimax.spec.in
index 447e790..88a754e 100644
--- a/wimax.spec.in
+++ b/wimax.spec.in
@@ -14,7 +14,7 @@ License:    BSD
 URL:        http://linuxwimax.org
 Source0:    wimax-%{version}.tar.gz
 #Source100:  wimax.yaml
-BuildRequires:  pkgconfig(libeap0)
+BuildRequires:  pkgconfig(libeap0) >= 0.7
 BuildRequires:  pkgconfig(libwimaxll-0)
 BuildRequires:  zlib-devel
 Obsoletes:  WiMAX-Network-Service