diff options
| author | James Peach <jpeach@samba.org> | 2007-01-12 03:05:31 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:40:24 -0500 |
| commit | 34fe5027d04e8ad1fa379ee1413b6e331b585d24 (patch) | |
| tree | 1a5ccf22de8041f2a9ab66bdb53bf2f58acfc6d6 /source4 | |
| parent | 5f450fbd9a81db0e9e103ebcb3fdece31edb104f (diff) | |
| download | samba-34fe5027d04e8ad1fa379ee1413b6e331b585d24.tar.gz samba-34fe5027d04e8ad1fa379ee1413b6e331b585d24.tar.bz2 samba-34fe5027d04e8ad1fa379ee1413b6e331b585d24.zip | |
r20697: A couple of minot cross-compile fixes.
(This used to be commit d4c7dd19f3a114ee1527cbcd3071b4921600977d)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/build/m4/check_cc.m4 | 3 | ||||
| -rw-r--r-- | source4/lib/charset/config.m4 | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/source4/build/m4/check_cc.m4 b/source4/build/m4/check_cc.m4 index f1b4f82cec..324ddb3c03 100644 --- a/source4/build/m4/check_cc.m4 +++ b/source4/build/m4/check_cc.m4 @@ -72,7 +72,8 @@ if test -n "$VISIBILITY_CFLAGS"; then 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" diff --git a/source4/lib/charset/config.m4 b/source4/lib/charset/config.m4 index fb845aa67c..453de9fe26 100644 --- a/source4/lib/charset/config.m4 +++ b/source4/lib/charset/config.m4 @@ -10,7 +10,10 @@ int main() 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) |