From mboxrd@z Thu Jan  1 00:00:00 1970
Delivery-date: Tue, 18 Oct 2022 11:47:40 +0200
Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33])
	by lore.white.stw.pengutronix.de with esmtps  (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
	(Exim 4.94.2)
	(envelope-from <ptxdist-bounces+lore=lore.pengutronix.de@pengutronix.de>)
	id 1okjCH-00CVjN-5f
	for lore@lore.pengutronix.de; Tue, 18 Oct 2022 11:47:40 +0200
Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de)
	by metis.ext.pengutronix.de with esmtp (Exim 4.92)
	(envelope-from <ptxdist-bounces@pengutronix.de>)
	id 1okjCE-0003XR-Nc; Tue, 18 Oct 2022 11:47:38 +0200
Received: from h2.cmg1.smtp.forpsi.com ([81.2.195.163])
 by metis.ext.pengutronix.de with esmtps
 (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92)
 (envelope-from <oss-lists@triops.cz>) id 1okjC1-0003XH-KB
 for ptxdist@pengutronix.de; Tue, 18 Oct 2022 11:47:26 +0200
Received: from lenoch ([91.218.190.200]) by cmgsmtp with ESMTPSA
 id kjBzoiQ1xPm6CkjC0ozeJD; Tue, 18 Oct 2022 11:47:24 +0200
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=triops.cz; s=f2019;
 t=1666086444; bh=aeeZpEfFNH7I3XKYyKa0Fc5AJYNVqMZoW11V2bIM018=;
 h=Date:From:To:Subject:Message-ID:MIME-Version:Content-Type;
 b=aVauuR/yangtVIfxsEUmw+jHPG9AoW7gYyyIFrP3gzr8JMPoT9Fd+h25myrV3QyFL
 Q3TvsRCjqAkGzFXdVtGf+QTZzOOO0daHoePFaC1/SQbpR3eH/+7cpm+rz4YTOGopSk
 jDUkcO4wQ8VrUs6veKNr+mZ4FK8wCMqgEkII5qcDSMu+vCuYIUqn7ZhS1bWE3APmGn
 vdxcIq48rhQ009Aa0DRH+WJr3cKzrYRN8ABzgbdczs6k/JdplOAfgEz4IDmoyILhVz
 EGTEtyzcN5VV1WI8jWRcKwPI95xMXMgYRBtjWFQa8avtRzTs0pxd7yZ//IjheuaZxL
 +klHYmsePLMKA==
Date: Tue, 18 Oct 2022 11:47:23 +0200
From: Ladislav Michl <oss-lists@triops.cz>
To: ptxdist@pengutronix.de
Message-ID: <Y052K561zUeaCSVq@lenoch>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
X-CMAE-Envelope: MS4wfNq+87gNcfUGsxrAxRq2Tp0mX9cQfMES5totJx8opn2El7OnTKArLAZaYOfPchKygZTJGTND343eSevvEqQyezJl8JH/oYD94ybESnRJIomOaAwR0e2c
 6NumNTws9hwXiUb7ZZF92LTB+3F8FV5jVl/cQFyyTKMB9ykglTN2p1cr
X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on
 metis.ext.pengutronix.de
X-Spam-Level: 
X-Spam-Status: No, score=-2.0 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED,
 DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,
 SPF_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2
Subject: [ptxdist] [PATCH] proftpd: Use ptx/endis to enable options
X-BeenThere: ptxdist@pengutronix.de
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: PTXdist Development Mailing List <ptxdist.pengutronix.de>
List-Unsubscribe: <http://metis.pengutronix.de/cgi-bin/mailman/options/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=unsubscribe>
List-Archive: <http://metis.pengutronix.de/cgi-bin/mailman/private/ptxdist/>
List-Post: <mailto:ptxdist@pengutronix.de>
List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help>
List-Subscribe: <http://metis.pengutronix.de/cgi-bin/mailman/listinfo/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=subscribe>
Reply-To: ptxdist@pengutronix.de
Sender: "ptxdist" <ptxdist-bounces@pengutronix.de>
X-SA-Exim-Connect-IP: 127.0.0.1
X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de
X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false

From: Ladislav Michl <ladis@linux-mips.org>

Remove some ifdefs and replace deprecated variables while there.

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
 rules/proftpd.make | 35 ++++++++---------------------------
 1 file changed, 8 insertions(+), 27 deletions(-)

diff --git a/rules/proftpd.make b/rules/proftpd.make
index 6554dced7..889a9fef8 100644
--- a/rules/proftpd.make
+++ b/rules/proftpd.make
@@ -27,39 +27,20 @@ PROFTPD_DIR		:= $(BUILDDIR)/$(PROFTPD)
 # Prepare
 # ----------------------------------------------------------------------------
 
-PROFTPD_COMPILE_ENV	:= $(CROSS_ENV_CC_FOR_BUILD)
+PROFTPD_MAKE_ENV	:= $(CROSS_ENV_CC_FOR_BUILD)
 
 #
 # autoconf
 #
-PROFTPD_AUTOCONF	:= \
+PROFTPD_CONF_TOOL	:= autoconf
+PROFTPD_CONF_OPT	:= \
 	$(CROSS_AUTOCONF_USR) \
 	$(GLOBAL_IPV6_OPTION) \
-	--disable-cap
-
-ifdef PTXCONF_PROFTPD_PAM
-PROFTPD_AUTOCONF += --enable-auth-pam
-else
-PROFTPD_AUTOCONF += --disable-auth-pam
-endif
-
-ifdef PTXCONF_PROFTPD_SENDFILE
-PROFTPD_AUTOCONF += --enable-sendfile
-else
-PROFTPD_AUTOCONF += --disable-sendfile
-endif
-
-ifdef PTXCONF_PROFTPD_SHADOW
-PROFTPD_AUTOCONF += --enable-shadow
-else
-PROFTPD_AUTOCONF += --disable-shadow
-endif
-
-ifdef PTXCONF_PROFTPD_AUTOSHADOW
-PROFTPD_AUTOCONF += --enable-autoshadow
-else
-PROFTPD_AUTOCONF += --disable-autoshadow
-endif
+	--disable-cap \
+	--$(call ptx/endis, PTXCONF_PROFTPD_PAM)-auth-pam \
+	--$(call ptx/endis, PTXCONF_PROFTPD_SENDFILE)-sendfile \
+	--$(call ptx/endis, PTXCONF_PROFTPD_SHADOW)-shadow \
+	--$(call ptx/endis, PTXCONF_PROFTPD_AUTOSHADOW)-autoshadow
 
 PROFTPD_MAKE_PAR := NO
 
-- 
2.32.0