install_prereq: Fix SIPP compilation and python3 detection.

Install SIPP 3.6.1 instead of 3.5.2, which no longer
compiles properly. This now requires cmake, so also
install cmake.

Also use python3 if possible instead of python to
avoid exiting non-zero if python3 exists but python
does not (which it no longer does on many systems
where only Python 3 is installed).

Resolves: #47

contrib/scripts/install_prereq

@@ -13,7 +13,7 @@ usage() {
 }
 
 # Basic build system:
-PACKAGES_DEBIAN="subversion git build-essential automake"
+PACKAGES_DEBIAN="subversion git build-essential automake cmake"
 # Python tools
 PACKAGES_DEBIAN="$PACKAGES_DEBIAN python3 python3-pip python3-setuptools python3-dev python3-venv"
 # Testsuite: basic requirements:
@@ -22,7 +22,7 @@ PACKAGES_DEBIAN="$PACKAGES_DEBIAN liblua5.1-0-dev lua5.1 gdb"
 PACKAGES_DEBIAN="$PACKAGES_DEBIAN libpcap-dev libssl-dev libsctp-dev libncurses5-dev"
 
 # Basic build system:
-PACKAGES_RH="subversion git gcc gcc-c++ patch"
+PACKAGES_RH="subversion git gcc gcc-c++ patch cmake"
 # Python tools
 PACKAGES_RH="$PACKAGES_RH python3 python3-pip python3-setuptools python3-devel python3-virtualenv"
 # Testsuite: basic requirements:
@@ -31,7 +31,7 @@ PACKAGES_RH="$PACKAGES_RH lua-devel gdb"
 PACKAGES_RH="$PACKAGES_RH libpcap-devel openssl-devel lksctp-tools-devel"
 
 # Basic build system:
-PACKAGES_ARCH="git gcc"
+PACKAGES_ARCH="git gcc cmake"
 # Python tools
 PACKAGES_ARCH="$PACKAGES_ARCH python python-pip python-setuptools"
 # Testsuite: basic requirements:
@@ -187,9 +187,9 @@ install_sipp() {
 	$testcmd cd $PROJECT_DIR
 
 	# Checkout and build the current latest released version.
-	$testcmd git checkout v3.5.2
+	$testcmd git checkout v3.6.1
 
-	$testcmd ./build.sh --with-openssl --with-pcap --with-rtpstream --with-sctp
+	$testcmd ./build.sh --full
 	$testcmd make install
 
 	$testcmd cd $SAVE_DIR
@@ -250,7 +250,7 @@ if ! in_test_mode; then
 	echo ""
 	echo "Testsuite requires python version >= 3.6.8"
 	echo "Your installed python is"
-	python --version
+	python3 --version || python --version
 fi
 
 exit 0