From: Tomek Mrugalski <tomasz@isc.org>
Date: Mon, 23 Apr 2018 10:22:07 +0000 (+0100)
Subject: [5567] --with-pgsql,--with-mysql are now more robust
X-Git-Tag: trac5549_base~15^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7c85ff8b44bca8994497cae5bec77ed7ee58380;p=thirdparty%2Fkea.git

[5567] --with-pgsql,--with-mysql are now more robust
---

diff --git a/configure.ac b/configure.ac
index 9787560ba6..56807dbc5c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -637,6 +637,10 @@ AC_ARG_WITH([benchmark],
 # sets variables CRYPTO_*
 AX_CRYPTO
 
+# List of directories, where tools like mysql_config or pgsql_config will be
+# searched for
+defaultdirs="/usr /usr/local /usr/pkg /opt /opt/local"
+
 # Check for MySql.  The path to the mysql_config program is given with
 # the --with-mysql-config (default to /usr/bin/mysql-config).  By default,
 # the software is not built with MySQL support enabled.
@@ -655,7 +659,13 @@ if test "${deprec_msg}" = "yes" ; then
 fi
 
 if test "${mysql_config}" = "yes" ; then
-    MYSQL_CONFIG="/usr/bin/mysql_config"
+    for d in $defaultdirs
+    do
+        if test -f $d/bin/mysql_config; then
+            MYSQL_CONFIG="$d/bin/mysql_config"
+            break
+        fi
+    done
 elif test "${mysql_config}" != "no" ; then
     MYSQL_CONFIG="${withval}"
 fi
@@ -717,7 +727,13 @@ if test "${deprec_msg}" = "yes" ; then
 fi
 
 if test "${pg_config}" = "yes" ; then
-    PG_CONFIG="/usr/bin/pg_config"
+    for d in $defaultdirs
+    do
+        if test -f $d/bin/pg_config; then
+            PG_CONFIG="$d/bin/pg_config"
+            break
+        fi
+    done
 elif test "${pg_config}" != "no" ; then
     PG_CONFIG="${withval}"
 fi
@@ -832,8 +848,7 @@ elif test "${log4cplus_path}" != "yes" ; then
   LOG4CPLUS_LIBS="-L${log4cplus_path}/lib"
 else
 # If not specified, try some common paths.
-        log4cplusdirs="/usr /usr/local /usr/pkg /opt /opt/local"
-        for d in $log4cplusdirs
+        for d in $defaultdirs
         do
                 if test -f $d/include/log4cplus/logger.h; then
                         LOG4CPLUS_INCLUDES="-I$d/include"