diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | configure.in | 12 | ||||
| -rw-r--r-- | src/Makefile.am | 2 |
3 files changed, 14 insertions, 2 deletions
@@ -110,7 +110,7 @@ dillo-fltk2 - Made dialogs use font_factor (e.g. view source). - Implemented the SELECT element in FORMS! Patches: Jeremy Henty -+- Added an int32_t include-test, and an EAI_NODATA check for FreeBSD. ++- Added int32_t, EAI_NODATA and iconv tests for FreeBSD. Patch: Thomas-Martin Seck TODO: diff --git a/configure.in b/configure.in index 8bd37913..21ad38a1 100644 --- a/configure.in +++ b/configure.in @@ -300,6 +300,17 @@ if test "x$ssl_ok" = "xyes"; then AC_DEFINE([ENABLE_SSL], [], [Enable SSL support]) fi +dnl ---------------------- +dnl Test for iconv functionality in libc or for libiconv usability +dnl ---------------------- +AC_CHECK_HEADER(iconv.h, iconv_ok=yes, iconv_ok=no) +if test "x$iconv_ok" = "xyes"; then + AC_CHECK_LIB(c, iconv_open, LIBICONV_LIBS="", + AC_CHECK_LIB(iconv, iconv_open, LIBICONV_LIBS="-liconv", iconv_ok=no)) +fi +if test "x$iconv_ok" = "xno"; then + AC_ERROR(libiconv must be installed!) +fi dnl ---------------------- dnl Test for POSIX threads @@ -465,6 +476,7 @@ AC_SUBST(LIBPTHREAD_LDFLAGS) AC_SUBST(LIBFLTK_CXXFLAGS) AC_SUBST(LIBFLTK_CFLAGS) AC_SUBST(LIBFLTK_LIBS) +AC_SUBST(LIBICONV_LIBS) AC_SUBST(datadir) AC_SUBST(src doc) diff --git a/src/Makefile.am b/src/Makefile.am index 957e652f..7107916c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -14,7 +14,7 @@ dillo_fltk_LDADD = \ ../../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 \ |