summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2009-07-01 11:06:34 +0200
committerMichael Adam <obnox@samba.org>2009-11-13 16:19:37 +0100
commit48fa8e4463b61a757eb108adeab58bba15bf6d02 (patch)
tree11f203399973cef43565aeaf2bc15a5bfd13bc5d
parenta72714e67bdd6bae8e306b64c50a1c0a3452bacb (diff)
downloadsamba-48fa8e4463b61a757eb108adeab58bba15bf6d02.tar.gz
samba-48fa8e4463b61a757eb108adeab58bba15bf6d02.tar.bz2
samba-48fa8e4463b61a757eb108adeab58bba15bf6d02.zip
packaging(RHEL-CTDB): disable the merged build.
Michael
-rwxr-xr-xpackaging/RHEL-CTDB/configure.rpm1
-rw-r--r--packaging/RHEL-CTDB/samba.spec.tmpl6
2 files changed, 5 insertions, 2 deletions
diff --git a/packaging/RHEL-CTDB/configure.rpm b/packaging/RHEL-CTDB/configure.rpm
index b9a1ee12c2..84e73461a6 100755
--- a/packaging/RHEL-CTDB/configure.rpm
+++ b/packaging/RHEL-CTDB/configure.rpm
@@ -58,6 +58,7 @@ CC="$CC" CFLAGS="-Wall -g -D_GNU_SOURCE" ./configure -C \
--without-ldb \
--without-dnsupdate \
--with-aio-support \
+ --disable-merged-build
$*
make showlayout
diff --git a/packaging/RHEL-CTDB/samba.spec.tmpl b/packaging/RHEL-CTDB/samba.spec.tmpl
index a9bac92161..0df0bc1bde 100644
--- a/packaging/RHEL-CTDB/samba.spec.tmpl
+++ b/packaging/RHEL-CTDB/samba.spec.tmpl
@@ -185,7 +185,8 @@ CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -m32" ./configure \
--with-ctdb=/usr/include \
--without-ldb \
--without-dnsupdate \
- --with-aio-support
+ --with-aio-support \
+ --disable-merged-build
make showlayout
@@ -249,7 +250,8 @@ CFLAGS="$RPM_OPT_FLAGS $EXTRA -D_GNU_SOURCE" ./configure \
--with-ctdb=/usr/include \
--without-ldb \
--without-dnsupdate \
- --with-aio-support
+ --with-aio-support\
+ --disable-merged-build
make showlayout