|
From: Ian P. <piu...@us...> - 2004-04-02 01:12:01
|
Update of /cvsroot/squeak/squeak/platforms/unix/vm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22817 Modified Files: acinclude.m4 Log Message: Better validation of iconv headers. Use built-in iconv on OSX 10.3. Provide '-disable-iconv' configuration option. Index: acinclude.m4 =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/unix/vm/acinclude.m4,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** acinclude.m4 7 Aug 2003 07:37:27 -0000 1.4 --- acinclude.m4 2 Apr 2004 00:59:58 -0000 1.5 *************** *** 23,32 **** ]) ! AC_CHECK_HEADERS(iconv.h) ! AC_ICONV ! AC_LANGINFO_CODESET ! case $host_os in ! darwin*) LIBS="$LIBS -framework CoreFoundation";; ! *) ;; ! esac --- 23,41 ---- ]) ! AC_ARG_ENABLE(iconv, ! [ --disable-iconv disable iconv support [default=enabled]], ! [with_iconv="$withval"], ! [with_iconv="yes"]) ! ! if test "$with_iconv" = "yes"; then ! AC_CHECK_HEADERS(iconv.h) ! AC_ICONV ! AC_LANGINFO_CODESET ! case $host_os in ! darwin*) LIBS="$LIBS -framework CoreFoundation";; ! *) ;; ! esac ! else ! AC_MSG_RESULT([******** disabling iconv]) ! fi |