From 78696ddcb237012ad1468440362ca67baab125f6 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 26 Oct 2005 13:05:29 +0000
Subject: r11299: Try to fix build on Stratos VOS (doesn't support ld -r) (This
 used to be commit 65c71bf354612a589049753d854e154482957573)

---
 source4/build/m4/rewrite.m4 | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'source4/build/m4')

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=""
 		;;
 	*)
-- 
cgit