[Lunar-commits] <moonbase> qt4: Some changes here to close BR385 (the -make parts).

[Dennis 'stumbles' Veatch]

commit 8a179cbc663a3db0218ce2b7db67d8c1dad09584
Author: Dennis 'stumbles' Veatch <stumbles at lunar-linux.org>
Date:   Sun Apr 5 15:39:17 2009 -0400

    qt4: Some changes here to close BR385 (the -make parts).
    
    The way qt4 configure handles -make clobbers some of the default things
    needed for kdelibs4. The most important one, tools are not built. While
    at it, changed -exceptions to -no-execptions reducing some qt code bloat.
    
    Removed the sedit since I could not see during the build where the 3
    mkpsecs linux-g++/qmake.conf files had a -O2. After trying it on x86_64
    and x86 could not detect any differences.
    
    I'd like to thank Verdant_Machine for his assistance, and dottle for his
    patience.
---
 kde4/base/qt4/BUILD     |   39 +++++++++++++--------------------------
 kde4/base/qt4/CONFIGURE |    3 ++-
 2 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/kde4/base/qt4/BUILD b/kde4/base/qt4/BUILD
index 9dea06e..379e0e4 100644
--- a/kde4/base/qt4/BUILD
+++ b/kde4/base/qt4/BUILD
@@ -4,40 +4,27 @@
   export PATH=$QTDIR/bin:$PATH
   export LD_LIBRARY_PATH=$QTDIR/lib
 
-  sedit "s/-O2/$CXXFLAGS/" mkspecs/linux-g++/qmake.conf  &&
-
   if module_installed phonon ; then
-    OPTS+="-phonon -phonon-backend"
+    OPTS+=" -phonon -phonon-backend"
    else
-    OPTS+="-no-phonon -phonon-backend"
+    OPTS+=" -no-phonon -phonon-backend"
+  fi &&
+
+  if [ "$MAKE_DOCS" == "y" ]; then
+    OPTS+=" -make tools -make docs -make translations"
   fi &&
 
-  if in_depends qt4 sqlite ; then
-    OPTS+=" -system-sqlite"
+  if [ "$MAKE_EXAMPLE_DEMOS" =="y" ]; then
+    OPTS+=" -make examples -make demos -make tools -make docs -make translations"
   fi &&
 
+  OPTS+=" -release -fast -no-separate-debug-info -shared -qt-gif -system-libpng -system-libjpeg   \
+          -system-libmng -system-zlib -no-exceptions -accessibility -pch -stl -webkit -fontconfig \
+          -largefile -glib -qt3support"
+
   echo "yes" | ./configure               \
                -prefix ${MODULE_PREFIX}  \
-               -release          \
-               -fast             \
-               -no-separate-debug-info \
-               -shared           \
-               -qt-gif           \
-               -system-libpng    \
-               -system-libjpeg   \
-               -system-libmng    \
-               -system-zlib      \
-               -exceptions       \
-               -nomake examples  \
-               -nomake demos     \
-               -accessibility    \
-               -stl              \
-               -webkit           \
-               -fontconfig       \
-               -largefile        \
-               -glib             \
-               -qt3support       \
-               $OPTS            &&
+               $OPTS                    &&
 
   default_make  &&
 
diff --git a/kde4/base/qt4/CONFIGURE b/kde4/base/qt4/CONFIGURE
index cd2b72c..663bd4b 100644
--- a/kde4/base/qt4/CONFIGURE
+++ b/kde4/base/qt4/CONFIGURE
@@ -1 +1,2 @@
-mquery MAKE_DOCS "Build the QT4 documentation?" n "-make docs -make tools -make examples -make translations" "-nomake docs"
+mquery MAKE_DOCS "Build the QT4 documentation?" n "" " -nomake docs"
+mquery MAKE_EXAMPLE_DEMOS "Build exmaples and demos?" n "" "-nomake examples -nomake demos"