From: Christian Brunner <chb@muc.de>
To: ceph-devel@vger.kernel.org
Subject: [PATCH] fix FCGI detection and specfile
Date: Fri, 9 Jul 2010 22:43:42 +0200 [thread overview]
Message-ID: <20100709204342.GA31275@sir.home> (raw)
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")
--
1.5.5.6
reply other threads:[~2010-07-09 20:44 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100709204342.GA31275@sir.home \
--to=chb@muc.de \
--cc=ceph-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.