Sophie

Sophie

distrib > Mandriva > current > i586 > by-pkgid > bedfb2d9e5ab7ea9c8321df80fa3c679 > files > 5

ntop-3.3.10-4mdv2010.1.src.rpm

diff -Naur ntop-3.3/config.h.in ntop-3.3.oden/config.h.in
--- ntop-3.3/config.h.in	2007-06-09 11:24:45.000000000 +0200
+++ ntop-3.3.oden/config.h.in	2007-12-17 13:29:45.000000000 +0100
@@ -237,7 +237,7 @@
 /* Define to 1 if you have the `memset' function. */
 #undef HAVE_MEMSET
 
-/* Define to 1 if you have the <mysql.h> header file. */
+/* Define to 1 if you have the <mysql/mysql.h> header file. */
 #undef HAVE_MYSQL_H
 
 /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
diff -Naur ntop-3.3/configure.in ntop-3.3.oden/configure.in
--- ntop-3.3/configure.in	2007-06-09 23:30:00.000000000 +0200
+++ ntop-3.3.oden/configure.in	2007-12-17 13:29:56.000000000 +0100
@@ -1560,7 +1560,7 @@
   dnl>
   dnl> MySQL 4.x or better
   dnl>
-    AC_CHECK_HEADERS([mysql.h])
+    AC_CHECK_HEADERS([mysql/mysql.h])
     if test ".${ac_cv_header_mysql_h}" != ".yes"; then
       echo "MySQL not found. Database support disabled";
       LIBS="${OLD_LIBS}"
diff -Naur ntop-3.3/ntop.h ntop-3.3.oden/ntop.h
--- ntop-3.3/ntop.h	2007-06-05 20:05:46.000000000 +0200
+++ ntop-3.3.oden/ntop.h	2007-12-17 13:29:37.000000000 +0100
@@ -374,8 +374,8 @@
 #define my_socket_defined
 #define my_socket int
 #endif
-#include <mysql.h> /* Headers for MySQL usage */
-#include <errmsg.h>
+#include <mysql/mysql.h> /* Headers for MySQL usage */
+#include <mysql/errmsg.h>
 #endif
 
 #ifndef WIN32