summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjcid <devnull@localhost>2008-10-22 23:00:29 +0200
committerjcid <devnull@localhost>2008-10-22 23:00:29 +0200
commit7e3d854da3c3ed7b7a7d51d35d587e8a630ba07c (patch)
tree9122269ad0c2bf73db33de657f9e7081e30e3fcd
parentffdf7684226e067aa9fbd3f94e5fba4408bfd3fe (diff)
? Trying a new iconv() test in configure.in.
-rw-r--r--ChangeLog1
-rw-r--r--configure.in2
2 files changed, 3 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index cdbb2284..614f67e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,7 @@ dillo-2.1
+- Added ipv6 addresses iteration and ipv4 fallback.
Patch: James Turner, Jorge Arellano
+- Set the File menu label to hide when the File menu button is shown.
+ ? Trying a new iconv() test in configure.in.
Patch: Jorge Arellano
dw
diff --git a/configure.in b/configure.in
index 58ee8724..8e383ba5 100644
--- a/configure.in
+++ b/configure.in
@@ -334,6 +334,7 @@ if test "x$iconv_ok" = "xyes"; then
LIBS="$old_libs $LIBICONV_LIBS"
old_cflags="$CFLAGS"
CFLAGS="$CFLAGS -Werror"
+ AC_LANG_PUSH([C++])
AC_TRY_COMPILE([#include <iconv.h>],
[
const char *inPtr;
@@ -343,6 +344,7 @@ if test "x$iconv_ok" = "xyes"; then
iconv(encoder, &inPtr, &inLeft, &outPtr, &outRoom);
],
iconv_old=yes,iconv_old=no)
+ AC_LANG_POP([C++])
LIBS="$old_libs"
CFLAGS="$old_cflags"