From: Karl Fleischmann <karl.fleischmann@open-xchange.com>
Date: Thu, 11 Aug 2022 14:36:03 +0000 (+0200)
Subject: m4: want_mysql.m4 - Remove HAVE_OPENSSL definition when detecting mysql features
X-Git-Tag: 2.4.0~3667
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=41f82fa72388c2603efb1a3281c8d89d7cfa3ff2;p=thirdparty%2Fdovecot%2Fcore.git

m4: want_mysql.m4 - Remove HAVE_OPENSSL definition when detecting mysql features

The HAVE_OPENSSL macro has no effect on the exposed features when
including mysql.h, thus it can be removed from the feature detection.
---

diff --git a/m4/want_mysql.m4 b/m4/want_mysql.m4
index 50e84cd071..7274708c63 100644
--- a/m4/want_mysql.m4
+++ b/m4/want_mysql.m4
@@ -83,17 +83,11 @@ AC_DEFUN([DOVECOT_WANT_MYSQL], [
       ])
     ],, $MYSQL_LIBS)
 
-    ssl_define=""
-    AS_IF([test "$have_openssl" = "yes"], [
-      ssl_define="#define HAVE_OPENSSL"
-    ])
-
     dnl add mysql-specific flags to the global CPPFLAGS to compile the
     dnl mysql-test programs
     tmp_CPPFLAGS="$CPPFLAGS"
     CPPFLAGS="$MYSQL_CFLAGS"
     AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-      $ssl_define
       #include <mysql.h>
     ]], [[
       mysql_ssl_set(0, 0, 0, 0, 0, 0);
@@ -104,7 +98,6 @@ AC_DEFUN([DOVECOT_WANT_MYSQL], [
     ])
 
     AC_COMPILE_IFELSE([_au_m4_changequote([,])AC_LANG_PROGRAM([[
-      $ssl_define
       #include <mysql.h>
     ]], [[
       int i = MYSQL_OPT_SSL_VERIFY_SERVER_CERT;