From d1ed0dccd15ac882630379b19e8dd359a1565471 Mon Sep 17 00:00:00 2001
From: loonycyborg <loonycyborg@gmail.com>
Date: Tue, 15 Jan 2019 14:23:47 +0300
Subject: [PATCH] scons: improved error handling for sql client lib and added
 support for mariadb_config

---
 SConstruct | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/SConstruct b/SConstruct
index bcfc9fcdafc..f20e863dfd3 100755
--- a/SConstruct
+++ b/SConstruct
@@ -420,10 +420,21 @@ if env["prereqs"]:
             client_env.Append(CPPDEFINES = ["HAVE_HISTORY"])
 
     if env["forum_user_handler"]:
-        mysql_config = check_output(["mysql_config", "--libs", "--cflags"]).replace("\n", " ").replace("-DNDEBUG", "")
-        mysql_flags = env.ParseFlags(mysql_config)
-        env.Append(CPPDEFINES = ["HAVE_MYSQLPP"])
-        env.MergeFlags(mysql_flags)
+        found_connector = False
+        for sql_config in ["mariadb_config", "mysql_config"]:
+            try:
+                mysql_config = check_output([sql_config, "--libs", "--cflags"]).replace("\n", " ").replace("-DNDEBUG", "")
+                mysql_flags = env.ParseFlags(mysql_config)
+                env.Append(CPPDEFINES = ["HAVE_MYSQLPP"])
+                env.MergeFlags(mysql_flags)
+                found_connector = True
+                break
+            except OSError:
+                print("Failed to run script '%s'" % sql_config)
+
+        if not found_connector:
+            Exit("Failed to find sql connector library but forum user handler support is requested.")
+            have_server_prereqs = False
 
     client_env = conf.Finish()