Hello, On Sun, Jan 13, 2008 at 05:07:04PM +0100, Thomas-Martin Seck wrote:
All,
I am very glad to see that dillo-fltk has now gained some momentum.
While looking at it on FreeBSD (6.2) I came across some minor problems, patches for which are attached:
1) detect_libiconv.diff
src/decode.c uses iconv_open but - at least on FreeBSD - libiconv is not in the default linker path, making the build abort. Add a simple test to configure.in to check for libiconv's presence and usability and a substitution for ICONV_LIBS to src/Makefile.am.
Very nice! The same problem exists on DragonFly...
2) src-colors.h.diff
I needed to include <stdint.h> or <inttypes.h> in order to have int32_t properly defined. I decided to wrap this include in a hopefully portable and correct way by instrumenting config.h.
3) src-dns.c.diff
On current FreeBSD releases, netdb.h does no longer define EAI_NODATA, it had been marked as obsoleted there and #if 0'ed out since Oct 2003. It therefore cannot be checked for on a current FreeBSD release, so test whether we are either compiling on something other that FreeBSD or if it's a 4.x or older FreeBSD release. Other BSDs might have similar issues in this regard.
EAI_NODATA still exists on DragonFly. But if it's obsolete we should generally avoid to use it. Or to be on the safe side do something like: #ifdef EAI_NODATA ... #endif Regards, Johannes
Otherwise dillo-fltk looks really promising -- keep up the good work!
Best regards, -- Thomas-Martin Seck current dillo and FLTK port maintainer on FreeBSD
Content-Description: detect_libiconv.diff
--- dillo2/configure.in Fri Oct 19 17:39:27 2007 +++ dillo2-cur/configure.in Sun Jan 13 15:46:18 2008 @@ -300,6 +300,18 @@ AC_DEFINE([ENABLE_SSL], [], [Enable SSL support]) fi
+dnl ---------------------- +dnl Test for libiconv +dnl ---------------------- +AC_CHECK_HEADER(iconv.h, iconv_ok=yes, iconv_ok=no) +if test "x$iconv_ok" = "xyes"; then + AC_CHECK_LIB(iconv, iconv_open, iconv_ok=yes, iconv_ok=no) +fi +if test "x$iconv_ok" = "xyes"; then + LIBICONV_LIBS="-liconv" +else + AC_ERROR(libiconv must be installed!) +fi
dnl ---------------------- dnl Test for POSIX threads @@ -465,6 +477,7 @@ AC_SUBST(LIBFLTK_CXXFLAGS) AC_SUBST(LIBFLTK_CFLAGS) AC_SUBST(LIBFLTK_LIBS) +AC_SUBST(LIBICONV_LIBS) AC_SUBST(datadir) AC_SUBST(src doc)
--- dillo2/src/Makefile.am Tue Nov 13 14:56:43 2007 +++ dillo2-cur/src/Makefile.am Sun Jan 13 15:04:17 2008 @@ -14,7 +14,7 @@ ../../dw-testbed/dw/libDw-fltk.a \ ../../dw-testbed/dw/libDw-core.a \ ../../dw-testbed/lout/liblout.a \ - @LIBJPEG_LIBS@ @LIBPNG_LIBS@ @LIBFLTK_LIBS@ @LIBZ_LIBS@ + @LIBJPEG_LIBS@ @LIBPNG_LIBS@ @LIBFLTK_LIBS@ @LIBZ_LIBS@ @LIBICONV_LIBS@
dillo_fltk_SOURCES = \ dillo.cc \
Content-Description: src-colors.h.diff
--- dillo2/src/colors.h Sun Oct 7 00:36:34 2007 +++ dillo2-cur/src/colors.h Sun Jan 13 15:49:28 2008 @@ -1,6 +1,15 @@ #ifndef __COLORS_H__ #define __COLORS_H__
+#include "config.h" +#ifdef HAVE_INTTYPES_H +#include <inttypes.h> +#else +#ifdef HAVE_STDINT_H +#include <stdint.h> +#endif +#endif + #ifdef __cplusplus extern "C" { #endif /* __cplusplus */
Content-Description: src-dns.c.diff
--- dillo2/src/dns.c Mon Nov 5 21:25:16 2007 +++ dillo2-cur/src/dns.c Sun Jan 13 16:48:07 2008 @@ -289,8 +289,12 @@ static void *Dns_server(void *data) MSG("DNS error: HOST_NOT_FOUND\n"); else if (error == EAI_AGAIN) MSG("DNS error: TRY_AGAIN\n"); + /* The EAI_NODATA definition is marked as obsoleted in FreeBSD's netdb.h + * and is #if 0'ed in releases starting with 5.2: */ +#if !defined __FreeBSD__ || __FreeBSD__ <= 4 else if (error == EAI_NODATA) MSG("DNS error: NO_ADDRESS\n"); +#endif else if (h_errno == EAI_FAIL) MSG("DNS error: NO_RECOVERY\n"); } else {
_______________________________________________ Dillo-dev mailing list Dillo-dev@dillo.org http://lists.auriga.wearlab.de/cgi-bin/mailman/listinfo/dillo-dev