[PATCH wayland-build-tools] wl_install_deps: Add missing dependencies, remove INCLUDE_XWAYLAND logic

[Yong Bakos]

From: Yong Bakos <ybakos at humanoriented.com>

Building on Ubuntu 15.10 x64 fails due to missing packages:
libtool, libxml2-dev, libpng-dev, libglib2.0-dev, libgudev-1.0-dev,
libgcrypt20-dev, x11proto-scrnsaver-dev, libxfont-dev, and libedit-dev.

In addition, building with INCLUDE_XWAYLAND=0 causes failures due to missing
package dependencies that would otherwise be installed when INCLUDE_XWAYLAND=1.
With only ~two packages not needing to be installed, it seems more simple to
remove this logic from wl_install_deps entirely.

After these changes, wl_build succeeds on Ubuntu 15.10 x64.

Signed-off-by: Yong Bakos <ybakos at humanoriented.com>
---
 wl_install_deps | 45 +++++++++++++++++++++++++--------------------
 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/wl_install_deps b/wl_install_deps
index c400f6f..e9ba6ad 100755
--- a/wl_install_deps
+++ b/wl_install_deps
@@ -3,7 +3,7 @@
 . $HOME/.config/wayland-build-tools/wl_defines.sh
 
 # generic build dependencies for ubuntu
-sudo apt-get -y install autoconf automake bison debhelper dpkg-dev flex
+sudo apt-get -y install autoconf automake bison debhelper dpkg-dev flex libtool
 sudo apt-get -y install pkg-config quilt python-libxml2
 
 # wayland/weston specific stuff
@@ -19,23 +19,28 @@ sudo apt-get -y install libpciaccess-dev
 sudo apt-get -y install libudev-dev
 sudo apt-get -y install llvm-dev
 sudo apt-get -y install python-mako
+sudo apt-get -y install libxml2-dev
+sudo apt-get -y install libpng-dev
+sudo apt-get -y install libglib2.0-dev
+sudo apt-get -y install libgudev-1.0-dev
+sudo apt-get -y install libgcrypt20-dev
+sudo apt-get -y install x11proto-scrnsaver-dev
+sudo apt-get -y install libxfont-dev
+sudo apt-get -y install libedit-dev
 
-# xwayland specific stuff
-if [ ${INCLUDE_XWAYLAND} ]; then
-	sudo apt-get -y install libxcb-composite0-dev
-	sudo apt-get -y install x11proto-randr-dev
-	sudo apt-get -y install x11proto-composite-dev
-	sudo apt-get -y install x11proto-xinerama-dev
-	sudo apt-get -y install x11proto-dri2-dev
-	sudo apt-get -y install x11proto-gl-dev
-	sudo apt-get -y install xutils-dev
-	sudo apt-get -y install libxcursor-dev
-	#sudo apt-get -y install libdrm-dev
-	sudo apt-get -y install libx11-dev
-	sudo apt-get -y install libx11-xcb-dev
-	#sudo apt-get -y install x11proto-dri3-dev
-	sudo apt-get -y install libxdamage-dev
-	sudo apt-get -y install libxext-dev
-	sudo apt-get -y install libxfixes-dev
-	sudo apt-get -y install libxxf86vm-dev
-fi
+sudo apt-get -y install libxcb-composite0-dev
+sudo apt-get -y install x11proto-randr-dev
+sudo apt-get -y install x11proto-composite-dev
+sudo apt-get -y install x11proto-xinerama-dev
+sudo apt-get -y install x11proto-dri2-dev
+sudo apt-get -y install x11proto-gl-dev
+sudo apt-get -y install xutils-dev
+sudo apt-get -y install libxcursor-dev
+# sudo apt-get -y install libdrm-dev
+sudo apt-get -y install libx11-dev
+sudo apt-get -y install libx11-xcb-dev
+# sudo apt-get -y install x11proto-dri3-dev
+sudo apt-get -y install libxdamage-dev
+sudo apt-get -y install libxext-dev
+sudo apt-get -y install libxfixes-dev
+sudo apt-get -y install libxxf86vm-dev
-- 
2.7.2