diff options
| author | Philipp Zabel <philipp.zabel@gmail.com> | 2007-11-16 12:43:19 +0000 |
|---|---|---|
| committer | Philipp Zabel <philipp.zabel@gmail.com> | 2007-11-16 12:43:19 +0000 |
| commit | a3f2e6a254ac55a0de04805924679480da480078 (patch) | |
| tree | af7f8bbca48fb92fce2f1477000252dcfd0352d1 /packages/tinymail/libtinymail-0.0.1/no-iconv-detect.patch | |
| parent | e9c66498ae5b15b985de0e24f8de88f703bd20d5 (diff) | |
libtinymail: add 0.0.5, shuffle around no-iconv-detect.patch
Diffstat (limited to 'packages/tinymail/libtinymail-0.0.1/no-iconv-detect.patch')
| -rw-r--r-- | packages/tinymail/libtinymail-0.0.1/no-iconv-detect.patch | 78 |
1 files changed, 78 insertions, 0 deletions
diff --git a/packages/tinymail/libtinymail-0.0.1/no-iconv-detect.patch b/packages/tinymail/libtinymail-0.0.1/no-iconv-detect.patch new file mode 100644 index 0000000000..558cbb2f93 --- /dev/null +++ b/packages/tinymail/libtinymail-0.0.1/no-iconv-detect.patch @@ -0,0 +1,78 @@ +--- /tmp/ticonv.m4 2006-11-19 12:01:18.000000000 +0100 ++++ trunk/m4/ticonv.m4 2006-11-19 12:14:50.378554000 +0100 +@@ -14,12 +14,7 @@ + save_LIBS="$LIBS" + CFLAGS="$CFLAGS $ICONV_CFLAGS" + LIBS="$LIBS $ICONV_LIBS -liconv" +-AC_CACHE_CHECK(for iconv in -liconv, ac_cv_libiconv, AC_LINK_IFELSE([AC_LANG_PROGRAM([[ +-#include <iconv.h> +-]], [[ +- iconv_t cd; +- cd = iconv_open ("UTF-8", "ISO-8859-1"); +-]])],[ac_cv_libiconv=yes],[ac_cv_libiconv=no])) ++ + if test $ac_cv_libiconv = yes; then + ICONV_LIBS="$ICONV_LIBS -liconv" + have_iconv=yes +@@ -33,39 +28,6 @@ + if test $ac_cv_libiconv = no; then + AC_CHECK_FUNCS(gnu_get_libc_version) + fi +- AC_CACHE_CHECK([if iconv() handles UTF-8], ac_cv_libiconv_utf8, AC_RUN_IFELSE([AC_LANG_SOURCE([[ +-#include <iconv.h> +-#include <stdlib.h> +-#include <string.h> +-#ifdef HAVE_GNU_GET_LIBC_VERSION +-#include <gnu/libc-version.h> +-#endif +- +-int main (int argc, char **argv) +-{ +- const char *from = "Some Text \xA4"; +- const char *utf8 = "Some Text \xC2\xA4"; +- char *transbuf = malloc (20), *trans = transbuf; +- iconv_t cd; +- size_t from_len = strlen (from), utf8_len = 20; +- size_t utf8_real_len = strlen (utf8); +- +-#ifdef HAVE_GNU_GET_LIBC_VERSION +- /* glibc 2.1.2's iconv is broken in hard to test ways. */ +- if (!strcmp (gnu_get_libc_version (), "2.1.2")) +- exit (1); +-#endif +- +- cd = iconv_open ("UTF-8", "ISO-8859-1"); +- if (cd == (iconv_t) -1) +- exit (1); +- if (iconv (cd, &from, &from_len, &trans, &utf8_len) == -1 || from_len != 0) +- exit (1); +- if (memcmp (utf8, transbuf, utf8_real_len) != 0) +- exit (1); +- +- exit (0); +-}]])],[ac_cv_libiconv_utf8=yes],[ac_cv_libiconv_utf8=no; have_iconv=no],[ac_cv_libiconv_utf8=no; have_iconv=no])) + fi + + if test "$have_iconv" = no; then +@@ -73,20 +35,5 @@ + fi + AC_SUBST(ICONV_CFLAGS) + AC_SUBST(ICONV_LIBS) +- +-CFLAGS="$CFLAGS -I$srcdir" +- +-AC_MSG_CHECKING(preferred charset formats for system iconv) +-AC_RUN_IFELSE([AC_LANG_SOURCE([[ +-#define CONFIGURE_IN +-#include "iconv-detect.c" +-]])],[ +- AC_MSG_RESULT(found) +-],[ +- AC_MSG_RESULT(not found) +-],[]) +- +-CFLAGS="$save_CFLAGS" +-LIBS="$save_LIBS" +- + ]) ++ |