Tweaks for the Qt4 part

1 files changed, 8 insertions, 6 deletions

diff --git a/vlc/build/vlc-1.0.SlackBuild b/vlc/build/vlc-1.0.SlackBuild
index d735566f..da1fbd1a 100755
--- a/vlc/build/vlc-1.0.SlackBuild
+++ b/vlc/build/vlc-1.0.SlackBuild
@@ -169,7 +169,9 @@
 # 1.0.1-1:    28/jul/2009 by Eric Hameleers <alien@slackware.com>
 #             * An update that fixes a realrtsp vulnerability. Also updated
 #               x264/live555 snapshots and added support for lua playlist,
-#               metafetcher and interface plugins.
+#               metafetcher and interface plugins. By default, this script
+#               no longer links Qt4 statically and instead links against an
+#               already installed Qt libray.
 # 
 # Run 'sh vlc.SlackBuild' to build a Slackware package.
 # The package (.tgz) plus descriptive .txt file are created in /tmp .
@@ -449,7 +451,7 @@ USE[8]="YES"
 SOURCE[9]="$SRCDIR/qt-x11-opensource-src-$QT4.tar.gz"
 SRCURL[9]="http://wftp.tu-chemnitz.de/pub/Qt/qt/source/qt-x11-opensource-src-${QT4}.tar.gz"
 SRCPAT[9]="NO"
-USE[9]="YES"
+USE[9]="NO"
 
 # FAAD2 support:
 SOURCE[10]="$SRCDIR/faad2-$FAAD2.tar.gz"
@@ -765,11 +767,11 @@ if [ "$P1" != "--oldbuild" -a  "$P1" != "--download" ]; then
 fi
 
 # We may not need to download and unpack the Qt4 sources:
-if [ "$STATIC_QT4" != "YES" ]; then
+if [ "$STATIC_QT4" != "NO" ]; then
   echo "**"
-  echo "** Not building static QT4..."
+  echo "** Building with a static QT4..."
   echo "**"
-  USE[9]="NO"
+  USE[9]="YES"
 fi
 
 # We may not need to download and unpack the ffmpeg sources:
@@ -2656,7 +2658,7 @@ else
   fi
 
   # qt4 is used for the vlc gui:
-  if [ "$STATIC_QT4" = "YES" ]; then
+  if [ "$STATIC_QT4" = "YES" -o "$STATIC_QT4" = "yes" ]; then
     make_qt4
     # These 800MB are too much for my virtual machine :
     [ "${SPACE_CONSTRAINED}" == "YES" ] && rm -rf $TMP/tmp-$PRGNAM/qt-x11-opensource-src-${QT4}