fixed OSX build

diff --git a/configure.ac b/configure.ac
index 966314a21bf420862f4803fad99902822ae525e0..17de99d6d3d884f542f767547a524ce4de7c6e35 100644 (file)
--- 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([arpa/inet.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h unistd.h windows.h winsock2.h pthread.h sys/epoll.h sys/kevent.h openssl/ssl.h openssl/err.h openssl/rand.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])
 
 # Checks for typedefs, structures, and compiler characteristics.
 

diff --git a/src/mysqlConn.h b/src/mysqlConn.h
index 0cd3830c5623f09d74a91dbd014b8c5188eb2d4c..e0ebfc781dbe2637ad28fc085beb425d01c369ea 100644 (file)
--- a/src/mysqlConn.h
+++ b/src/mysqlConn.h
@@ -19,7 +19,9 @@
 
 #include "main.h"
 #include <mysql.h>
+#ifdef HAVE_MYSQL_ERRMSG_H
 #include <mysql/errmsg.h>
+#endif
 
 #define MYSQLMAXLEN 1024
 

diff --git a/src/overall.h b/src/overall.h
index cee57955cd4779a5ac8456523ca43d5e01f4d5f8..64ee2cadb67eed9bace5fe758bfb36b4549f43b2 100644 (file)
--- a/src/overall.h
+++ b/src/overall.h
@@ -31,7 +31,9 @@
 #include <winsock2.h>
 #include <malloc.h>
 #else
+#ifdef HAVE_FEATURES_H
 #include <features.h>
+#endif
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>