[Lunar-commits] <moonbase> qt4: Adjusting a few things in the BUILD and CONFIGURE.

[Dennis `stumbles` Veatch]

commit 15818cd24613e3494f67f2625254e3933713f8cf
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date:   Sun Jan 9 16:24:03 2011 -0500

    qt4: Adjusting a few things in the BUILD and CONFIGURE.
---
 qt4-apps/qt4/BUILD     |   12 ++++++++++--
 qt4-apps/qt4/CONFIGURE |    1 +
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/qt4-apps/qt4/BUILD b/qt4-apps/qt4/BUILD
index 5e81183..699b9fa 100644
--- a/qt4-apps/qt4/BUILD
+++ b/qt4-apps/qt4/BUILD
@@ -14,7 +14,12 @@
   export PATH=$MODULE_PREFIX::$PATH   &&
   export LD_LIBRARY_PATH=$QTDIR/lib &&
 
-  sedit "s:COMMERCIAL_USER=ask:COMMERCIAL_USER=no:" configure &&
+  if [ $LICENSE_TYPE == "y" ] ; then
+    LICENSE_TYPE="-opensource"
+   else
+    LICENSE_TYPE="-commercial"
+  fi &&
+
   sedit "s/-O2/$CFLAGS/" mkspecs/common/g++.conf &&
 
   if [ "$MAKE_DOCS" == "y" ]; then
@@ -27,7 +32,7 @@
 
   OPTS+=" -largefile -multimedia -audio-backend -no-separate-debug-info -script -release -scripttools -accessibility -glib -optimized-qmake -xmlpatterns -fast -shared" &&
 
-  echo "yes" | ./configure                             \
+  ./configure  -confirm-license $LICENSE_TYPE          \
                -prefix /usr                            \
                -libdir /usr/lib/$MODULE                \
                -docdir /usr/share/$MODULE              \
@@ -47,6 +52,9 @@
 # and after much fiddling cannot get it to point them to /usr/bin. So lets just sedit these rascals.
   for i in `ls /usr/lib/$MODULE/pkgconfig/Q*.pc` ; do sed -i "s:\${prefix}/src/qt-everywhere-opensource-src-$VERSION/:\${prefix}/:" $i ; done &&
   sed -i "s:\${prefix}/src/qt-everywhere-opensource-src-$VERSION/:\${prefix}/:"  /usr/lib/$MODULE/pkgconfig/phonon.pc || true &&
+# Like for moc and uic, the same needs doing for the *.prl files.
+  find /usr/lib/qt4 -type f -name '*.prl' \
+      -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; &&
 
   if [ "$MAKE_QDOC3" == "y" ]; then
      cd tools/qdoc3 &&
diff --git a/qt4-apps/qt4/CONFIGURE b/qt4-apps/qt4/CONFIGURE
index ceb87e8..db5b2f4 100644
--- a/qt4-apps/qt4/CONFIGURE
+++ b/qt4-apps/qt4/CONFIGURE
@@ -3,3 +3,4 @@ mquery MAKE_EXAMPLE_DEMOS "Build exmaples and demos?" n "" "-nomake examples -no
 mquery XML_PATTERNS "Build xml patterns? Needed by qtscriptgenerator" y "-exceptions" "-no-exceptions"
 mquery MAKE_QDOC3 "BUILD QDOC3 docs? This is needed by qt-creator." n
 mquery MAKE_WEBKIT "Build the webkit plugin?" y "-webkit" "-no-webkit"
+mquery LICENSE_TYPE "Build Qt using open source license? (N=commercial)" y