X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=configure.ac;h=c9a433606e83b962b6367ef378a10cddc66c2fc7;hb=00d98e92bf5976a721caa68fc100fcc19068410b;hp=a82460542ae824d901535883aaa05263ed009396;hpb=2fdc294cf3c903f2c292a7abaf4ab63ab37a20ac;p=connman

diff --git a/configure.ac b/configure.ac
index a824605..c9a4336 100644
--- a/configure.ac
+++ b/configure.ac
@@ -208,20 +208,26 @@ AC_SUBST(UDEV_CFLAGS)
 AC_SUBST(UDEV_LIBS)
 AM_CONDITIONAL(UDEV, test "${enable_udev}" = "yes")
 
-AC_ARG_ENABLE(iospm, AC_HELP_STRING([--enable-iospm],
-		[enable Intel OSPM support]), [enable_iospm=${enableval}])
-AM_CONDITIONAL(IOSPM, test "${enable_iospm}" = "yes")
+AC_ARG_WITH(iwmxsdk, AC_HELP_STRING([--with-iwmxsdk=PATH],
+						[path to Intel WiMAX SDK]),
+				[pkgconfig_iwmxsdk=${withval}/lib/pkgconfig])
 
-AC_ARG_ENABLE(iwmxsdk, AC_HELP_STRING([--enable-iwmxsdk],
-		[enable Intel WiMAX support]), [enable_iwmxsdk=${enableval}])
-if (test "${enable_iwmxsdk}" = "yes"); then
+AC_ARG_ENABLE(iwmx, AC_HELP_STRING([--enable-iwmx],
+		[enable Intel WiMAX support]), [enable_iwmx=${enableval}])
+if (test "${enable_iwmx}" = "yes"); then
 	enable_threads="yes"
-	PKG_CHECK_MODULES(IWMXSDK, libiWmxSdk-0, enable_iwmxsdk=yes,
+	export PKG_CONFIG_PATH="${pkgconfig_iwmxsdk}"
+	PKG_CHECK_MODULES(IWMXSDK, libiWmxSdk-0, enable_iwmx=yes,
 				AC_MSG_ERROR(Intel WiMAX SDK is required))
+	PKG_CONFIG_PATH=""
 	AC_SUBST(IWMXSDK_CFLAGS)
 	AC_SUBST(IWMXSDK_LIBS)
 fi
-AM_CONDITIONAL(IWMXSDK, test "${enable_iwmxsdk}" = "yes")
+AM_CONDITIONAL(IWMX, test "${enable_iwmx}" = "yes")
+
+AC_ARG_ENABLE(iospm, AC_HELP_STRING([--enable-iospm],
+		[enable Intel OSPM support]), [enable_iospm=${enableval}])
+AM_CONDITIONAL(IOSPM, test "${enable_iospm}" = "yes")
 
 PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.16, dummy=yes,
 				AC_MSG_ERROR(GLib >= 2.16 is required))