diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-11-21 19:52:50 +1100 |
|---|---|---|
| committer | Andreas Schneider <asn@samba.org> | 2012-11-22 10:21:17 +0100 |
| commit | 895cc9a9157d51f768d35f888795e8af7efed781 (patch) | |
| tree | 022e03aa833a5fa6a68e950a3ff63fb06faef323 | |
| parent | 7626b5d9045c2b490b38dee7dd45ba7763740f83 (diff) | |
| download | samba-895cc9a9157d51f768d35f888795e8af7efed781.tar.gz samba-895cc9a9157d51f768d35f888795e8af7efed781.tar.bz2 samba-895cc9a9157d51f768d35f888795e8af7efed781.zip | |
packaging: Remove long-gone --disable-merged-build from RHEL-CTDB packaging
Reviewed-by: Andreas Schneider <asn@samba.org>
| -rwxr-xr-x | packaging/RHEL-CTDB/configure.rpm | 1 | ||||
| -rw-r--r-- | packaging/RHEL-CTDB/samba.spec.tmpl | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/packaging/RHEL-CTDB/configure.rpm b/packaging/RHEL-CTDB/configure.rpm index d6d7c5bdae..f16b3522ac 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 978f1a6a30..e79674f467 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 |