svn commit: samba r20697 - in branches/SAMBA_4_0/source: build/m4 lib/charset

[jpeach at samba.org]

Author: jpeach
Date: 2007-01-12 03:05:31 +0000 (Fri, 12 Jan 2007)
New Revision: 20697

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20697

Log:
A couple of minot cross-compile fixes.

Modified:
   branches/SAMBA_4_0/source/build/m4/check_cc.m4
   branches/SAMBA_4_0/source/lib/charset/config.m4


Changeset:
Modified: branches/SAMBA_4_0/source/build/m4/check_cc.m4
===================================================================
--- branches/SAMBA_4_0/source/build/m4/check_cc.m4	2007-01-12 03:00:47 UTC (rev 20696)
+++ branches/SAMBA_4_0/source/build/m4/check_cc.m4	2007-01-12 03:05:31 UTC (rev 20697)
@@ -72,7 +72,8 @@
 	OLD_CFLAGS="$CFLAGS"
 
 	CFLAGS="$CFLAGS $VISIBILITY_CFLAGS"
-	AC_TRY_RUN([
+	AC_TRY_LINK([],
+	[
 		void vis_foo1(void) {}
 		__attribute__((visibility("default"))) void vis_foo2(void) {}
 		#include "${srcdir-.}/build/tests/trivial.c"

Modified: branches/SAMBA_4_0/source/lib/charset/config.m4
===================================================================
--- branches/SAMBA_4_0/source/lib/charset/config.m4	2007-01-12 03:00:47 UTC (rev 20696)
+++ branches/SAMBA_4_0/source/lib/charset/config.m4	2007-01-12 03:05:31 UTC (rev 20697)
@@ -10,7 +10,10 @@
    if (cd == 0 || cd == (iconv_t)-1) return -1;
    return 0;
 } 
-   ],[AC_MSG_RESULT(yes); $3],[AC_MSG_RESULT(no); $4])
+   ],
+   [AC_MSG_RESULT(yes); $3],
+   [AC_MSG_RESULT(no); $4],
+   [AC_MSG_RESULT(cross); $4])
 ])
 
 dnl SMB_CHECK_ICONV_DIR(dir,action-if-found,action-if-not-found)