X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=acinclude.m4;h=9edd0bc0c64d6aee839be778826be6e03964ab52;hb=8b767bf5e44f07a29ed3ef77af27bf29f2db729a;hp=b4db27f1bed75cb433d15b85fb232b28d2593daf;hpb=87504de0b146be24a42c4d0974af1ece9e286a1b;p=gedcom-parse.git

diff --git a/acinclude.m4 b/acinclude.m4
index b4db27f..9edd0bc 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -52,29 +52,31 @@ AC_DEFUN(jm_GLIBC21,
 )
 
 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 <iconv.h>
 #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_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"