X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=acinclude.m4;h=502ee42b7c6dffc376a086b409fdedd41e4bfb0d;hb=d8d5e051c5e0917e639a9320e9a4a01d6f0e83b3;hp=a4799c9c1efe63c97ea55ef4e02de858f0500a84;hpb=c034f8250dc36051ab609bfcb1a149326c5ffe24;p=gedcom-parse.git diff --git a/acinclude.m4 b/acinclude.m4 index a4799c9..502ee42 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1,111 +1,127 @@ -dnl From iconv.m4: -#serial AM2 - -dnl From Bruno Haible. - -AC_DEFUN([AM_ICONV], -[ - dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and - dnl those with the standalone portable GNU libiconv installed). - - AC_ARG_WITH([libiconv-prefix], -[ --with-libiconv-prefix=DIR search for libiconv in DIR/include and DIR/lib], [ - for dir in `echo "$withval" | tr : ' '`; do - if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi - if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi - done - ]) - - AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [ - am_cv_func_iconv="no, consider installing GNU libiconv" - am_cv_lib_iconv=no - AC_TRY_LINK([#include -#include ], - [iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd);], - am_cv_func_iconv=yes) - if test "$am_cv_func_iconv" != yes; then - am_save_LIBS="$LIBS" - LIBS="$LIBS -liconv" - AC_TRY_LINK([#include -#include ], - [iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd);], - am_cv_lib_iconv=yes - am_cv_func_iconv=yes) - LIBS="$am_save_LIBS" - fi - ]) - if test "$am_cv_func_iconv" = yes; then - AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.]) - AC_MSG_CHECKING([for iconv declaration]) - AC_CACHE_VAL(am_cv_proto_iconv, [ - AC_TRY_COMPILE([ -#include -#include -extern -#ifdef __cplusplus -"C" -#endif -#if defined(__STDC__) || defined(__cplusplus) -size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); -#else -size_t iconv(); -#endif -], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const") - am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"]) - am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` - AC_MSG_RESULT([$]{ac_t:- - }[$]am_cv_proto_iconv) - AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1, - [Define as const if the declaration of iconv() needs const.]) - fi - LIBICONV= - if test "$am_cv_lib_iconv" = yes; then - LIBICONV="-liconv" - fi - AC_SUBST(LIBICONV) -]) +dnl $Id$ +dnl $Name$ dnl Own functions -dnl AC_GLIBC_ICONV() +dnl gedcom_GLIBC_ICONV() dnl Checks whether iconv is coming from glibc, defines USE_GLIBC_ICONV if so dnl The variable $is_glibc_iconv contains yes or no -AC_DEFUN(AC_GLIBC_ICONV, [ - AC_CACHE_CHECK(for the GNU C Library iconv implementation, is_glibc_iconv, [ +AC_DEFUN(gedcom_GLIBC22_ICONV, [ + AC_CACHE_CHECK(for the GNU C Library 2.2 iconv implementation, is_glibc22_iconv, [ AC_EGREP_CPP(yes, [ #include #ifdef __GLIBC__ + #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || (__GLIBC__ > 2) yes + #endif #endif - ], is_glibc_iconv=yes, is_glibc_iconv=no) + ], is_glibc22_iconv=yes, is_glibc22_iconv=no) ]) - if test "$is_glibc_iconv" = yes; then + if test "$is_glibc22_iconv" = yes; then AC_DEFINE(USE_GLIBC_ICONV,1, [Define if the GNU implementation of iconv in glibc is used]) fi ]) -dnl AC_LIBICONV_HAS_ANSEL() +dnl gedcom_ICONV_HAS_CONV() +dnl Checks whether iconv has support to convert $1 to $2 +dnl The variable $iconv_has_conv contains yes or no afterwards +dnl (overwritten on subsequent calls) +AC_DEFUN(gedcom_ICONV_HAS_CONV, [ + my_save_LIBS="$LIBS" + LIBS="$LIBS $LIBICONV" + AC_TRY_RUN([ +#include +int main() { + iconv_t cd = iconv_open("$2","$1"); + return (cd == (iconv_t)-1); +} + ], + iconv_has_conv=yes, + iconv_has_conv=no, + iconv_has_conv=no) + LIBS="$my_save_LIBS" + ]) +]) + +dnl gedcom_SANE_ICONV() +dnl Checks whether the iconv implementation has the basic functionality +dnl that we need +dnl The variable $is_iconv_sane contains yes or no +AC_DEFUN(gedcom_SANE_ICONV, [ + AC_CACHE_CHECK(whether iconv has the needed functionality, is_iconv_sane, [ + is_iconv_sane=yes + gedcom_ICONV_HAS_CONV(ASCII, UTF-8) + if test "$iconv_has_conv" = "no"; then + is_iconv_sane=no + else + gedcom_ICONV_HAS_CONV(UCS-2LE, UTF-8) + if test "$iconv_has_conv" = "no"; then + is_iconv_sane=no + else + gedcom_ICONV_HAS_CONV(UCS-2BE, UTF-8) + if test "$iconv_has_conv" = "no"; then + is_iconv_sane=no + fi + fi + fi + ]) +]) + +dnl gedcom_LIBICONV_HAS_ANSEL() dnl Checks whether libiconv has ANSEL support dnl The variable $is_ansel_supported contains yes or no -AC_DEFUN(AC_LIBICONV_HAS_ANSEL, [ +AC_DEFUN(gedcom_LIBICONV_HAS_ANSEL, [ AC_CACHE_CHECK(for ANSEL support in libiconv, is_ansel_supported, [ - my_save_LIBS="$LIBS" - LIBS="$LIBS $LIBICONV" + is_ansel_supported=no + gedcom_ICONV_HAS_CONV(ANSEL, UTF-8) + if test "$iconv_has_conv" = yes; then + is_ansel_supported=yes + fi + ]) +]) + +dnl gedcom_SYS_NEWLINE() +dnl Checks how newline is written on the system +dnl SYS_NEWLINE is set to one of the following: +dnl END_CR, END_LF, END_CR_LF, END_LF_CR +AC_DEFUN(gedcom_SYS_NEWLINE, [ + AC_CACHE_CHECK(how to represent newline, ac_cv_system_newline, [ + echo > newlinetest AC_TRY_RUN([ -#include +#include +#include +#include +#include int main() { - iconv_t cd = iconv_open("UTF-8","ANSEL"); - return (cd == (iconv_t)-1); + char buffer[11]; + int i, fd; + FILE* f; + for (i=0; i<10; i++) { buffer[i] = '\0'; } + fd = open("newlinetest", O_RDONLY); + if (fd == -1) return 1; + read(fd, buffer, 10); + close(fd); + f = fopen("newlinetest", "w"); + if (!f) return 1; + i = 0; + while (buffer[i] != '\0') { fprintf(f, "%02x", buffer[i++]); } + fclose(f); + return 0; } ], - is_ansel_supported=yes, - is_ansel_supported=no, - is_ansel_supported=no) - LIBS="$my_save_LIBS" + [system_newline_output=`cat newlinetest` + case "$system_newline_output" in + 0a0d) ac_cv_system_newline="\"\x0A\x0D\"" ;; + 0d0a) ac_cv_system_newline="\"\x0D\x0A\"" ;; + 0a) ac_cv_system_newline="\"\x0A\"" ;; + 0d) ac_cv_system_newline="\"\x0D\"" ;; + *) ac_cv_system_newline="\"\x0A\"" ;; + esac], + ac_cv_system_newline="\"\x0A\"", + ac_cv_system_newline="\"\x0A\"") + rm -f newlinetest ]) + AC_DEFINE_UNQUOTED(SYS_NEWLINE,$ac_cv_system_newline, + [The representation of newline in text files in the system]) ])