From patchwork Tue Jan 10 16:46:36 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kara X-Patchwork-Id: 135261 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 6D5EFB6FC9 for ; Wed, 11 Jan 2012 03:46:48 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932157Ab2AJQqq (ORCPT ); Tue, 10 Jan 2012 11:46:46 -0500 Received: from cantor2.suse.de ([195.135.220.15]:35378 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932114Ab2AJQqq (ORCPT ); Tue, 10 Jan 2012 11:46:46 -0500 Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.221.2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id 3E4D495491; Tue, 10 Jan 2012 17:46:45 +0100 (CET) Received: by quack.suse.cz (Postfix, from userid 1000) id 08FD4205CE; Tue, 10 Jan 2012 17:46:44 +0100 (CET) From: Jan Kara To: Ted Tso Cc: linux-ext4@vger.kernel.org, Jan Kara Subject: [PATCH] libquota: Do not build libquota when disabled Date: Tue, 10 Jan 2012 17:46:36 +0100 Message-Id: <1326213996-13759-1-git-send-email-jack@suse.cz> X-Mailer: git-send-email 1.7.1 Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org Due to missing QUOTA_CMT definition in configure.in, libquota was built (and e.g. include file was installed) even when quota support was disabled. Fix it. Also fix help text of the configure option when we are at it. Signed-off-by: Jan Kara --- configure | 11 ++++++----- configure.in | 4 +++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 9f5eeb5..965f7cf 100755 --- a/configure +++ b/configure @@ -1462,7 +1462,7 @@ Optional Features: --disable-testio-debug disable the use of the test I/O manager for debugging --disable-libuuid do not build private uuid library --disable-libblkid do not build private blkid library - --enable-libquota enable quota support + --enable-quota enable quota support --disable-debugfs disable support of debugfs program --disable-imager disable support of e2image program --disable-resizer disable support of e2resize program @@ -5209,11 +5209,13 @@ fi if test "${enable_quota+set}" = set; then : enableval=$enable_quota; if test "$enableval" = "no" then + QUOTA_CMT="#" { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling quota support" >&5 $as_echo "Disabling quota support" >&6; } else $as_echo "#define CONFIG_QUOTA 1" >>confdefs.h + QUOTA_CMT="" { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling quota support" >&5 $as_echo "Enabling quota support" >&6; } fi @@ -7127,7 +7129,6 @@ int main () { char *data, *data2, *data3; - const char *cdata2; int i, pagesize; int fd, fd2; @@ -7152,10 +7153,10 @@ main () fd2 = open ("conftest.txt", O_RDWR | O_CREAT | O_TRUNC, 0600); if (fd2 < 0) return 4; - cdata2 = ""; - if (write (fd2, cdata2, 1) != 1) + data2 = ""; + if (write (fd2, data2, 1) != 1) return 5; - data2 = (char *) mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L); + data2 = mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L); if (data2 == MAP_FAILED) return 6; for (i = 0; i < pagesize; ++i) diff --git a/configure.in b/configure.in index c304a8d..94e7c21 100644 --- a/configure.in +++ b/configure.in @@ -531,12 +531,14 @@ dnl PKG_PROG_PKG_CONFIG AH_TEMPLATE([CONFIG_QUOTA], [Define to 1 to enable quota support]) AC_ARG_ENABLE([quota], -[ --enable-libquota enable quota support], +[ --enable-quota enable quota support], if test "$enableval" = "no" then + QUOTA_CMT="#" AC_MSG_RESULT([Disabling quota support]) else AC_DEFINE(CONFIG_QUOTA, 1) + QUOTA_CMT="" AC_MSG_RESULT([Enabling quota support]) fi ,