]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
configure: fix radosgw conditional compilation
authorSage Weil <sage@newdream.net>
Thu, 10 Sep 2009 20:48:12 +0000 (13:48 -0700)
committerSage Weil <sage@newdream.net>
Thu, 10 Sep 2009 20:48:12 +0000 (13:48 -0700)
configure.ac

index 3a6f4d68a4015b87ed1fb7547ebf75aedca9041c..1f0aca905768652da7801ce83a4c83b675ae9f74 100644 (file)
@@ -48,20 +48,14 @@ AC_ARG_WITH([radosgw],
 RADOSGW=1
 AS_IF([test "x$with_radosgw" != xno],
            [AC_CHECK_LIB([fcgi], [FCGX_Init],
-             [RADOSGW=0],
-            [if test "x$with_radosgw" != xcheck; then
-                 AC_MSG_FAILURE(
-                   [--with-radosgw was given, but libfcgi not found])
-               fi
-             ])
+             [],
+            [RADOSGW=0])
             AC_CHECK_LIB([expat], [XML_Parse],
-             [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
-             ])
-            ])
+             [],
+            [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)
 AM_CONDITIONAL(WITH_RADOSGW, test "$RADOSGW" = "1")
 
 # fuse?