[pitivi] pitivi-git-environment: Check for GSt 1.0 before entering the environment

[Jean-FranÃois Fortin Tam <jfft src gnome org>]

commit 6884718ae5461f0f052f80eaece2a60148f47515
Author: Jean-FranÃois Fortin Tam <nekohayo gmail com>
Date:   Sun Sep 30 12:50:54 2012 -0400

    pitivi-git-environment: Check for GSt 1.0 before entering the environment
    
    We need to do this at the beginning, otherwise our own local gstreamer
    would be misdetected as a systemwide install and it would never get updated.

 bin/pitivi-git-environment.sh |   26 +++++++++++++++-----------
 1 files changed, 15 insertions(+), 11 deletions(-)
---
diff --git a/bin/pitivi-git-environment.sh b/bin/pitivi-git-environment.sh
index 4a475d9..0988330 100755
--- a/bin/pitivi-git-environment.sh
+++ b/bin/pitivi-git-environment.sh
@@ -19,6 +19,21 @@ GST_RELEASE_TAG="master"
 # Everything below this line shouldn't be edited!
 #
 
+MODULES_CORE="glib gobject-introspection pygobject"
+# Do NOT use the following two variables directly, use $MODULES instead
+MODULES_ALL="gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad gst-ffmpeg gnonlin gst-editing-services gst-python"
+MODULES_MINIMAL="gnonlin gst-editing-services gst-python"
+# The following decision has to be made before we've set any env variables,
+# otherwise the script will detect our "gst uninstalled" and think it's the
+# system-wide install.
+if pkg-config --list-all |grep gstreamer-1.0 &>/dev/null
+    then echo "GSt 1.0 is installed, not building it"
+    MODULES=$MODULES_MINIMAL
+else
+    echo "GSt 1.0 is not installed, building it"
+    MODULES=$MODULES_ALL
+fi
+
 # base path under which dirs are installed
 PITIVI=$MYPITIVI
 
@@ -149,9 +164,6 @@ export DYLD_LIBRARY_PATH
 export GI_TYPELIB_PATH
 export PYTHONPATH
 
-MODULES_ALL="gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad gst-ffmpeg gnonlin gst-editing-services gst-python"
-MODULES_MINIMAL="gnonlin gst-editing-services gst-python"
-MODULES_CORE="glib gobject-introspection pygobject"
 
 # Force build to happen automatically if the folders are missing
 # or if the --build parameter is used:
@@ -226,14 +238,6 @@ if [ "$ready_to_run" != "1" ]; then
 
 
 
-    if pkg-config --list-all |grep gstreamer-1.0 &>/dev/null
-        then echo "GSt 1.0 is installed, not building it"
-        MODULES=$MODULES_MINIMAL
-    else
-        echo "GSt 1.0 is not installed, building it"
-        MODULES=$MODULES_ALL
-    fi
-
     # Build all the necessary gstreamer modules.
     for m in $MODULES
     do