From 2e370dc8f359435adf1627cae3d3790894f17a5a Mon Sep 17 00:00:00 2001 From: Christopher Aillon Date: Wed, 19 Oct 2005 15:16:35 +0000 Subject: [PATCH] 2005-10-19 Christopher Aillon * configure.in: Update check for adequate wireless-tools with an AC_TRY_COMPILE for the new symbols we use. git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1051 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 5 +++++ configure.in | 16 ++++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index a4302a9133..477022da55 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-10-19 Christopher Aillon + + * configure.in: Update check for adequate wireless-tools + with an AC_TRY_COMPILE for the new symbols we use. + 2005-10-19 Dan Williams * src/NetworkManagerDevice.c diff --git a/configure.in b/configure.in index e9bd1dc087..bcd30412ae 100644 --- a/configure.in +++ b/configure.in @@ -73,10 +73,18 @@ AM_CONDITIONAL(TARGET_GENTOO, test x"$with_distro" = xgentoo) AM_CONDITIONAL(TARGET_DEBIAN, test x"$with_distro" = xdebian) AM_CONDITIONAL(TARGET_SLACKWARE, test x"$with_distro" = xslackware) -AC_CHECK_HEADER(iwlib.h, [], - [AC_MSG_ERROR(iwlib.h not found. Install wireless-tools.)], []) -AC_CHECK_LIB(iw, iw_scan, [ IWLIB=-liw ], - [AC_MSG_ERROR(wireless-tools 27.pre23 not installed or not functional)], []) +AC_MSG_CHECKING([for wireless-tools >= 28pre9]) +AC_TRY_COMPILE([#include ], + [#ifndef IWEVGENIE + #error "not found" + #endif], + [ac_have_iwevgenie=yes], + [ac_have_iwevgenie=no]) +AC_MSG_RESULT($ac_have_iwevgenie) +if test "$ac_have_iwevgenie" = no; then + AC_MSG_ERROR(wireless-tools >= 28pre9 not installed or not functional) +fi +IWLIB=-liw AC_SUBST(IWLIB) PKG_CHECK_MODULES(DBUS, dbus-glib-1 >= 0.22)