Make sure HAVE_LIBSSL is defined, even when using pkg-config

[ngircd-alex.git] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index 3f86295ae0ab25fc8b98ca65f9b883f1ca266543..bb5482278ea9d0c52f9582fbda19810e76d997cd 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -103,7 +103,8 @@ Search()
 Notfound()
 {
        echo "Error: $* not found!"
-       echo "Please install recent versions of GNU autoconf and GNU automake."
+       echo 'Please install supported versions of GNU autoconf, GNU automake'
+       echo 'and pkg-config: see the INSTALL file for details.'
        exit 1
 }
 
@@ -161,6 +162,7 @@ AUTOMAKE_VERSION=$(echo $AUTOMAKE | cut -d'-' -f2-)
 [ -z "$GO" ] && [ -n "$CONFIGURE_ARGS" ] && GO=1
 
 # Verify that all tools have been found
+command -v pkg-config >/dev/null || Notfound pkg-config
 [ -z "$ACLOCAL" ] && Notfound aclocal
 [ -z "$AUTOHEADER" ] && Notfound autoheader
 [ -z "$AUTOMAKE" ] && Notfound automake
@@ -168,7 +170,7 @@ AUTOMAKE_VERSION=$(echo $AUTOMAKE | cut -d'-' -f2-)
 
 AM_VERSION=$($AUTOMAKE --version | head -n 1 | sed -e 's/.* //g')
 ifs=$IFS; IFS="."; set $AM_VERSION; IFS=$ifs
-AM_MAJOR="$1"; AM_MINOR="$2"; AM_PATCHLEVEL="$3"
+AM_MAJOR="$1"; AM_MINOR="$2"
 echo "Detected automake $AM_VERSION ..."
 
 AM_MAKEFILES="src/ipaddr/Makefile.ng src/ngircd/Makefile.ng src/testsuite/Makefile.ng src/tool/Makefile.ng"
@@ -194,6 +196,7 @@ if [ "$AM_MAJOR" -eq "1" ] && [ "$AM_MINOR" -ge "13" ]; then
        SERIAL_TESTS="serial-tests"
 else
        # automake < 1.13 => no new test harness, nothing to do
+       # shellcheck disable=SC2034
        SERIAL_TEST=""
 fi