dlugolecki.net.pl
Dziennik
Polecane
Software
projects
/
gedcom-parse.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changes in 1.8.2.
[gedcom-parse.git]
/
acinclude.m4
diff --git
a/acinclude.m4
b/acinclude.m4
index b4db27f1bed75cb433d15b85fb232b28d2593daf..9edd0bc0c64d6aee839be778826be6e03964ab52 100644
(file)
--- a/
acinclude.m4
+++ b/
acinclude.m4
@@
-52,29
+52,31
@@
AC_DEFUN(jm_GLIBC21,
)
dnl Own functions
)
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
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__
AC_EGREP_CPP(yes,
[
#include <iconv.h>
#ifdef __GLIBC__
+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || (__GLIBC__ > 2)
yes
yes
+ #endif
#endif
#endif
- ], is_glibc
_iconv=yes, is_glibc
_iconv=no)
+ ], is_glibc
22_iconv=yes, is_glibc22
_iconv=no)
])
])
- if test "$is_glibc_iconv" = yes; then
+ if test "$is_glibc
22
_iconv" = yes; then
AC_DEFINE(USE_GLIBC_ICONV,1,
[Define if the GNU implementation of iconv in glibc is used])
fi
])
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
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"
AC_CACHE_CHECK(for ANSEL support in libiconv, is_ansel_supported, [
my_save_LIBS="$LIBS"
LIBS="$LIBS $LIBICONV"