changes in mariadb client detection
authorVictor Kirhenshtein <victor@netxms.org>
Tue, 26 Sep 2017 13:18:38 +0000 (16:18 +0300)
committerVictor Kirhenshtein <victor@netxms.org>
Tue, 26 Sep 2017 13:18:38 +0000 (16:18 +0300)
configure.ac
src/db/dbdrv/mariadb/mariadbdrv.h

index 62ee3aa..19da494 100644 (file)
@@ -432,7 +432,7 @@ AC_ARG_WITH(mysql,
                        MYSQL_LD_RUN_PATH="$__dir$"    
                        MYSQL_LDFLAGS="-L$__dir"
                fi
-               if find_existing_dir "/usr/local/mysql/include" "/usr/include/mysql" "/usr/mysql/include" "/usr/local/include/mysql" "/usr/local/mysql/include/mysql" "/usr/mysql/include/mysql" "/usr/include/mariadb"; then
+               if find_existing_dir "/usr/local/mysql/include" "/usr/include/mysql" "/usr/mysql/include" "/usr/local/include/mysql" "/usr/local/mysql/include/mysql" "/usr/mysql/include/mysql"; then
                        MYSQL_CPPFLAGS="-I$__dir"
                fi
        fi
index 563dd3f..5201bb9 100644 (file)
@@ -43,8 +43,8 @@
 #include <nms_util.h>
 
 #undef GROUP_FLAG
-#include <mariadb/mysql.h>
-#include <mariadb/errmsg.h>
+#include <mysql.h>
+#include <errmsg.h>
 
 /**
  * Structure of DB connection handle