aboutsummaryrefslogtreecommitdiff
path: root/libcpp/configure.ac
diff options
context:
space:
mode:
Diffstat (limited to 'libcpp/configure.ac')
-rw-r--r--libcpp/configure.ac8
1 files changed, 7 insertions, 1 deletions
diff --git a/libcpp/configure.ac b/libcpp/configure.ac
index ce8cae6..170932c 100644
--- a/libcpp/configure.ac
+++ b/libcpp/configure.ac
@@ -102,7 +102,13 @@ if test $ac_cv_type_uchar = yes; then
[Define if <sys/types.h> defines \`uchar'.])
fi
-AM_ICONV
+# g++ on Solaris 10+ defines _XOPEN_SOURCE=600, which exposes a different
+# iconv() prototype.
+AS_IF([test "$ENABLE_BUILD_WITH_CXX" = "yes"],
+ [AC_LANG_PUSH([C++])
+ AM_ICONV
+ AC_LANG_POP([C++])],
+ [AM_ICONV])
# More defines and substitutions.
PACKAGE="$PACKAGE_TARNAME"