diff options
| author | Volker Lendecke <vl@samba.org> | 2008-12-10 23:14:46 +0100 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2008-12-10 23:14:46 +0100 |
| commit | 7c2bdead9e3e4436e427668a16df367e14885cbc (patch) | |
| tree | 949c1aca56818a2a982428109345084100abf7a8 /packaging | |
| parent | 8d641826595e3be8864097d4aea7a76879c173d6 (diff) | |
| download | samba-7c2bdead9e3e4436e427668a16df367e14885cbc.tar.gz samba-7c2bdead9e3e4436e427668a16df367e14885cbc.tar.bz2 samba-7c2bdead9e3e4436e427668a16df367e14885cbc.zip | |
Revert "Fix some merge omissions for GPFS"
This reverts commit a0efc4cffbd84898c454d27eaf946d073dfdad0f.
This one should have been done with careful cherry-picks, sorry.
Volker
Diffstat (limited to 'packaging')
| -rwxr-xr-x | packaging/RHEL-CTDB/configure.rpm | 67 |
1 files changed, 23 insertions, 44 deletions
diff --git a/packaging/RHEL-CTDB/configure.rpm b/packaging/RHEL-CTDB/configure.rpm index 358b40db10..7596040205 100755 --- a/packaging/RHEL-CTDB/configure.rpm +++ b/packaging/RHEL-CTDB/configure.rpm @@ -1,56 +1,37 @@ -#!/bin/sh case `uname -m` in - x86_64) - _libarch=lib64 - ;; - *) - _libarch=lib - ;; + x86_64) + libdir=/usr/lib64/samba + ;; + *) + libdir=/usr/lib/samba + ;; esac -_libarchdir=/usr/${_libarch} - -_prefix=/usr -_sysconfdir=/etc -_mandir=/usr/man -_datadir=/usr/share - -# check for ccache -ccache -h 2>&1 > /dev/null -if [ $? -eq 0 ]; then - CC="ccache gcc" -else - CC="gcc" -fi - -./autogen.sh - -CC="$CC" CFLAGS="-Wall -g -D_GNU_SOURCE" ./configure -C \ - --prefix=${_prefix} \ - --localstatedir=/var \ - --with-configdir=${_sysconfdir}/samba \ - --with-libdir=${_libarchdir}/samba \ - --with-pammodulesdir=/${_libarch}/security \ - --with-lockdir=/var/lib/samba \ - --with-logfilebase=/var/log/samba \ - --with-mandir=${_mandir} \ - --with-piddir=/var/run \ - --with-privatedir=${_sysconfdir}/samba \ - --with-sambabook=${_datadir}/swat/using_samba \ - --with-swatdir=${_datadir}/swat \ +CFLAGS="-Wall -g -D_GNU_SOURCE" ./configure \ + --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 \ --disable-cups \ - --with-acl-support \ + --with-acl-support \ --with-ads \ - --with-automount \ - --with-fhs \ + --with-automount \ + --with-fhs \ --with-pam_smbpass \ --with-libsmbclient \ --with-libsmbsharemodes \ - --without-smbwrapper \ + --without-smbwrapper \ --with-pam \ --with-quotas \ - --with-shared-modules=idmap_rid,idmap_ad,idmap_tdb2,vfs_gpfs \ + --with-shared-modules=idmap_rid,idmap_ad,idmap_tdb2 \ --with-syslog \ --with-utmp \ --with-cluster-support \ @@ -59,5 +40,3 @@ CC="$CC" CFLAGS="-Wall -g -D_GNU_SOURCE" ./configure -C \ --without-dnsupdate \ --with-aio-support \ $* - -make showlayout |