Merge pull request #3129 from garlick/config_s3_fix

build: fix innocuous configure error
flux-framework · Aug 11, 2020 · c3cecee · c3cecee
2 parents d5df093 + 576cfb1
commit c3cecee
Showing 1 changed file with 16 additions and 12 deletions.
diff --git a/configure.ac b/configure.ac
@@ -357,18 +357,22 @@ AC_ARG_ENABLE([content-s3],
     AS_HELP_STRING([--enable-content-s3], [Enable S3 storage backend]))
 
 AS_IF([test "x$enable_content_s3" = "xyes"], [
-    X_AC_CHECK_COND_LIB(s3, S3_initialize),
-	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <libs3.h>],
-            [S3_create_bucket (0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);])],
-		    [AC_DEFINE([HAVE_S3_AUTH_REGION], [1], 
-                       [Use libs3 functions with auth region])],
-            []),
-	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <libs3.h>],
-            [S3_create_bucket (0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);])],
-		    [AC_DEFINE([HAVE_S3_TIMEOUT_ARG], [1], 
-                       [Use libs3 functions with timeout arg])],
-            [])
-    ], [])
+    X_AC_CHECK_COND_LIB(s3, S3_initialize)
+    AS_IF([test "x$ac_cv_lib_s3_S3_initialize" != "xyes"], [
+      AC_MSG_ERROR([configured with --enable-content-s3, but libs3 not found])
+    ])
+
+    AC_COMPILE_IFELSE(
+        [AC_LANG_PROGRAM([#include <libs3.h>],
+                         [S3_create_bucket (0,0,0,0,0,0,0,0,0,0,0);])],
+        AC_DEFINE([HAVE_S3_AUTH_REGION], [1], [S3_create_bucket has 11 args]),
+        AC_COMPILE_IFELSE(
+            [AC_LANG_PROGRAM([#include <libs3.h>],
+                             [S3_create_bucket (0,0,0,0,0,0,0,0,0,0,0,0,0);])],
+            AC_DEFINE([HAVE_S3_TIMEOUT_ARG], [1], [S3_create_bucket has 13 args])
+        )
+    )
+])
 
 AM_CONDITIONAL([ENABLE_CONTENT_S3], [test "x$enable_content_s3" = "xyes"])