From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 1382 invoked by alias); 25 Jun 2009 17:29:23 -0000 Received: (qmail 1376 invoked by alias); 25 Jun 2009 17:29:23 -0000 X-SWARE-Spam-Status: No, hits=-2.1 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_92,SPF_HELO_PASS X-Spam-Status: No, hits=-2.1 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_92,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion2.fedora.phx.redhat.com Subject: dlm: master - avoid configure failure with F10's 2.6.27.21 kernel headers To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: dlm.git X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 1889f9256d0e19855cd31fc180a6219d27b8764e X-Git-Newrev: ac6d6c210989e598ef3f809ee68ac093f63ac41a From: Jim Meyering Message-Id: <20090625172855.57CA61201ED@lists.fedorahosted.org> Date: Thu, 25 Jun 2009 17:29:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2009-q2/txt/msg00758.txt.bz2 Gitweb: http://git.fedorahosted.org/git/dlm.git?p=dlm.git;a=commitdiff;h=ac6d6c210989e598ef3f809ee68ac093f63ac41a Commit: ac6d6c210989e598ef3f809ee68ac093f63ac41a Parent: 1889f9256d0e19855cd31fc180a6219d27b8764e Author: Jim Meyering AuthorDate: Fri Jun 19 20:24:18 2009 +0200 Committer: Jim Meyering CommitterDate: Thu Jun 25 19:27:29 2009 +0200 avoid configure failure with F10's 2.6.27.21 kernel headers * configure.ac: Include before checking for linux/dlm_plock.h. Otherwise, we'd get a syntax error on __u32. --- configure.ac | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index b10639b..d50de87 100644 --- a/configure.ac +++ b/configure.ac @@ -154,12 +154,17 @@ BACKUP_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$KERNEL_CPPFLAGS" # check kernel headers +AC_CHECK_HEADERS([linux/major.h linux/types.h linux/dlmconstants.h]) +AC_CHECK_HEADERS([linux/dlm.h linux/dlm_device.h]) # 2.6.26 adds dlm_plock.h that's our checking barrier, instead # of implementing some insane kernel version checks -AC_CHECK_HEADERS([linux/major.h linux/types.h linux/dlmconstants.h linux/dlm.h linux/dlm_device.h linux/dlm_plock.h],, +# At least on 2.6.27.21-170.2.56.fc10.x86_64, one must include +# to avoid syntax errors regarding __u32. +AC_CHECK_HEADERS([linux/dlm_plock.h],, [AC_MSG_ERROR([Unable to find dlm kernel headers. Make sure to install kernel headers 2.6.26 (or higher) or use --with-kernel=path -configure option to point to the kernel source.])]) +configure option to point to the kernel source.])], + [#include ]) CPPFLAGS="$BACKUP_CPPFLAGS"