osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

From Pontus Fuchs. 

new check for the configure script to disable the tool bar if
the nl80211.h is not good enough.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6973

svn path=/trunk/; revision=44839
This commit is contained in:
Anders Broman 2012-09-10 13:15:02 +00:00
parent 0fc383a98f
commit 84c57e6eb6
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure.ac
View File

@ -254,6 +254,16 @@ elif (test "${have_libnl1}" = "yes"); then
enable_airpcap=no
fi
AC_MSG_CHECKING([if nl80211.h is new enough])
AC_TRY_COMPILE([#include <linux/nl80211.h>],
[int x = NL80211_FREQUENCY_ATTR_MAX_TX_POWER;
x = NL80211_ATTR_SUPPORTED_IFTYPES;
x = NL80211_ATTR_SUPPORTED_COMMANDS;
x = NL80211_ATTR_WIPHY_FREQ;
x = NL80211_CHAN_NO_HT;],
[AC_MSG_RESULT(yes) AC_DEFINE(HAVE_NL80211, 1, [nl80211.h is new ehough])],
[AC_MSG_RESULT(no)])
AC_MSG_CHECKING([for NL80211_SET_CHANNEL])
AC_TRY_COMPILE([#include <linux/nl80211.h>],
[enum nl80211_commands x = NL80211_CMD_SET_CHANNEL;],

4
ws80211_utils.c
View File

@ -33,7 +33,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "ws80211_utils.h"
#ifdef HAVE_LIBNL
#if defined(HAVE_LIBNL) && defined(HAVE_NL80211
#include <strings.h>
#include <errno.h>
#include <unistd.h>
@ -705,4 +705,4 @@ gchar *ws80211_chan_type_to_str(int type _U_)
{
return NULL;
}
#endif /* HAVE_LIBNL */
#endif /* HAVE_LIBNL && HAVE_NL80211 */