blob: 81271d47e04904a217bf72f5fbf223b9a38bc1dd (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
|
diff -ur ntopng-2.4-stable-old/configure.ac ntopng-2.4-stable/configure.ac
--- ntopng-2.4-stable-old/configure.ac 2016-08-01 01:37:29.950818144 +0000
+++ ntopng-2.4-stable/configure.ac 2016-08-01 01:37:05.291080834 +0000
@@ -308,17 +308,23 @@
AC_CHECK_TOOL(MARIADB, mariadb_config)
if test "x$ac_cv_prog_ac_ct_MARIADB" = "xmariadb_config"; then
MYSQLTOOL="mariadb_config"
+ echo "mariadb check tool: $ac_cv_prog_ac_ct_MARIADB"
+ echo "MYSQLTOOL = mariadb_config"
else
PATH=$PATH:/usr/local/mysql/bin
AC_CHECK_TOOL(MYSQL, mysql_config)
- if test "x$ac_cv_prog_ac_ct_MYSQL" = "xmysql_config"; then
- MYSQLTOOL="mysql_config"
- else
+ echo "mysql check tool: $ac_cv_prog_ac_ct_MYSQL"
+ if test "x$ac_cv_prog_ac_ct_MYSQL" = "xx86_64-pc-linux-gnu-mysql_config"; then
- MYSQLTOOL=""
+ MYSQLTOOL="x86_64-pc-linux-gnu-mysql_config"
+ echo "MYSQLTOOL = x86_64-pc-linux-gnu-mysql_config"
+ else
+ MYSQLTOOL="$ac_cv_prog_ac_ct_MYSQL"
+ echo "MYSQLTOOL = $ac_cv_prog_ac_ct_MYSQL"
fi
fi
if test -n "$MYSQLTOOL"; then
+ echo "Running MYSQLTOOL"
MYSQLLIBS="`$MYSQLTOOL --libs_r`"
if test ".$MYSQLLIBS" != "."; then
MYSQL_LIB="`$MYSQLTOOL --libs`"
|
GitWeb
