summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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