From patchwork Sat Dec 15 18:00:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Vorel X-Patchwork-Id: 1013977 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="mASHbvBL"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43HFb829Pdz9s6w for ; Sun, 16 Dec 2018 05:01:08 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729265AbeLOSBD (ORCPT ); Sat, 15 Dec 2018 13:01:03 -0500 Received: from mail-wr1-f65.google.com ([209.85.221.65]:41965 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726641AbeLOSBA (ORCPT ); Sat, 15 Dec 2018 13:01:00 -0500 Received: by mail-wr1-f65.google.com with SMTP id x10so8385687wrs.8 for ; Sat, 15 Dec 2018 10:00:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=US106FVqArz9ZH7QQ9jTKWRrgH0hxPHvos3yQk+dX5A=; b=mASHbvBL65DOR3EB4GomZMebKIXQe59p5vMndfu89z4BHeAeW8gku1/Z2Rx0+5h7OR 3tmptMQ5dW7JvOGjqSK0oVCkJlPMl4LGtEuqhFoDfvlKp01ZceGXVyKKVd0hd+cioNK4 XG0T+P2cEtdsFYuUqpzKBzwrjEYXwOXalrws+VfIJlqoK7oGgHVUcd112VEg56luRXUB Ng7KX/Qu+MY/+AQrJJZKomltVlUmXIHHTJyn/6So8mANUtR94BCYY+ayM2yqA+yzvo3H R+2z1Tdtbf6tr0gS/ajJs2KZmkfnm7CeDprpzC2w2j3pVCHXtWa9/QK6Xk0kTVguJPYF TbRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=US106FVqArz9ZH7QQ9jTKWRrgH0hxPHvos3yQk+dX5A=; b=OnyWxFIhWR/hoaw8e7vCd4i1eXmHzHRxV1LZVdf2ZuO0VdaiKV3vskV5rtz95YXq0H l5fNlNoDJUdiYKe669fI7vsKffVTjOciruLEZi5Bbn6y2Y7jeMRresaN7nLAd+bvb3l/ wrsDrofA9mioSjO7itXFpBSub60pEV3Cw7KL/Upm67VXmPNM8DiAkEN6f24V7AkE8kHH PwVcEsnzDDk1JFkxG+QCbsJPQ5p5+3XqH1hzWrIys46Imtv3VQsSRZQEzKzH36Um3ejl T8Ce+sa0uX6H73VWdZKRmQzE7M8Ji4pvx9Alj5a2QbaGe4yfFEMCF2+mv4FL+sZDU5SK wEqg== X-Gm-Message-State: AA+aEWYSBmzNeDspJtPyJLIh4IhdVbrp81dYpJXUr2rq/Kn1cljt41L0 MNYHfcZPEjv06G734968kgC25Zyc X-Google-Smtp-Source: AFSGD/VBhYqabo9YaAHm3Bu3XoqOVifUOGhwrVfIEQT6hBkOcdn9yXwVzJXn5ROHCgXF2G9tyO8OgQ== X-Received: by 2002:adf:fe43:: with SMTP id m3mr5379101wrs.290.1544896857987; Sat, 15 Dec 2018 10:00:57 -0800 (PST) Received: from x230.suse.cz ([62.201.25.198]) by smtp.gmail.com with ESMTPSA id a62sm8184597wmf.47.2018.12.15.10.00.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 15 Dec 2018 10:00:57 -0800 (PST) From: Petr Vorel To: netdev@vger.kernel.org Cc: Petr Vorel , Stephen Hemminger Subject: [PATCH RESENT iproute2 5/7] configure: Minor code cleanup Date: Sat, 15 Dec 2018 19:00:42 +0100 Message-Id: <20181215180044.22868-5-petr.vorel@gmail.com> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20181215180044.22868-1-petr.vorel@gmail.com> References: <20181215180044.22868-1-petr.vorel@gmail.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Petr Vorel --- configure | 71 ++++++++++++++++--------------------------------------- 1 file changed, 20 insertions(+), 51 deletions(-) diff --git a/configure b/configure index c88247d8..b85eb58b 100755 --- a/configure +++ b/configure @@ -32,9 +32,7 @@ int main(int argc, char **argv) { } EOF - $CC -I$INCLUDE -o $TMPDIR/atmtest $TMPDIR/atmtest.c -latm >/dev/null 2>&1 - if [ $? -eq 0 ] - then + if $CC -I$INCLUDE -o $TMPDIR/atmtest $TMPDIR/atmtest.c -latm >/dev/null 2>&1; then echo "TC_CONFIG_ATM:=y" >>$CONFIG echo yes else @@ -45,8 +43,7 @@ EOF check_xtables() { - if ! ${PKG_CONFIG} xtables --exists - then + if ! ${PKG_CONFIG} xtables --exists; then echo "TC_CONFIG_NO_XT:=y" >>$CONFIG fi } @@ -74,8 +71,7 @@ int main(int argc, char **argv) EOF if $CC -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL \ - $(${PKG_CONFIG} xtables --cflags --libs) -ldl >/dev/null 2>&1 - then + $(${PKG_CONFIG} xtables --cflags --libs) -ldl >/dev/null 2>&1; then echo "TC_CONFIG_XT:=y" >>$CONFIG echo "using xtables" fi @@ -85,10 +81,7 @@ EOF check_xt_old() { # bail if previous XT checks has already succeeded. - if grep -q TC_CONFIG_XT $CONFIG - then - return - fi + grep -q TC_CONFIG_XT $CONFIG && return #check if we don't need our internal header .. cat >$TMPDIR/ipttest.c </dev/null 2>&1 - if [ $? -eq 0 ] - then + if $CC -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL -ldl >/dev/null 2>&1; then echo "TC_CONFIG_XT_OLD:=y" >>$CONFIG echo "using old xtables (no need for xt-internal.h)" fi @@ -124,10 +115,7 @@ EOF check_xt_old_internal_h() { # bail if previous XT checks has already succeeded. - if grep -q TC_CONFIG_XT $CONFIG - then - return - fi + grep -q if grep -q TC_CONFIG_XT $CONFIG && return #check if we need our own internal.h cat >$TMPDIR/ipttest.c </dev/null 2>&1 - - if [ $? -eq 0 ] - then + if $CC -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL -ldl >/dev/null 2>&1; then echo "using old xtables with xt-internal.h" echo "TC_CONFIG_XT_OLD_H:=y" >>$CONFIG fi @@ -163,8 +148,7 @@ EOF check_ipt() { - if ! grep TC_CONFIG_XT $CONFIG > /dev/null - then + if ! grep TC_CONFIG_XT $CONFIG > /dev/null; then echo "using iptables" fi } @@ -178,8 +162,7 @@ check_ipt_lib_dir() return fi - for dir in /lib /usr/lib /usr/local/lib - do + for dir in /lib /usr/lib /usr/local/lib; do for file in "xtables" "iptables"; do file="$dir/$file/lib*t_*so" if [ -f $file ]; then @@ -202,9 +185,7 @@ int main(int argc, char **argv) return 0; } EOF - $CC -I$INCLUDE -o $TMPDIR/setnstest $TMPDIR/setnstest.c >/dev/null 2>&1 - if [ $? -eq 0 ] - then + if $CC -I$INCLUDE -o $TMPDIR/setnstest $TMPDIR/setnstest.c >/dev/null 2>&1; then echo "IP_CONFIG_SETNS:=y" >>$CONFIG echo "yes" echo "CFLAGS += -DHAVE_SETNS" >>$CONFIG @@ -235,8 +216,7 @@ int main(void) #endif EOF - if $CC -I$INCLUDE -o $TMPDIR/ipsettest $TMPDIR/ipsettest.c >/dev/null 2>&1 - then + if $CC -I$INCLUDE -o $TMPDIR/ipsettest $TMPDIR/ipsettest.c >/dev/null 2>&1; then echo "TC_CONFIG_IPSET:=y" >>$CONFIG echo "yes" else @@ -247,8 +227,7 @@ EOF check_elf() { - if ${PKG_CONFIG} libelf --exists - then + if ${PKG_CONFIG} libelf --exists; then echo "HAVE_ELF:=y" >>$CONFIG echo "yes" @@ -262,8 +241,7 @@ check_elf() check_selinux() # SELinux is a compile time option in the ss utility { - if ${PKG_CONFIG} libselinux --exists - then + if ${PKG_CONFIG} libselinux --exists; then echo "HAVE_SELINUX:=y" >>$CONFIG echo "yes" @@ -276,8 +254,7 @@ check_selinux() check_mnl() { - if ${PKG_CONFIG} libmnl --exists - then + if ${PKG_CONFIG} libmnl --exists; then echo "HAVE_MNL:=y" >>$CONFIG echo "yes" @@ -299,9 +276,7 @@ int main(int argc, char **argv) { return 0; } EOF - $CC -I$INCLUDE -o $TMPDIR/dbtest $TMPDIR/dbtest.c -ldb >/dev/null 2>&1 - if [ $? -eq 0 ] - then + if $CC -I$INCLUDE -o $TMPDIR/dbtest $TMPDIR/dbtest.c -ldb >/dev/null 2>&1; then echo "HAVE_BERKELEY_DB:=y" >>$CONFIG echo "yes" else @@ -320,13 +295,10 @@ int main(int argc, char **argv) { return 0; } EOF - $CC -I$INCLUDE -o $TMPDIR/strtest $TMPDIR/strtest.c >/dev/null 2>&1 - if [ $? -eq 0 ] - then + if $CC -I$INCLUDE -o $TMPDIR/strtest $TMPDIR/strtest.c >/dev/null 2>&1; then echo "no" else - if ${PKG_CONFIG} libbsd --exists - then + if ${PKG_CONFIG} libbsd --exists; then echo 'CFLAGS += -DHAVE_LIBBSD' `${PKG_CONFIG} libbsd --cflags` >>$CONFIG echo 'LDLIBS +=' `${PKG_CONFIG} libbsd --libs` >> $CONFIG echo "no" @@ -340,8 +312,7 @@ EOF check_cap() { - if ${PKG_CONFIG} libcap --exists - then + if ${PKG_CONFIG} libcap --exists; then echo "HAVE_CAP:=y" >>$CONFIG echo "yes" @@ -389,8 +360,7 @@ echo -n " ATM " check_atm check_xtables -if ! grep -q TC_CONFIG_NO_XT $CONFIG -then +if ! grep -q TC_CONFIG_NO_XT $CONFIG; then echo -n " IPT " check_xt check_xt_old @@ -402,8 +372,7 @@ then fi echo -if ! grep -q TC_CONFIG_NO_XT $CONFIG -then +if ! grep -q TC_CONFIG_NO_XT $CONFIG; then echo -n "iptables modules directory: " check_ipt_lib_dir fi