Attachment 149182 Details for Bug 219025 – fix mysql detection

[patch] fix mysql detection

ntop-configure-mysql.diff (text/plain), 1.74 KB, created by Patrice Dumas on 2007-03-03 16:44:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Patrice Dumas

Created: 2007-03-03 16:44:53 UTC

Size: 1.74 KB

patch

obsolete

>Index: configure.in
>===================================================================
>RCS file: /export/home/ntop/ntop/configure.in,v
>retrieving revision 2.273
>diff -u -3 -p -r2.273 configure.in
>--- configure.in	27 Feb 2007 22:29:01 -0000	2.273
>+++ configure.in	3 Mar 2007 16:38:44 -0000
>@@ -1806,36 +1806,33 @@ fi
> dnl>
> dnl> MySQL
> dnl>
>+if test "x$ac_with_mysql" = "xyes"; then
>+
> AC_CHECK_TOOL(MYSQL, mysql_config)
> if test "x$ac_cv_prog_ac_ct_MYSQL" = "xmysql_config"; then
>   OLD_LIBS="${LIBS}"
>-  OLD_INCS="${INCS}"
>+  OLD_CPPFLAGS="${CPPFLAGS}"
>   LIBS="${LIBS} `mysql_config --libs_r`"
>-  INCS="${INCS} `mysql_config --cflags`"
>+  CPPFLAGS="${CPPFLAGS} `mysql_config --include`"
>   AC_CHECK_LIB([mysqlclient_r], [mysql_query])
>-  if test ".${ac_cv_lib_mysqlclient_r_mysql_query}" != ".no"; then
>-  LIBS="${OLD_LIBS}"
>-  INCS="${OLD_INCS}"
>+  if test ".${ac_cv_lib_mysqlclient_r_mysql_query}" = ".no"; then
>+    LIBS="${OLD_LIBS}"
>   else
>   dnl>
>   dnl> MySQL 4.x or better
>   dnl>
>-  AC_CHECK_HEADERS([mysql.h])
>-  if test ".${ac_cv_header_mysql_h}" != ".yes"; then
>-     echo "MySQL not found. Database support disabled";
>-     LIBS="${OLD_LIBS}"
>-     INCS="${OLD_INCS}"
>-  else
>-     AC_CHECK_TOOL(MYSQL, mysql_config)
>-     if test "x$ac_cv_prog_ac_ct_MYSQL" = "xmysql_config"; then
>-	echo "MySQL support enabled";
>-     else
>-       echo "MySQL support disabled";
>-       LIBS="${OLD_LIBS}"
>-       INCS="${OLD_INCS}"
>-     fi
>-  fi
>+    AC_CHECK_HEADERS([mysql.h])
>+    if test ".${ac_cv_header_mysql_h}" != ".yes"; then
>+      echo "MySQL not found. Database support disabled";
>+      LIBS="${OLD_LIBS}"
>+    else
>+      echo "MySQL support enabled";
>+      INCS="${INCS} `mysql_config --include`"
>+    fi
>   fi
>+  CPPFLAGS="${OLD_CPPFLAGS}"
>+fi
>+
> fi
> 
> dnl>

Actions: View | Diff

Attachments on bug 219025: 143230 | 143662 | 148350 | 148534 | 149182 | 149183 | 149782 | 150284 | 150285 | 150302 | 150840