diff bootstrap.conf @ 23123:c6ca5fe1505c

use wrappers for uniconv functions; style fixes for unicode conv fcns * boostrap.conf (gnulib_modules): Include localcharset, uniconv/u8-conv-from-enc, and uniconv/u8-conv-to-enc in the list. Remove libunistring from the list. * liboctave/wrappers/localcharset-wrapper.c, liboctave/wrappers/localcharset-wrapper.h, liboctave/wrappers/uniconv-wrappers.c, liboctave/wrappers/uniconv-wrappers.h: New files. * liboctave/wrappers/module.mk: Update. * strfns.cc: Include uniconv-wrappers.h, not uniconv. Assume uniconv functions are available (provided by gnulib). (F__native2unicode__, F__unicode2native__): Use wrapper functions. Simplify. (F__unicode2native__): Return uint8 array. * native2unicode.m, unicode2native.m: Style fixes. Update tests. Use assert directly, not testif. Use error <> ..., not fail.
author John W. Eaton <jwe@octave.org>
date Tue, 31 Jan 2017 13:51:42 -0500
parents e310b5b6da6f
children 21b2816820cf
line wrap: on
line diff
--- a/bootstrap.conf	Sun Jan 22 13:58:57 2017 +0100
+++ b/bootstrap.conf	Tue Jan 31 13:51:42 2017 -0500
@@ -19,7 +19,6 @@
 # along with Octave; see the file COPYING.  If not, see
 # <http://www.gnu.org/licenses/>.
 
-
 # gnulib modules used by this package.
 gnulib_modules="
   areadlink
@@ -52,8 +51,8 @@
   glob
   isatty
   largefile
-  libunistring
   link
+  localcharset
   lstat
   malloc-gnu
   mkdir
@@ -90,6 +89,8 @@
   tempname
   tmpfile
   uname
+  uniconv/u8-conv-from-enc
+  uniconv/u8-conv-to-enc
   unistd
   unlink
   unsetenv