fi
])
+AC_DEFUN(rjs_CHARSET
+[
+ dnl Find out if we can convert from $1 to UCS2-LE
+ AC_MSG_CHECKING(we can convert from $1 to UCS2-LE)
+ AC_TRY_RUN([
+#include <$jm_cv_include>
+main(){
+ iconv_t cd = iconv_open("$1", "UCS-2LE");
+ if (cd == 0 || cd == (iconv_t)-1) {
+ return -1;
+ }
+ return 0;
+}
+ ],ICONV_CHARSET=$1,ICONV_CHARSET="",])
+ if test x"$ICONV_CHARSET" != x; then
+ AC_MSG_RESULT($ICONV_CHARSET)
+ fi
+])
+
dnl CFLAGS_ADD_DIR(CFLAGS, $INCDIR)
dnl This function doesn't add -I/usr/include into CFLAGS
AC_DEFUN(CFLAGS_ADD_DIR,[
dnl Try to find iconv(3)
jm_ICONV($i)
- CPPFLAGS=$save_CPPFLAGS
if test "$ICONV_FOUND" = yes; then
- LDFLAGS=$save_LDFLAGS
LIB_ADD_DIR(LDFLAGS, "$i/lib")
CFLAGS_ADD_DIR(CPPFLAGS, "$i/include")
LIBS="$save_LIBS $LIBS"
#include <$jm_cv_include>
main(){
iconv_t cd = iconv_open("ASCII", "UCS-2LE");
- if (cd == 0 || cd == (iconv_t)-1) return -1;
+ if (cd == 0 || cd == (iconv_t)-1) {
+ cd = iconv_open("ISO-8859-1", "UCS-2LE");
+ if (cd == 0 || cd == (iconv_t)-1) {
+ cd = iconv_open("IBM850", "UCS-2LE"); /* Solaris has this */
+ if (cd == 0 || cd == (iconv_t)-1) {
+ return -1;
+ }
+ }
+ }
return 0;
}
],
fi
dnl We didn't find a working iconv, so keep going
fi
+dnl We only need to clean these up here for the next pass through the loop
+ CPPFLAGS=$save_CPPFLAGS
LDFLAGS=$save_LDFLAGS
LIBS=$save_LIBS
export LDFLAGS LIBS CPPFLAGS