From: Scott Barninger <sbarn@scott.localdomain>
Date: Sun, 14 Mar 2010 18:55:02 +0000 (-0400)
Subject: Allow users to build bat without static QT if desired.
X-Git-Tag: Release-5.2.1~1591
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=99988e91999435787378842ebd7faed19395e7d8;p=bacula%2Fbacula

Allow users to build bat without static QT if desired.
---

diff --git a/bacula/platforms/rpm/bacula-bat.spec b/bacula/platforms/rpm/bacula-bat.spec
index 33a7b45953..f9c8ed8bad 100644
--- a/bacula/platforms/rpm/bacula-bat.spec
+++ b/bacula/platforms/rpm/bacula-bat.spec
@@ -62,6 +62,9 @@
 %{expand: %%define gccver %(rpm -q --queryformat %%{version} gcc)}
 %{expand: %%define gccrel %(rpm -q --queryformat %%{release} gcc)}
 
+%define staticqt 1
+%{?nobuild_staticqt:%define staticqt 0}
+
 # determine what platform we are building on
 %define fedora 0
 %define suse 0
@@ -160,10 +163,12 @@ It is an add-on to the client or server packages.
 
 
 cwd=${PWD}
-#export QTDIR=$(pkg-config --variable=prefix QtCore)
-#export QTINC=$(pkg-config --variable=includedir QtCore)
-#export QTLIB=$(pkg-config --variable=libdir QtCore)
-#export PATH=${QTDIR}/bin/:${PATH}
+%if ! %{staticqt}
+export QTDIR=$(pkg-config --variable=prefix QtCore)
+export QTINC=$(pkg-config --variable=includedir QtCore)
+export QTLIB=$(pkg-config --variable=libdir QtCore)
+export PATH=${QTDIR}/bin/:${PATH}
+%else
 cd %{depkgs_qt}
 make qt4 <<EOF
 yes
@@ -175,6 +180,7 @@ export QTINC=${qtdir}/qt4/include/
 export QTLIB=${qtdir}/qt4/lib/
 export QMAKESPEC=${qtdir}/qt-x11-opensource-src-%{qt4ver}/mkspecs/linux-g++/
 cd ${cwd}
+%endif
 
 # Main Bacula configuration with bat
 %configure \
@@ -298,6 +304,7 @@ rm -rf $RPM_BUILD_DIR/depkgs-qt
 %changelog
 * Sun Mar 14 2010 D. Scott Barninger <barninger@fairfieldcomputers.com>
 - Fix for QT mkspecs location on FC12
+- allow user to build without embedded static QT
 * Sat Feb 27 2010 D. Scott Barninger <barninger@fairfieldcomputers.com>
 - add dependency on bacula-libs
 * Sat Feb 13 2010 D. Scott Barninger <barninger@fairfieldcomputers.com>