From: Darren Tucker <dtucker@dtucker.net>
Date: Thu, 21 Oct 2021 22:42:14 +0000 (+1100)
Subject: Install libedit and pam based on config flags.
X-Git-Tag: V_8_9_P1~224
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=34df52c201c6b47e5a46b50c215e4d98a8bf6587;p=thirdparty%2Fopenssh-portable.git

Install libedit and pam based on config flags.
---

diff --git a/.github/setup_ci.sh b/.github/setup_ci.sh
index 75e087b22..a07a7f2dd 100755
--- a/.github/setup_ci.sh
+++ b/.github/setup_ci.sh
@@ -23,9 +23,16 @@ if [ "${TARGETS}" = "kitchensink" ]; then
 	TARGETS="kerberos5 libedit pam sk selinux"
 fi
 
+for flag in $CONFIGFLAGS; do
+    case "$flag" in
+    --with-pam)		PACKAGES="${PACKAGES} libpam0g-dev" ;;
+    --with-libedit)	PACKAGES="${PACKAGES} libedit-dev" ;;
+    esac
+done
+
 for TARGET in $TARGETS; do
     case $TARGET in
-    default|without-openssl|without-zlib|c89)
+    default|without-openssl|without-zlib|c89|libedit|*pam)
         # nothing to do
         ;;
     clang-*|gcc-*)
@@ -36,12 +43,6 @@ for TARGET in $TARGETS; do
         PACKAGES="$PACKAGES heimdal-dev"
         #PACKAGES="$PACKAGES libkrb5-dev"
         ;;
-    libedit)
-        PACKAGES="$PACKAGES libedit-dev"
-        ;;
-    *pam)
-        PACKAGES="$PACKAGES libpam0g-dev"
-        ;;
     sk)
         INSTALL_FIDO_PPA="yes"
         PACKAGES="$PACKAGES libfido2-dev libu2f-host-dev libcbor-dev"