From f6e9ae35fd7e6684496873b1598a0c26cab7dd10 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Mon, 15 Nov 2010 08:17:08 -0500 Subject: [PATCH] gnome-shell-build-setup.sh: Conditionally check for autopoint on Debian/Ubuntu. autopoint was split out into its own package in Debian lenny and thus Ubuntu 10.10 https://bugzilla.gnome.org/show_bug.cgi?id=632824 --- tools/build/gnome-shell-build-setup.sh | 38 +++++++++++++++----------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/tools/build/gnome-shell-build-setup.sh b/tools/build/gnome-shell-build-setup.sh index ee0e83e68..3ffa1ae77 100755 --- a/tools/build/gnome-shell-build-setup.sh +++ b/tools/build/gnome-shell-build-setup.sh @@ -71,30 +71,36 @@ fi # (*) only needed for --xephyr if test "x$system" = xUbuntu -o "x$system" = xDebian -o "x$system" = xLinuxMint ; then - reqd="" + reqd=" + build-essential curl + automake bison flex gettext git-core gnome-common gtk-doc-tools + gvfs gvfs-backends icon-naming-utils + libdbus-glib-1-dev libexpat-dev libffi-dev libgnome-menu-dev libgnome-desktop-dev + libjasper-dev libjpeg-dev libpng-dev libstartup-notification0-dev libtiff-dev + libwnck-dev libgl1-mesa-dev liborbit2-dev libpulse-dev libreadline5-dev libxml2-dev + mesa-common-dev mesa-utils libpam-dev python-dev python-gconf python-gobject + xulrunner-dev xserver-xephyr gnome-terminal libcroco3-dev + libgstreamer0.10-dev gstreamer0.10-plugins-base gstreamer0.10-plugins-good + libltdl-dev libvorbis-dev libxklavier-dev + " + + if apt-cache show autopoint > /dev/null 2> /dev/null; then + reqd="$reqd autopoint" + fi + if [ ! -x /usr/bin/dpkg-checkbuilddeps ]; then echo "Please run 'sudo apt-get install dpkg-dev' and try again." echo exit 1 fi - for pkg in \ - build-essential curl \ - automake bison flex gettext git-core gnome-common gtk-doc-tools \ - gvfs gvfs-backends icon-naming-utils \ - libdbus-glib-1-dev libexpat-dev libffi-dev libgnome-menu-dev libgnome-desktop-dev \ - libjasper-dev libjpeg-dev libpng-dev libstartup-notification0-dev libtiff-dev \ - libwnck-dev libgl1-mesa-dev liborbit2-dev libpulse-dev libreadline5-dev libxml2-dev \ - mesa-common-dev mesa-utils libpam-dev python-dev python-gconf python-gobject \ - xulrunner-dev xserver-xephyr gnome-terminal libcroco3-dev \ - libgstreamer0.10-dev gstreamer0.10-plugins-base gstreamer0.10-plugins-good \ - libltdl-dev libvorbis-dev libxklavier-dev \ - ; do + + for pkg in $reqd ; do if ! dpkg-checkbuilddeps -d $pkg /dev/null 2> /dev/null; then - reqd="$pkg $reqd" + missing="$pkg $missing" fi done - if test ! "x$reqd" = x; then - echo "Please run 'sudo apt-get install $reqd' and try again." + if test ! "x$missing" = x; then + echo "Please run 'sudo apt-get install $missing' and try again." echo exit 1 fi