fix FCGI detection and specfile

PATCH New Christian Brunner 1 participant 1 message Jul 9, 2010

Share & tools

Christian Brunner

author

2010-07-09 20:44 UTC #0 lore raw

PATCH 1/1 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

---
 ceph.spec.in |    2 +-
 configure.ac |   18 ++++++++----------
 2 files changed, 9 insertions(+), 11 deletions(-)

ceph.spec.in +1 -1

index caf33d2..ca0c698 100644
@@ -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"

configure.ac +8 ~~-10~~

index 2b30fba..53a1d27 100644
@@ -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")

Signature · 1 line

1.5.5.6