Merge lp:~sylvain-pineau/checkbox/fix-1305640 into lp:checkbox

Proposed by Sylvain Pineau
Status: Merged
Approved by: Sylvain Pineau
Approved revision: 3087
Merged at revision: 3087
Proposed branch: lp:~sylvain-pineau/checkbox/fix-1305640
Merge into: lp:checkbox
Diff against target: 17 lines (+3/-3)
1 file modified
providers/plainbox-provider-resource-generic/src/configure.ac (+3/-3)
To merge this branch: bzr merge lp:~sylvain-pineau/checkbox/fix-1305640
Reviewer Review Type Date Requested Status
Sylvain Pineau (community) Approve
Review via email: mp+223723@code.launchpad.net

Description of the change

MR fixing the linked bug

To post a comment you must log in.
Revision history for this message
Sylvain Pineau (sylvain-pineau) wrote :

self-approved

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'providers/plainbox-provider-resource-generic/src/configure.ac'
2--- providers/plainbox-provider-resource-generic/src/configure.ac 2014-04-04 18:46:32 +0000
3+++ providers/plainbox-provider-resource-generic/src/configure.ac 2014-06-19 12:05:31 +0000
4@@ -28,10 +28,10 @@
5 [Define to 1 if <linux/nl80211.h> defines NL80211_BAND_ATTR_HT_CAPA])
6 AC_EGREP_HEADER([NL80211_BAND_ATTR_HT_CAPA], [linux/nl80211.h],
7 [AC_DEFINE([HAVE_NL80211_BAND_ATTR_HT_CAPA], 1)])
8-AC_DEFINE([HAVE_NL80211_BAND_ATTR_VHT_MSC_SET], [0],
9- [Define to 1 if <linux/nl80211.h> defines NL80211_BAND_ATTR_VHT_MSC_SET])
10+AC_DEFINE([HAVE_NL80211_BAND_ATTR_VHT_MCS_SET], [0],
11+ [Define to 1 if <linux/nl80211.h> defines NL80211_BAND_ATTR_VHT_MCS_SET])
12 AC_EGREP_HEADER([NL80211_BAND_ATTR_VHT_MCS_SET], [linux/nl80211.h],
13- [AC_DEFINE([HAVE_NL80211_BAND_ATTR_VHT_MSC_SET], 1)])
14+ [AC_DEFINE([HAVE_NL80211_BAND_ATTR_VHT_MCS_SET], 1)])
15
16 # Checks for typedefs, structures, and compiler characteristics.
17 # TODO: re-enable AC_CHECK_HEADER_STDBOOL when Ubuntu 12.04 is no longer supported

Subscribers

People subscribed via source and target branches