s3/packaging: Fix build on RHEL when ccache is not available.

This fixes bug #5832.
Patch was provided by D.L. Meyer <dlmeyer [at] uiuc.edu>.

Thanks for reporting and providing the patch!

Karolin
(cherry picked from commit 42e0cb8c0a1b8470ac8e9ad1c5a741e299debb8f)
(cherry picked from commit b2205a7697598729f85cb767621b8c610654053c)

diff --git a/packaging/RHEL/samba.spec.tmpl b/packaging/RHEL/samba.spec.tmpl
index f7c980f1abe46d9fe47efb4056e2b0c6a73a7d62..2bcb8dce70627571e481ce2789723579db392ae5 100644 (file)
--- a/packaging/RHEL/samba.spec.tmpl
+++ b/packaging/RHEL/samba.spec.tmpl
@@ -122,8 +122,7 @@ cd source
 # RPM_OPT_FLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64"
 
 ## check for ccache
- ccache -h 2>&1 > /dev/null
-if [ $? -eq 0 ]; then
+if [ "$(which ccache 2> /dev/null)" != "" ]; then
        CC="ccache gcc"
 else
        CC="gcc"