Mercurial > hg > octave-lojdl > gnulib-hg
changeset 2327:d5b3a26f091c
*** empty log message ***
| author | Jim Meyering <jim@meyering.net> |
|---|---|
| date | Sat, 04 Mar 2000 12:19:57 +0000 |
| parents | e051ac7f1820 |
| children | 1322e582fd21 |
| files | m4/ChangeLog m4/codeset.m4 m4/iconv.m4 |
| diffstat | 3 files changed, 62 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,9 @@ +2000-02-02 Bruno Haible <haible@clisp.cons.org> + + * codeset.m4: New file. + * iconv.m4: New file. + * jm-macros.m4 (jm_MACROS): Call jm_LANGINFO_CODESET and jm_ICONV. + 2000-03-04 Jim Meyering <meyering@lucent.com> * jm-macros.m4 (jm_CHECK_ALL_TYPES): Require AC_C_VOLATILE,
new file mode 100644 --- /dev/null +++ b/m4/codeset.m4 @@ -0,0 +1,17 @@ +#serial 1 + +dnl From Bruno Haible. + +AC_DEFUN(jm_LANGINFO_CODESET, +[ + AC_CACHE_CHECK([for nl_langinfo and CODESET], jm_cv_langinfo_codeset, + [AC_TRY_LINK([#include <langinfo.h>], + [char* cs = nl_langinfo(CODESET);], + jm_cv_langinfo_codeset=yes, + jm_cv_langinfo_codeset=no) + ]) + if test $jm_cv_langinfo_codeset = yes; then + AC_DEFINE(HAVE_LANGINFO_CODESET, 1, + [Define if you have <langinfo.h> and nl_langinfo(CODESET).]) + fi +])
new file mode 100644 --- /dev/null +++ b/m4/iconv.m4 @@ -0,0 +1,39 @@ +#serial 1 + +dnl From Bruno Haible. + +AC_DEFUN(jm_ICONV, +[ + dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and + dnl those with the standalone portable libiconv installed). + AC_CACHE_CHECK(for iconv, jm_cv_func_iconv, [ + jm_cv_func_iconv="no, consider installing libiconv" + jm_cv_lib_iconv=no + AC_TRY_LINK([#include <stdlib.h> +#include <iconv.h>], + [iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd);], + jm_cv_func_iconv=yes) + if test "$jm_cv_func_iconv" != yes; then + jm_save_LIBS="$LIBS" + LIBS="$LIBS -liconv" + AC_TRY_LINK([#include <stdlib.h> +#include <iconv.h>], + [iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd);], + jm_cv_lib_iconv=yes + jm_cv_func_iconv=yes) + LIBS="$jm_save_LIBS" + fi + ]) + if test "$jm_cv_func_iconv" = yes; then + AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.]) + fi + LIBICONV= + if test "$jm_cv_lib_iconv" = yes; then + LIBICONV="-liconv" + fi + AC_SUBST(LIBICONV) +])