update configure.rpm for clustered Samba usage

(This used to be commit 87c9f7717fc8171644c244fe697cace2968b8f8a)

1 files changed, 40 insertions, 31 deletions

diff --git a/packaging/RHEL-CTDB/configure.rpm b/packaging/RHEL-CTDB/configure.rpm
index e1a58ddb3b..a0bcf56654 100644..100755
--- a/packaging/RHEL-CTDB/configure.rpm
+++ b/packaging/RHEL-CTDB/configure.rpm
@@ -1,34 +1,43 @@
 
+case `uname -m` in
+     x86_64)
+	libdir=/usr/lib64/samba
+	;;
+     *)
+	libdir=/usr/lib/samba
+	;;
+esac
+
+
 CFLAGS="-Wall -g -D_GNU_SOURCE" ./configure \
-	--prefix=/usr \
-	--localstatedir=/var \
-	--with-configdir=/etc/samba \
-	--with-libdir=/usr/lib/samba \
-	--with-lockdir=/var/lib/samba \
-	--with-logfilebase=/var/log/samba \
-	--with-mandir=/usr/man \
-	--with-piddir=/var/run \
-	--with-privatedir=/etc/samba \
-	--with-sambabook=/usr/share/swat/using_samba \
-	--with-swatdir=/usr/share/swat \
-	--enable-cups \
-	--with-acl-support \
-	--with-ads \
-	--with-automount \
-	--with-fhs \
-	--with-pam_smbpass \
-	--with-libsmbclient \
-	--with-libsmbsharemodes \
-	--without-smbwrapper \
-	--with-pam \
-	--with-quotas \
-	--with-shared-modules=idmap_rid,idmap_ad \
-	--with-smbmount \
-	--with-syslog \
-	--with-utmp \
-	--with-cluster-support \
-	--with-ctdb=/usr/include \
-	--without-ldb \
-	--with-dnsupdate \
-	--with-aio-support \
+        --prefix=/usr \
+        --localstatedir=/var \
+        --with-configdir=/etc/samba \
+        --with-libdir=$libdir \
+        --with-lockdir=/var/lib/samba \
+        --with-logfilebase=/var/log/samba \
+        --with-mandir=/usr/man \
+        --with-piddir=/var/run \
+        --with-privatedir=/etc/samba \
+        --with-sambabook=/usr/share/swat/using_samba \
+        --with-swatdir=/usr/share/swat \
+        --enable-cups \
+        --with-acl-support \
+        --with-ads \
+        --with-automount \
+        --with-fhs \
+        --with-pam_smbpass \
+        --with-libsmbclient \
+        --with-libsmbsharemodes \
+        --without-smbwrapper \
+        --with-pam \
+        --with-quotas \
+        --with-shared-modules=idmap_rid,idmap_ad,idmap_tdb2 \
+        --with-syslog \
+        --with-utmp \
+        --with-cluster-support \
+        --with-ctdb=/usr/include \
+        --without-ldb \
+        --with-dnsupdate \
+        --with-aio-support \
 	$*