]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
configure: fix libexpat1, libfcgi checks (again)
authorSage Weil <sage@newdream.net>
Fri, 25 Sep 2009 15:43:03 +0000 (08:43 -0700)
committerSage Weil <sage@newdream.net>
Fri, 25 Sep 2009 15:43:03 +0000 (08:43 -0700)
configure.ac

index 506e6c3295a644b5f816b8080e83b7fefb61c58f..df8dfa4b544ea5c5ab15c6352388dc36661193a1 100644 (file)
@@ -49,13 +49,16 @@ RADOSGW=1
 AS_IF([test "x$with_radosgw" != xno],
            [AC_CHECK_LIB([fcgi], [FCGX_Init],
              [true],
-            [RADOSGW=0])
+            [RADOSGW=0
+            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 "$RADOSGW" != "1" -a "x$with_radosgw" != "xcheck"; then
-                   AC_MSG_FAILURE([--with-radosgw was given, but libexpat (libexpat1-dev on debian) not found])
-            fi)
+            [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")
 
 # fuse?