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
This commit is contained in:
Owen Taylor 2009-02-02 22:22:00 +00:00
parent 489f3306e6
commit 18503ed28f

View File

@ -12,6 +12,18 @@
SOURCE=$HOME/Source SOURCE=$HOME/Source
BASEURL=http://svn.gnome.org/svn/gnome-shell/trunk/tools/build 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 if [ -d $SOURCE ] ; then : ; else
mkdir $SOURCE mkdir $SOURCE
echo "Created $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 \ for pkg in build-essential automake gnome-common flex bison curl \
git-core subversion gtk-doc-tools mesa-common-dev xulrunner-1.9-dev \ 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 \ 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 if ! dpkg --status $pkg > /dev/null 2>&1; then
reqd="$pkg $reqd" reqd="$pkg $reqd"
fi fi
@ -73,7 +85,7 @@ if test x$system = xFedora ; then
reqd="" reqd=""
for pkg in libffi-devel libXdamage-devel gnome-doc-utils xulrunner-devel \ for pkg in libffi-devel libXdamage-devel gnome-doc-utils xulrunner-devel \
librsvg2-devel libgnomeui-devel xterm xorg-x11-apps xorg-x11-server-Xephyr \ 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 if ! rpm -q $pkg > /dev/null 2>&1; then
reqd="$pkg $reqd" reqd="$pkg $reqd"
fi fi