From 895cc9a9157d51f768d35f888795e8af7efed781 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 21 Nov 2012 19:52:50 +1100 Subject: [PATCH] packaging: Remove long-gone --disable-merged-build from RHEL-CTDB packaging Reviewed-by: Andreas Schneider --- packaging/RHEL-CTDB/configure.rpm | 1 - packaging/RHEL-CTDB/samba.spec.tmpl | 1 - 2 files changed, 2 deletions(-) diff --git a/packaging/RHEL-CTDB/configure.rpm b/packaging/RHEL-CTDB/configure.rpm index d6d7c5bdae0..f16b3522ac5 100755 --- a/packaging/RHEL-CTDB/configure.rpm +++ b/packaging/RHEL-CTDB/configure.rpm @@ -65,7 +65,6 @@ CC="$CC" CFLAGS="-Wall -g -D_GNU_SOURCE -O3" ./configure -C \ --without-ldb \ --without-dnsupdate \ --with-aio-support \ - --disable-merged-build \ --disable-external-libtalloc \ --disable-external-libtdb \ $* diff --git a/packaging/RHEL-CTDB/samba.spec.tmpl b/packaging/RHEL-CTDB/samba.spec.tmpl index 978f1a6a30d..e79674f4674 100644 --- a/packaging/RHEL-CTDB/samba.spec.tmpl +++ b/packaging/RHEL-CTDB/samba.spec.tmpl @@ -183,7 +183,6 @@ CFLAGS="$RPM_OPT_FLAGS $EXTRA -D_GNU_SOURCE" ./configure \ --without-ldb \ --without-dnsupdate \ --with-aio-support \ - --disable-merged-build \ --disable-external-libtalloc \ --disable-external-libtdb -- 2.34.1