From b6f83ea4db94339449c05be946477b729e9b991a Mon Sep 17 00:00:00 2001
From: "rob rob@31f1291d-b8d6-0310-a050-a5561fc1590b"
 <rob rob@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>
Date: Wed, 22 Sep 2004 14:17:36 +0000
Subject: BUILD : 1.7.5 (356) BUGS : N/A NOTES : Fuixed mysql include issue, it
 should now detect to use mysql/mysql/h or not

git-svn-id: svn://svn.anope.org/anope/trunk@356 31f1291d-b8d6-0310-a050-a5561fc1590b


git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@232 5417fbe8-f217-4b02-8779-1006273d7864
---
 include/services.h   |  8 ++++----
 include/sysconf.h.in | 19 ++++++++-----------
 2 files changed, 12 insertions(+), 15 deletions(-)

(limited to 'include')

diff --git a/include/services.h b/include/services.h
index 726bc2a7c..4c7ddcb4e 100644
--- a/include/services.h
+++ b/include/services.h
@@ -57,12 +57,12 @@
 #ifdef USE_MYSQL
 # define MYSQL_WARNING 2
 # define MYSQL_ERROR   4
-#ifdef HAVE_MYSQL_MYSQL_H
-# include <mysql.h>
-# include <errmsg.h>
-#else
+#ifdef MYSQL_HEADER_PREFIX
 # include <mysql/mysql.h>
 # include <mysql/errmsg.h>
+#else
+# include <mysql.h>
+# include <errmsg.h>
 #endif
 #endif
 
diff --git a/include/sysconf.h.in b/include/sysconf.h.in
index 326501c5e..5142b6cec 100644
--- a/include/sysconf.h.in
+++ b/include/sysconf.h.in
@@ -30,9 +30,6 @@
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
-/* "We have the mysql Header file" */
-#undef HAVE_MYSQL_MYSQL_H
-
 /* Define if you have POSIX threads libraries and header files. */
 #undef HAVE_PTHREAD
 
@@ -96,7 +93,7 @@
 /* "First IRCD type" */
 #undef IRC_BAHAMUT
 
-/* "First IRCD type" */
+/* "Frist IRCD type" */
 #undef IRC_DREAMFORGE
 
 /* "First IRCD type" */
@@ -105,28 +102,28 @@
 /* "First IRCD type" */
 #undef IRC_PTLINK
 
-/* "Second IRCD type" */
+/* "First IRCD type" */
 #undef IRC_RAGE2
 
-/* "Second IRCD type" */
+/* "First IRCD type" */
 #undef IRC_ULTIMATE2
 
-/* "Second IRCD type" */
+/* "First IRCD type" */
 #undef IRC_ULTIMATE3
 
-/* "Second IRCD type" */
+/* "First IRCD type" */
 #undef IRC_UNREAL31
 
-/* "Second IRCD type" */
+/* "First IRCD type" */
 #undef IRC_UNREAL32
 
-/* "Second IRCD type" */
+/* "First IRCD type" */
 #undef IRC_VIAGRA
 
 /* "Module dir" */
 #undef MODULE_PATH
 
-/* "mysql.h is in a mysql/ folder" */
+/* "Has mysql/mysql.h" */
 #undef MYSQL_HEADER_PREFIX
 
 /* Define to the address where bug reports for this package should be sent. */
-- 
cgit