From c3c835a405487c32c66ab5d68c3bca5517799405 Mon Sep 17 00:00:00 2001 From: rwst Date: Thu, 13 Jul 2006 09:45:29 +0000 Subject: [PATCH] check for to get FIONREAD on Solaris 8 (fixes part of #1516476) --- configure.ac | 7 +++++++ src/dom/io/socket.cpp | 8 ++++++++ 2 files changed, 15 insertions(+) diff --git a/configure.ac b/configure.ac index e52f20650..ad213e3f2 100644 --- a/configure.ac +++ b/configure.ac @@ -82,6 +82,9 @@ if test "x$PKG_CONFIG" = "xno"; then AC_MSG_ERROR(You have to install pkg-config to compile inkscape.) fi +dnl ****************************** +dnl Check for libpng +dnl ****************************** AC_CHECK_LIB(png, png_read_info, [AC_CHECK_HEADER(png.h, png_ok=yes, png_ok=no)], png_ok=no, -lz -lm) if test "x$png_ok" != "xyes"; then AC_MSG_ERROR([libpng >= 1.2 is needed to compile inkscape]) @@ -157,6 +160,10 @@ if test "x$gc_ok" != "xyes"; then AC_MSG_ERROR([libgc (the Boehm Conservative Collector) 6.4+, is needed to compile inkscape -- http://www.hpl.hp.com/personal/Hans_Boehm/gc]) fi +dnl This check is to get a FIONREAD definition on Solaris 8 +AC_CHECK_HEADERS([sys/filio.h]) + + AC_CHECK_HEADERS([malloc.h]) AC_CHECK_FUNCS([mallinfo], [ AC_CHECK_MEMBERS([struct mallinfo.usmblks, diff --git a/src/dom/io/socket.cpp b/src/dom/io/socket.cpp index 30d5829fd..31eeb56ba 100644 --- a/src/dom/io/socket.cpp +++ b/src/dom/io/socket.cpp @@ -27,6 +27,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef HAVE_CONFIG_H +#include +#endif + +#ifdef HAVE_SYS_FILIO_H +#include // needed on Solaris 8 +#endif + #include "socket.h" #include "dom/util/thread.h" -- 2.30.2