From 18503ed28f32933815f139f3ede0dd0a6dba92f0 Mon Sep 17 00:00:00 2001
From: Owen Taylor <otaylor@src.gnome.org>
Date: Mon, 2 Feb 2009 22:22:00 +0000
Subject: [PATCH] Improve dependency checking for gnome-build-setup.sh

- Check for curl upfront to avoid problems if it is missing later
- Sync up Debian and Fedora depedency lists
- Add readline dependency

Patch from timbobsteve
http://bugzilla.gnome.org/show_bug.cgi?id=570015

svn path=/trunk/; revision=175
---
 tools/build/gnome-shell-build-setup.sh | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/tools/build/gnome-shell-build-setup.sh b/tools/build/gnome-shell-build-setup.sh
index 34aaa12a7..3089327bd 100755
--- a/tools/build/gnome-shell-build-setup.sh
+++ b/tools/build/gnome-shell-build-setup.sh
@@ -12,6 +12,18 @@
 SOURCE=$HOME/Source
 BASEURL=http://svn.gnome.org/svn/gnome-shell/trunk/tools/build
 
+if ! which curl > /dev/null 2>&1; then
+	cat <<EOF
+This script requires the curl program to run
+For Debian-based systems run:
+	apt-get install curl
+
+For Red Hat-based systems run:
+	yum install curl
+EOF
+	exit 1
+fi
+
 if [ -d $SOURCE ] ; then : ; else
     mkdir $SOURCE
     echo "Created $SOURCE"
@@ -58,7 +70,7 @@ if test x$system = xUbuntu -o x$system = xDebian ; then
   for pkg in build-essential automake gnome-common flex bison curl \
     git-core subversion gtk-doc-tools mesa-common-dev xulrunner-1.9-dev \
     libdbus-glib-1-dev libffi-dev libgconf2-dev libgtk2.0-dev libgl1-mesa-dev \
-    libgstreamer-plugins-base0.10-dev python2.5-dev; do
+    libgstreamer-plugins-base0.10-dev python2.5-dev libwnck-dev libreadline5-dev librsvg2-dev libgnomeui-dev; do
       if ! dpkg --status $pkg > /dev/null 2>&1; then
         reqd="$pkg $reqd"
       fi
@@ -73,7 +85,7 @@ if test x$system = xFedora ; then
   reqd=""
   for pkg in libffi-devel libXdamage-devel gnome-doc-utils xulrunner-devel \
     librsvg2-devel libgnomeui-devel xterm xorg-x11-apps xorg-x11-server-Xephyr \
-    libwnck-devel; do
+    libwnck-devel GConf2-devel readline-devel; do
       if ! rpm -q $pkg > /dev/null 2>&1; then
         reqd="$pkg $reqd"
       fi