diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-10-26 13:05:29 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:45:15 -0500 |
| commit | 78696ddcb237012ad1468440362ca67baab125f6 (patch) | |
| tree | b9846b37b2529c7683b7343b181e9907f7c14812 /source4/build/m4 | |
| parent | 0511b5df160c1276b59db8f57a27e289800d1915 (diff) | |
| download | samba-78696ddcb237012ad1468440362ca67baab125f6.tar.gz samba-78696ddcb237012ad1468440362ca67baab125f6.tar.bz2 samba-78696ddcb237012ad1468440362ca67baab125f6.zip | |
r11299: Try to fix build on Stratos VOS (doesn't support ld -r)
(This used to be commit 65c71bf354612a589049753d854e154482957573)
Diffstat (limited to 'source4/build/m4')
| -rw-r--r-- | source4/build/m4/rewrite.m4 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source4/build/m4/rewrite.m4 b/source4/build/m4/rewrite.m4 index bd643faa53..35eda9a3a7 100644 --- a/source4/build/m4/rewrite.m4 +++ b/source4/build/m4/rewrite.m4 @@ -102,8 +102,11 @@ AC_CHECK_FUNCS(strftime sigprocmask sigblock sigaction) AC_CHECK_FUNCS(setgroups sysconf getpwanam srandom random srand rand usleep) AC_CHECK_FUNCS(backtrace setbuffer) +AC_SUBST(BLDSHARED) +AC_SUBST(BLDMERGED) # Assume non-shared by default and override below BLDSHARED="false" +BLDMERGED="true" # these are the defaults, good for lots of systems HOST_OS="$host_os" @@ -257,6 +260,7 @@ case "$host_os" in ;; *vos*) AC_DEFINE(STAT_ST_BLOCKSIZE,4096) BLDSHARED="false" + BLDMERGED="false" LDSHFLAGS="" ;; *) |