From: pk910 <philipp@zoelle1.de>
Date: Sat, 22 Sep 2012 05:12:08 +0000 (+0200)
Subject: fixed path of mysql/errmsg.h (OSX compilation fix)
X-Git-Url: http://git.pk910.de/?p=NeonServV5.git;a=commitdiff_plain;h=4812835346f724fcea86e78f741cc6c72c86b676

fixed path of mysql/errmsg.h (OSX compilation fix)
---

diff --git a/configure.ac b/configure.ac
index 17de99d..409d0a2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -76,7 +76,7 @@ AC_ARG_ENABLE([debug],
 CFLAGS="$CFLAGS -D_GNU_SOURCE"
 
 # Checks for header files.
-AC_CHECK_HEADERS([stdio.h stdlib.h string.h ctype.h windows.h winsock2.h malloc.h features.h sys/types.h sys/socket.h netinet/in.h netinet/tcp.h arpa/inet.h netdb.h sys/wait.h errno.h unistd.h getopt.h stdarg.h sys/time.h time.h signal.h sys/epoll.h sys/event.h ws2tcpip.h mysql.h mysql/errmsg.h])
+AC_CHECK_HEADERS([stdio.h stdlib.h string.h ctype.h windows.h winsock2.h malloc.h features.h sys/types.h sys/socket.h netinet/in.h netinet/tcp.h arpa/inet.h netdb.h sys/wait.h errno.h unistd.h getopt.h stdarg.h sys/time.h time.h signal.h sys/epoll.h sys/event.h ws2tcpip.h mysql.h mysql/errmsg.h errmsg.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
 
diff --git a/src/mysqlConn.h b/src/mysqlConn.h
index e0ebfc7..660e2cb 100644
--- a/src/mysqlConn.h
+++ b/src/mysqlConn.h
@@ -21,6 +21,8 @@
 #include <mysql.h>
 #ifdef HAVE_MYSQL_ERRMSG_H
 #include <mysql/errmsg.h>
+#elif defined(HAVE_ERRMSG_H)
+#include <errmsg.h>
 #endif
 
 #define MYSQLMAXLEN 1024