summaryrefslogtreecommitdiff
path: root/source4/build/m4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-04-27 21:46:44 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:05:07 -0500
commitb00c2369069c41880598ff430776cc26e8f7b916 (patch)
treefe483e7721681d6f5ffc0271a15366a615e260c9 /source4/build/m4
parentab8fd44603c6ac140e6d0c29fd6a1a1065f616a3 (diff)
downloadsamba-b00c2369069c41880598ff430776cc26e8f7b916.tar.gz
samba-b00c2369069c41880598ff430776cc26e8f7b916.tar.bz2
samba-b00c2369069c41880598ff430776cc26e8f7b916.zip
r15301: Use static libraries internally. This required a few hacks in the build
system - these should be removed later on. (This used to be commit 06547391669e064d2b92f5841b7df5f101a34cb9)
Diffstat (limited to 'source4/build/m4')
-rw-r--r--source4/build/m4/rewrite.m44
1 files changed, 0 insertions, 4 deletions
diff --git a/source4/build/m4/rewrite.m4 b/source4/build/m4/rewrite.m4
index 545e933940..2002bae353 100644
--- a/source4/build/m4/rewrite.m4
+++ b/source4/build/m4/rewrite.m4
@@ -99,10 +99,8 @@ 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"
@@ -245,13 +243,11 @@ case "$host_os" in
AC_DEFINE(STAT_ST_BLOCKSIZE,512)
;;
*-vms)
- BLDMERGED="false"
BLDSHARED="false"
LDSHFLAGS=""
;;
*vos*) AC_DEFINE(STAT_ST_BLOCKSIZE,4096)
BLDSHARED="false"
- BLDMERGED="false"
LDSHFLAGS=""
;;
*)