s3: leases: libsmbsharemodes no longer works with SMB2 leases inside our locking...

[samba.git] / packaging / RHEL-CTDB / configure.rpm

diff --git a/packaging/RHEL-CTDB/configure.rpm b/packaging/RHEL-CTDB/configure.rpm
index 444d3e2a8c8dea225c1394b0fcb491fa51793975..62a326c1dea1760acf05b4e30c6969b30492948e 100755 (executable)
--- a/packaging/RHEL-CTDB/configure.rpm
+++ b/packaging/RHEL-CTDB/configure.rpm
@@ -2,14 +2,14 @@
 
 case `uname -m` in
        x86_64)
-               _libarch=lib64
+               _libarch="/lib64"
                ;;
        *)
-               _libarch=lib
+               _libarch="/lib"
                ;;
 esac
 
-_libarchdir=/usr/${_libarch}
+_libarchdir=/usr${_libarch}
 
 _prefix=/usr
 _sysconfdir=/etc
@@ -24,17 +24,24 @@ else
        CC="gcc"
 fi
 
+shared_modules="idmap_rid,idmap_ad,idmap_tdb2,idmap_rfc2307"
+
+if test "x$BUILD_GPFS" != "xno"; then
+       shared_modules="${shared_modules},vfs_gpfs,vfs_tsmsm"
+fi
+
 ./autogen.sh
 
-CC="$CC" CFLAGS="-Wall -g -D_GNU_SOURCE" ./configure -C \
+CC="$CC" CFLAGS="-Wall -g -D_GNU_SOURCE -O3" ./configure -C \
        --prefix=${_prefix} \
        --localstatedir=/var \
        --with-configdir=${_sysconfdir}/samba \
-       --with-libdir=${_libarchdir}/samba \
-       --with-pammodulesdir=/${_libarch}/security \
+       --libdir=${_libarchdir} \
+       --with-modulesdir=${_libarchdir}/samba \
+       --with-pammodulesdir=${_libarch}/security \
        --with-lockdir=/var/lib/samba \
        --with-logfilebase=/var/log/samba \
-       --with-mandir=${_mandir} \
+       --mandir=${_mandir} \
        --with-piddir=/var/run \
        --with-privatedir=${_sysconfdir}/samba \
        --with-sambabook=${_datadir}/swat/using_samba \
@@ -43,14 +50,13 @@ CC="$CC" CFLAGS="-Wall -g -D_GNU_SOURCE" ./configure -C \
        --with-acl-support \
        --with-ads \
        --with-automount \
-       --with-fhs \
+       --enable-fhs \
        --with-pam_smbpass \
        --with-libsmbclient \
-       --with-libsmbsharemodes \
        --without-smbwrapper \
        --with-pam \
        --with-quotas \
-       --with-shared-modules=idmap_rid,idmap_ad,idmap_tdb2 \
+       --with-shared-modules=${shared_modules} \
        --with-syslog \
        --with-utmp \
        --with-cluster-support \
@@ -58,6 +64,8 @@ CC="$CC" CFLAGS="-Wall -g -D_GNU_SOURCE" ./configure -C \
        --without-ldb \
        --without-dnsupdate \
        --with-aio-support \
+       --disable-external-libtalloc \
+       --disable-external-libtdb \
        $*
 
 make showlayout