From: Peter Verthez Date: Sat, 21 Dec 2002 19:07:28 +0000 (+0000) Subject: Moved some parts to the corresponding file in utf8. X-Git-Url: https://git.dlugolecki.net.pl/?a=commitdiff_plain;h=69e235e257fff68122d0fc974e8f7366a4f02d08;p=gedcom-parse.git Moved some parts to the corresponding file in utf8. --- diff --git a/acinclude.m4 b/acinclude.m4 index 8328aab..502ee42 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1,56 +1,6 @@ dnl $Id$ dnl $Name$ -dnl From codeset.m4 (in libcharset): -#serial 2 - -dnl From Bruno Haible. - -AC_DEFUN(jm_LANGINFO_CODESET, -[ - AC_CHECK_HEADERS(langinfo.h) - AC_CHECK_FUNCS(nl_langinfo) - - AC_CACHE_CHECK([for nl_langinfo and CODESET], jm_cv_langinfo_codeset, - [AC_TRY_LINK([#include ], - [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 and nl_langinfo(CODESET).]) - fi -]) - -dnl From glibc21.m4 (in libcharset): -#serial 2 - -# Test for the GNU C Library, version 2.1 or newer. -# From Bruno Haible. - -AC_DEFUN(jm_GLIBC21, - [ - AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer, - ac_cv_gnu_library_2_1, - [AC_EGREP_CPP([Lucky GNU user], - [ -#include -#ifdef __GNU_LIBRARY__ - #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2) - Lucky GNU user - #endif -#endif - ], - ac_cv_gnu_library_2_1=yes, - ac_cv_gnu_library_2_1=no) - ] - ) - AC_SUBST(GLIBC21) - GLIBC21="$ac_cv_gnu_library_2_1" - ] -) - dnl Own functions dnl gedcom_GLIBC_ICONV() dnl Checks whether iconv is coming from glibc, defines USE_GLIBC_ICONV if so diff --git a/configure.in b/configure.in index fa93c2c..24f7f2f 100644 --- a/configure.in +++ b/configure.in @@ -26,6 +26,7 @@ AC_SUBST(SHELL) dnl ============================================================= AM_INIT_AUTOMAKE(${NAME},${VERSION}) AM_CONFIG_HEADER(config.h) +AC_CONFIG_SUBDIRS(utf8) ALL_LINGUAS="nl" AC_CANONICAL_HOST @@ -80,8 +81,6 @@ dnl ========================================================== dnl Checks for library functions. AC_CHECK_HEADERS(stddef.h stdlib.h string.h) AC_CHECK_FUNCS(setlocale vsnprintf vsprintf) -jm_LANGINFO_CODESET -jm_GLIBC21 dnl ========================================================== dnl My local stuff @@ -105,12 +104,6 @@ if test "$am_cv_lib_iconv" = yes; then gedcom_LIBICONV_HAS_ANSEL else AC_MSG_RESULT(libc) - LCS_SUBDIRS=libcharset - LCS_INCLUDES='-I $(srcdir)/libcharset' - LCS_LIBADD=libcharset/libcharset.la - AC_SUBST(LCS_SUBDIRS) - AC_SUBST(LCS_INCLUDES) - AC_SUBST(LCS_LIBADD) gedcom_GLIBC22_ICONV if test "$is_glibc22_iconv" = yes; then DIRS="glibc" @@ -137,8 +130,6 @@ AC_OUTPUT(GNUmakefile iconv/Makefile iconv/glibc/Makefile iconv/libiconv/Makefile - utf8/Makefile - utf8/libcharset/Makefile t/Makefile t/src/Makefile t/input/Makefile