diff configure.ac @ 2559:b474ecb5bde4 trunk

[svn] revise str_to_utf8(): - new utf8 validator using libguess DFA has been implemented. str_to_utf8() tries utf8 validation first. - default conversion from ISO-8859-1 is enabled regardless of chardet. - libguess and librcd is always compiled in. - some libguess cleanups.

--- a/configure.ac	Wed Feb 21 03:52:52 2007 -0800
+++ b/configure.ac	Wed Feb 21 04:25:12 2007 -0800
@@ -188,6 +188,11 @@
 		;;
 esac
 
+dnl libguess always compiled in
+dnl ========================
+SUBDIR_GUESS="libguess librcd"
+CHARDET_LIBS="../libguess/libguess.a ../librcd/librcd.a"
+
 dnl chardet support
 dnl ========================
 AC_ARG_ENABLE(chardet,
@@ -195,8 +200,6 @@
 			enable_chardet=$enableval, enable_chardet=no)
 if test "x$enable_chardet" = xyes; then
     AC_DEFINE(USE_CHARDET, 1, [Define if character set detection enabled] )
-    AC_CHECK_LIB(guess, guess_jp, [SUBDIR_GUESS=[''] CHARDET_LIBS=['-lguess']], [SUBDIR_GUESS=['libguess'] CHARDET_LIBS=['../libguess/libguess.a']])
-    AC_CHECK_LIB(rcd, rcdGetRussianCharset, [CHARDET_LIBS=["$CHARDET_LIBS -lrcd"]], [SUBDIR_GUESS=["$SUBDIR_GUESS librcd"] CHARDET_LIBS=["$CHARDET_LIBS ../librcd/librcd.a"]])    
     AC_CHECK_LIB(udet_c, detectCharset, [AC_DEFINE(HAVE_UDET, 1,[Define if the system has Mozilla universal character detector library]) CHARDET_LIBS=["$CHARDET_LIBS -ludet -ludet_c"]])
 fi
 AM_CONDITIONAL(USE_CHARDET,test "x$enable_chardet" = xyes)