Don't install autotools or GTK+, but do install CMake.

We no longer use autotools/libtool, so we don't need to install
automake, autoconf, or libtool; we only support CMake, so we *do* need
to install it.

We no longer support GTK+, so we don't need to install it.

Change-Id: I41df9f67c8aba486220e77f7c8c67efa7784a7f2
Reviewed-on: https://code.wireshark.org/review/27152
Reviewed-by: Guy Harris <guy@alum.mit.edu>

diff --git a/tools/debian-setup.sh b/tools/debian-setup.sh
index 2e2bc253f36d8b98991289df06109c13aacb5b85..5eb509b15e8338a649ebb3db0de169b45b460b75 100755 (executable)
--- a/tools/debian-setup.sh
+++ b/tools/debian-setup.sh
@@ -38,16 +38,36 @@ do
        fi
 done
 
-BASIC_LIST="libgtk2.0-dev libpcap-dev bison flex make automake \
-       libtool python perl libgcrypt-dev"
-
-ADDITIONAL_LIST="libnl-3-dev qttools5-dev qttools5-dev-tools libgtk-3-dev \
-               libc-ares-dev libkrb5-dev libqt5svg5-dev libsmi2-dev \
-               asciidoctor libsbc-dev \
-               qtmultimedia5-dev liblua5.2-dev libnl-cli-3-dev \
-               libparse-yapp-perl qt5-default cmake libcap-dev \
-               liblz4-dev libsnappy-dev libspandsp-dev libxml2-dev \
-               git libjson-glib-dev"
+BASIC_LIST="qttools5-dev \
+       qttools5-dev-tools \
+       libqt5svg5-dev \
+       qtmultimedia5-dev \
+       qt5-default \
+       libpcap-dev \
+       bison \
+       flex \
+       make \
+       cmake \
+       python \
+       perl \
+       libgcrypt-dev"
+
+ADDITIONAL_LIST="libnl-3-dev \
+       libc-ares-dev \
+       libkrb5-dev \
+       libsmi2-dev \
+       asciidoctor \
+       libsbc-dev \
+       liblua5.2-dev \
+       libnl-cli-3-dev \
+       libparse-yapp-perl \
+       libcap-dev \
+       liblz4-dev \
+       libsnappy-dev \
+       libspandsp-dev \
+       libxml2-dev \
+       git \
+       libjson-glib-dev"
 
 # Adds package $2 to list variable $1 if the package is found
 add_package() {
@@ -60,10 +80,6 @@ add_package() {
        eval "${list}=\"\${${list}} \${pkgname}\""
 }
 
-# only needed for newer distro versions where "libtool" binary is separated.
-# Debian >= jessie, Ubuntu >= 16.04
-add_package BASIC_LIST libtool-bin
-
 # Debian >= wheezy-backports, Ubuntu >= 16.04
 add_package ADDITIONAL_LIST libnghttp2-dev ||
 echo "libnghttp2-dev is unavailable" >&2

diff --git a/tools/rpm_setup.sh b/tools/rpm_setup.sh
index f857fd2d24f4083c85b10b001dc18618736af707..76d2b63c9909ba9000aedb99d3228aff03b680f1 100755 (executable)
--- a/tools/rpm_setup.sh
+++ b/tools/rpm_setup.sh
@@ -38,13 +38,36 @@ do
        fi
 done
 
-BASIC_LIST="autoconf automake libtool gcc flex bison python perl lua-devel lua \
-desktop-file-utils fop asciidoc git git-review gtk2-devel gtk3-devel glib2-devel \
-libpcap-devel zlib-devel"
-
-ADDITIONAL_LIST="libnl3-devel libnghttp2-devel libcap libcap-devel \
-libgcrypt-devel libssh-devel krb5-devel perl-Parse-Yapp sbc-devel libsmi-devel \
-snappy-devel lz4 json-glib-devel"
+BASIC_LIST="cmake \
+       gcc \
+       flex \
+       bison \
+       python \
+       perl \
+       lua-devel \
+       lua \
+       desktop-file-utils \
+       fop \
+       asciidoc \
+       git \
+       git-review \
+       glib2-devel \
+       libpcap-devel \
+       zlib-devel"
+
+ADDITIONAL_LIST="libnl3-devel \
+       libnghttp2-devel \
+       libcap \
+       libcap-devel \
+       libgcrypt-devel \
+       libssh-devel \
+       krb5-devel \
+       perl-Parse-Yapp \
+       sbc-devel \
+       libsmi-devel \
+       snappy-devel \
+       lz4 \
+       json-glib-devel"
 
 # Guess which package manager we will use
 PM=`which zypper 2> /dev/null ||