diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 48 |
1 files changed, 25 insertions, 23 deletions
diff --git a/configure.ac b/configure.ac index 0620cd6..b87b57b 100644 --- a/configure.ac +++ b/configure.ac @@ -156,43 +156,44 @@ fi AC_SUBST(WIMAX_DB_BIN, $with_wimax_db_bin) AC_SUBST(VER_INFO_BIN, $with_ver_info_bin) +AC_ARG_WITH(supplicant, + AC_HELP_STRING([--with-supplicant=external|internal|devicescape], + [Specify which supplicant to use; "external" means + pkg-config will be used to autodetect the prefix + for libeap0 (use PKG_CONFIG_PATH to override the + .pc file location). "internal" builds an internal + copy of libeap0. "devicescape" uses the external + binary DeviceScape supplicant library.])) + AC_ARG_ENABLE(sup-ds, AC_HELP_STRING([--enable-sup-ds], [Enable usage of the DS binary - supplicant (disabled by default)]), - [], [enable_sup_ds=no]) - -AC_ARG_WITH(sup-wpa, - AC_HELP_STRING([--with-sup-wpa], - [Specify prefix where the WPA supplicant - can be found. USE ABSOLUTE PATHS.]), - [ - test -z "$with_sup_wpa" && with_sup_wpa=/usr - test x"$with_sup_wpa" = xyes && with_sup_wpa=/usr - enable_sup_wpa=yes - enable_sup_ds=no - export PKG_CONFIG_PATH="$with_sup_wpa:$with_sup_wpa/lib/pkgconfig:$PKG_CONFIG_PATH" - ], - [ - with_sup_wpa=/usr - ]) + supplicant (disabled by default). Overrides + any --with-supplicant value.]), + [], [enable_sup_ds=no]) -if test x$enable_sup_ds = xyes -then +if test x$enable_sup_ds = xyes -o x$with_supplicant = xdevicescape; then AC_MSG_RESULT([supplicant: configured DS binary supplicant]) enable_sup_wpa=no +elif test x$with_supplicant = xinternal; then + enable_sup_wpa=yes + AC_MSG_RESULT(supplicant: using internal EAP library) + build_path="$ac_abs_confdir/supplicant/wpa_supplicant-1.0-rc3/" + AC_SUBST(LIBEAP0_CFLAGS, "-I$build_path/src") + AC_SUBST(LIBEAP0_LIBS, "-R$DESTDIR$libdir/wimax -L$build_path/src/eap_peer -leap") + AC_SUBST(LIBEAP0_LIBDIR, "$libdir/wimax") else enable_sup_wpa=yes PKG_CHECK_MODULES(LIBEAP0, libeap0 >= 0.7.0) - libeap0_prefix=`pkg-config libeap0 --variable=prefix` - AC_MSG_RESULT(Using EAP library from $libeap0_prefix) + libeap0_libdir=`pkg-config libeap0 --variable=libdir` + AC_MSG_RESULT(supplicant: using EAP library from $libeap0_libdir) AC_SUBST(LIBEAP0_CFLAGS) AC_SUBST(LIBEAP0_LIBS) - AC_SUBST(LIBEAP0_PREFIX, $libeap0_prefix) + AC_SUBST(LIBEAP0_LIBDIR, $libeap0_libdir) fi AC_SUBST(WPA_SUP_PREFIX, $with_sup_wpa) AM_CONDITIONAL(WPA_SUP_ENABLE, test x$enable_sup_wpa = xyes) - +AM_CONDITIONAL(WPA_SUP_INTERNAL, test x$with_supplicant = xinternal) curr_dir=`pwd` mkdir -p InfraStack/OSDependent/Linux/InfraStackModules/CommonAPIHeaders @@ -210,6 +211,7 @@ AC_CONFIG_FILES([ Makefile wns-version.h wimax.spec + supplicant/Makefile InfraStack/OSDependent/Linux/OSAL/Makefile InfraStack/OSDependent/Linux/InfraStackModules/IPCs/Makefile InfraStack/OSAgnostic/Common/CommonServices/Makefile |