m4: Modernize want_cassandra.m4

diff --git a/m4/want_cassandra.m4 b/m4/want_cassandra.m4
index 0648d5228e4f132754c4d048e48795e663ec21c0..e5c8fc28ae795d7c5e063b9e74e9965fcfcb0a59 100644 (file)
--- a/m4/want_cassandra.m4
+++ b/m4/want_cassandra.m4
@@ -1,23 +1,21 @@
-AC_DEFUN([DOVECOT_WANT_CASSANDRA], [
-  if test $want_cassandra != no; then
-          AC_CHECK_LIB(cassandra, cass_session_new, [
-                  AC_CHECK_HEADER(cassandra.h, [
+ AC_DEFUN([DOVECOT_WANT_CASSANDRA], [
+     AS_IF([test "$want_cassandra" != no], [
+          AC_CHECK_LIB([cassandra], [cass_session_new], [
+                  AC_CHECK_HEADER([cassandra.h], [
                           CASSANDRA_LIBS="$CASSANDRA_LIBS -lcassandra"
-  
                           AC_DEFINE(HAVE_CASSANDRA,, [Build with Cassandra support])
                           found_sql_drivers="$found_sql_drivers cassandra"
                           AC_CHECK_LIB(cassandra, cass_cluster_set_constant_speculative_execution_policy, [
                                        AC_DEFINE(HAVE_CASSANDRA_SPECULATIVE_POLICY, 1, [Cassandra supports speculative execution policy])
-                          ])
+                          ],, $CASSANDRA_LIBS)
                   ], [
-                    if test $want_cassandra = yes; then
+                    AS_IF([test "$want_cassandra" = yes], [
                       AC_ERROR([Can't build with Cassandra support: cassandra.h not found])
-                    fi
+                    ])
                   ])
-          ], [
-            if test $want_cassandra = yes; then
+          ], [AS_IF([test "$want_cassandra" = yes], [
               AC_ERROR([Can't build with Cassandra support: libcassandra not found])
-            fi
           ])
-  fi
+       ])
+     ])
 ])