diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2007-03-27 08:03:28 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2007-03-27 08:03:28 +0800 |
| commit | b835359be0b9d33022dee7c815ebde9194eee2cf (patch) | |
| tree | f34214e866ba094d75a3cbdbe78d33877591404e | |
| parent | be838ae0f3848c380ae7c94b9ceed8024cfe5c3e (diff) | |
| download | gsoc2013-evolution-b835359be0b9d33022dee7c815ebde9194eee2cf.tar gsoc2013-evolution-b835359be0b9d33022dee7c815ebde9194eee2cf.tar.gz gsoc2013-evolution-b835359be0b9d33022dee7c815ebde9194eee2cf.tar.bz2 gsoc2013-evolution-b835359be0b9d33022dee7c815ebde9194eee2cf.tar.lz gsoc2013-evolution-b835359be0b9d33022dee7c815ebde9194eee2cf.tar.xz gsoc2013-evolution-b835359be0b9d33022dee7c815ebde9194eee2cf.tar.zst gsoc2013-evolution-b835359be0b9d33022dee7c815ebde9194eee2cf.zip | |
Use AC_TRY_RUN instead of AC_TRY_LINK when checking for iconv() in -liconv
2007-03-26 Matthew Barnes <mbarnes@redhat.com>
* configure.in: Use AC_TRY_RUN instead of AC_TRY_LINK when checking
for iconv() in -liconv (#388789). Patch from Elijah Newren.
* iconv-detect.c: Fix an implicit function declaration.
svn path=/trunk/; revision=33323
| -rw-r--r-- | configure.in | 9 | ||||
| -rw-r--r-- | iconv-detect.c | 1 |
2 files changed, 7 insertions, 3 deletions
diff --git a/configure.in b/configure.in index 03cc1e6206..85e864a8a6 100644 --- a/configure.in +++ b/configure.in @@ -144,12 +144,15 @@ save_CFLAGS="$CFLAGS" save_LIBS="$LIBS" CFLAGS="$CFLAGS $ICONV_CFLAGS" LIBS="$LIBS $ICONV_LIBS -liconv" -AC_CACHE_CHECK(for iconv in -liconv, ac_cv_libiconv, AC_TRY_LINK([ +AC_CACHE_CHECK(for iconv in -liconv, ac_cv_libiconv, AC_TRY_RUN([ #include <iconv.h> -], [ + +int main (int argc, char **argv) +{ iconv_t cd; cd = iconv_open ("UTF-8", "ISO-8859-1"); -], ac_cv_libiconv=yes, ac_cv_libiconv=no)) +} +], ac_cv_libiconv=yes, ac_cv_libiconv=no, ac_cv_libiconv=no)) if test $ac_cv_libiconv = yes; then ICONV_LIBS="$ICONV_LIBS -liconv" have_iconv=yes diff --git a/iconv-detect.c b/iconv-detect.c index 899d07f239..67dbd8e6bf 100644 --- a/iconv-detect.c +++ b/iconv-detect.c @@ -22,6 +22,7 @@ #include <stdio.h> +#include <stdlib.n> #include <iconv.h> enum { |