git.samba.org / kai / samba.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7626b5d)
packaging: Remove long-gone --disable-merged-build from RHEL-CTDB packaging
authorAndrew Bartlett <abartlet@samba.org>
Wed, 21 Nov 2012 08:52:50 +0000 (19:52 +1100)
committerAndreas Schneider <asn@samba.org>
Thu, 22 Nov 2012 09:21:17 +0000 (10:21 +0100)
Reviewed-by: Andreas Schneider <asn@samba.org>
packaging/RHEL-CTDB/configure.rpm patch | blob | history
packaging/RHEL-CTDB/samba.spec.tmpl patch | blob | history

diff --git a/packaging/RHEL-CTDB/configure.rpm b/packaging/RHEL-CTDB/configure.rpm
index d6d7c5bdae0e33fbe3ac30a3a9fac1729a874146..f16b3522ac549c324525aae19d5f165b66a38ec2 100755 (executable)
--- 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 978f1a6a30d4465afd3cc0a6de27590f9d0b5436..e79674f46749b2d1ba27be599f4176bf9cc54582 100644 (file)
--- 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
 
Kai's WIP code