From: Matthew Barnes <mbarnes@redhat.com>
Date: Mon, 26 Mar 2007 22:36:10 +0000 (+0000)
Subject: Use AC_TRY_RUN instead of AC_TRY_LINK when checking for iconv() in -liconv
X-Git-Tag: upstream/3.7.4~5835
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=487907bac75d2b2c982e2f81b323b190b5bb12d7;p=platform%2Fupstream%2Fevolution-data-server.git

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 (#388788).  Patch from Elijah Newren.

	* iconv-detect.c: Fix an implicit function declaration.


svn path=/trunk/; revision=7668
---

diff --git a/ChangeLog b/ChangeLog
index ccdca67..20ecb6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+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 (#388788).  Patch from Elijah Newren.
+
+	* iconv-detect.c: Fix an implicit function declaration.
+
 2007-03-26  Harish Krishnaswamy <harish.krishnaswamy@gmail.com>
 	
 	* MAINTAINERS : Updates on the new guards.
diff --git a/configure.in b/configure.in
index 2ca966c..5d23d15 100644
--- a/configure.in
+++ b/configure.in
@@ -237,12 +237,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 7c1858a..96b4ed1 100644
--- a/iconv-detect.c
+++ b/iconv-detect.c
@@ -21,6 +21,7 @@
  */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <iconv.h>
 
 enum {