From patchwork Fri Jul 9 20:43:42 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Brunner X-Patchwork-Id: 111129 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o69KiH3c011683 for ; Fri, 9 Jul 2010 20:44:17 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753021Ab0GIUoN (ORCPT ); Fri, 9 Jul 2010 16:44:13 -0400 Received: from mail-fx0-f46.google.com ([209.85.161.46]:36118 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752661Ab0GIUoM (ORCPT ); Fri, 9 Jul 2010 16:44:12 -0400 Received: by fxm14 with SMTP id 14so1360588fxm.19 for ; Fri, 09 Jul 2010 13:44:11 -0700 (PDT) Received: by 10.223.115.18 with SMTP id g18mr8868166faq.11.1278708251211; Fri, 09 Jul 2010 13:44:11 -0700 (PDT) Received: from sir.home (e181033189.adsl.alicedsl.de [85.181.33.189]) by mx.google.com with ESMTPS id q24sm2596181faa.42.2010.07.09.13.44.09 (version=SSLv3 cipher=RC4-MD5); Fri, 09 Jul 2010 13:44:10 -0700 (PDT) Date: Fri, 9 Jul 2010 22:43:42 +0200 From: Christian Brunner To: ceph-devel@vger.kernel.org Subject: [PATCH] fix FCGI detection and specfile Message-ID: <20100709204342.GA31275@sir.home> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-12-10) Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Fri, 09 Jul 2010 20:44:18 +0000 (UTC) configure is building radosgw as soon as libfcgi is installed, even if --without-radosgw is given. Here is a fix for configure.in and the specfile. Regards, Christian --- ceph.spec.in | 2 +- configure.ac | 18 ++++++++---------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/ceph.spec.in b/ceph.spec.in index caf33d2..ca0c698 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -59,7 +59,7 @@ conjunction with any FastCGI capable web server. %if %{with_radosgw} %{configure} --without-hadoop --with-radosgw %else -%{configure} --without-hadoop +%{configure} --without-hadoop --without-radosgw %endif make -j$(getconf _NPROCESSORS_ONLN) CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" diff --git a/configure.ac b/configure.ac index 2b30fba..53a1d27 100644 --- a/configure.ac +++ b/configure.ac @@ -45,19 +45,17 @@ AC_ARG_WITH([radosgw], [AS_HELP_STRING([--with-radosgw], [build RADOS gateway])], [], [with_radosgw=check]) -RADOSGW=1 +RADOSGW=0 AS_IF([test "x$with_radosgw" != xno], [AC_CHECK_LIB([fcgi], [FCGX_Init], - [true], - [RADOSGW=0 - if test "x$with_radosgw" != "xcheck"; then + [AC_CHECK_LIB([expat], [XML_Parse], + [RADOSGW=1], + [if test "x$with_radosgw" != "xcheck"; then + AC_MSG_FAILURE([--with-radosgw was given but libexpat (libexpat1-dev on debian) not found]) + fi]) + ], + [if test "x$with_radosgw" != "xcheck"; then AC_MSG_FAILURE([--with-radosgw was given but libfcgi (libfcgi-dev on debian) not found]) - fi]) - AC_CHECK_LIB([expat], [XML_Parse], - [true], - [RADOSGW=0 - if test "x$with_radosgw" != "xcheck"; then - AC_MSG_FAILURE([--with-radosgw was given but libexpat (libexpat1-dev on debian) not found]) fi])]) AM_CONDITIONAL(WITH_RADOSGW, test "$RADOSGW" = "1")