fix FCGI detection and specfile

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

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/ceph.spec.in b/ceph.spec.in
index caf33d2a6bd8b32ac54ae6075955ec8154688435..ca0c698784faa958e54a2e7ff3cc38d511a4c34f 100644 (file)
--- 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 2b30fbafd4473cbd33b9cf259099ed8809b378e5..53a1d273fdff09671ea7bcfbb0a733c4109d73c0 100644 (file)
--- 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")