[Asterisk-code-review] configure: Add check for MySQL client bool and my_bool type usage. (asterisk[13.30])

[Friendly Automation]

Friendly Automation has submitted this change. ( https://gerrit.asterisk.org/c/asterisk/+/13465 )

Change subject: configure: Add check for MySQL client bool and my_bool type usage.
......................................................................

configure: Add check for MySQL client bool and my_bool type usage.

Instead of trying to use the defined MySQL client version from the
header use a configure check to determine whether the bool or my_bool
type should be used for defining a boolean.

ASTERISK-28604

Change-Id: Id2225b3785115de074c50c123ff1a68005b4a9c7
---
M addons/cdr_mysql.c
M configure
M configure.ac
M include/asterisk/autoconfig.h.in
4 files changed, 86 insertions(+), 4 deletions(-)

Approvals:
  George Joseph: Looks good to me, but someone else must approve
  Joshua C. Colp: Looks good to me, approved
  Friendly Automation: Approved for Submit



diff --git a/addons/cdr_mysql.c b/addons/cdr_mysql.c
index b613844..268ce53 100644
--- a/addons/cdr_mysql.c
+++ b/addons/cdr_mysql.c
@@ -180,9 +180,9 @@
 {
 	struct ast_str *sql1 = ast_str_thread_get(&sql1_buf, 1024), *sql2 = ast_str_thread_get(&sql2_buf, 1024);
 	int retries = 5;
-#if MYSQL_VERSION_ID >= 80001
+#ifdef HAVE_MYSQLCLIENT_BOOL
 	bool my_bool_true = 1;
-#elif MYSQL_VERSION_ID >= 50013
+#elif HAVE_MYSQLCLIENT_MY_BOOL
 	my_bool my_bool_true = 1;
 #endif
 
@@ -480,9 +480,9 @@
 	MYSQL_ROW row;
 	MYSQL_RES *result;
 	char sqldesc[128];
-#if MYSQL_VERSION_ID >= 80001
+#ifdef HAVE_MYSQLCLIENT_BOOL
 	bool my_bool_true = 1;
-#elif MYSQL_VERSION_ID >= 50013
+#elif HAVE_MYSQLCLIENT_MY_BOOL
 	my_bool my_bool_true = 1;
 #endif
 
diff --git a/configure b/configure
index bb7baa3..f26d03c 100755
--- a/configure
+++ b/configure
@@ -23149,6 +23149,7 @@
 fi
 
 
+
 		if test "x${PBX_MYSQLCLIENT}" != "x1" -a "${USE_MYSQLCLIENT}" != "no"; then
 		PBX_MYSQLCLIENT=0
 		if test -n "$ac_tool_prefix"; then
@@ -23268,6 +23269,61 @@
 	fi
 
 
+if test "${PBX_MYSQLCLIENT}" = 1; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MySQL client bool support" >&5
+$as_echo_n "checking for MySQL client bool support... " >&6; }
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <mysql/mysql.h>
+int
+main ()
+{
+bool test = 1;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define HAVE_MYSQLCLIENT_BOOL 1" >>confdefs.h
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MySQL client my_bool support" >&5
+$as_echo_n "checking for MySQL client my_bool support... " >&6; }
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <mysql/mysql.h>
+int
+main ()
+{
+my_bool test = 1;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define HAVE_MYSQLCLIENT_MY_BOOL 1" >>confdefs.h
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+
 
 if test "x${PBX_NBS}" != "x1" -a "${USE_NBS}" != "no"; then
    pbxlibdir=""
diff --git a/configure.ac b/configure.ac
index 9b74517..ad8a679 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2264,8 +2264,28 @@
    AC_CHECK_MEMBER([Q931_info_t.redirect_dn], [], [PBX_MISDN=0], [#include <mISDNuser/mISDNlib.h>])
 fi
 
+
 AST_EXT_TOOL_CHECK([MYSQLCLIENT], [mysql_config])
 
+if test "${PBX_MYSQLCLIENT}" = 1; then
+   AC_MSG_CHECKING(for MySQL client bool support)
+   AC_LINK_IFELSE(
+           [AC_LANG_PROGRAM([#include <mysql/mysql.h>],
+                   [bool test = 1;])],
+           AC_MSG_RESULT(yes)
+           AC_DEFINE(HAVE_MYSQLCLIENT_BOOL, 1, [Define to 1 if mysql/mysql.h has bool defined.]),
+           AC_MSG_RESULT(no)
+   )
+   AC_MSG_CHECKING(for MySQL client my_bool support)
+   AC_LINK_IFELSE(
+           [AC_LANG_PROGRAM([#include <mysql/mysql.h>],
+                   [my_bool test = 1;])],
+           AC_MSG_RESULT(yes)
+           AC_DEFINE(HAVE_MYSQLCLIENT_MY_BOOL, 1, [Define to 1 if mysql/mysql.h has my_bool defined.]),
+           AC_MSG_RESULT(no)
+   )
+fi
+
 AST_EXT_LIB_CHECK([NBS], [nbs], [nbs_connect], [nbs.h])
 
 AST_EXT_TOOL_CHECK([NEON], [neon-config])
diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in
index 1d036d7..5cf7a10 100644
--- a/include/asterisk/autoconfig.h.in
+++ b/include/asterisk/autoconfig.h.in
@@ -510,6 +510,12 @@
 /* Define if your system has the MYSQLCLIENT libraries. */
 #undef HAVE_MYSQLCLIENT
 
+/* Define to 1 if mysql/mysql.h has bool defined. */
+#undef HAVE_MYSQLCLIENT_BOOL
+
+/* Define to 1 if mysql/mysql.h has my_bool defined. */
+#undef HAVE_MYSQLCLIENT_MY_BOOL
+
 /* Define to 1 if you have the Network Broadcast Sound library. */
 #undef HAVE_NBS
 

-- 
To view, visit https://gerrit.asterisk.org/c/asterisk/+/13465
To unsubscribe, or for help writing mail filters, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: 13.30
Gerrit-Change-Id: Id2225b3785115de074c50c123ff1a68005b4a9c7
Gerrit-Change-Number: 13465
Gerrit-PatchSet: 2
Gerrit-Owner: Joshua C. Colp <jcolp at sangoma.com>
Gerrit-Reviewer: Friendly Automation
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Joshua C. Colp <jcolp at sangoma.com>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20191218/e9d43b82/attachment.html>