From patchwork Sat Sep 22 21:24:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Vorel X-Patchwork-Id: 973623 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="ijQG8KHL"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42Hk5V3rhrz9sBn for ; Sun, 23 Sep 2018 07:25:18 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728304AbeIWDUK (ORCPT ); Sat, 22 Sep 2018 23:20:10 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:36800 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728189AbeIWDUK (ORCPT ); Sat, 22 Sep 2018 23:20:10 -0400 Received: by mail-wr1-f68.google.com with SMTP id e1-v6so16050489wrt.3 for ; Sat, 22 Sep 2018 14:25:08 -0700 (PDT) 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=lEB6wF7tPWN68KdK6KatxykV0btD2HTOJgl7jvQH6MM=; b=ijQG8KHLwjWOjXHMmSIcwHXDntvWEoQKN7fnRn1BfRjowOaNUf/J57nPEhngPgMCkt lucNF2MM0cmKFlwPZWhea0vbNTlLbWM6qKUbpYkdKE3EUaHHl6q2v36RpkvBA+2IQwLC 5qzD1i0maFAj8GVghicNJIeMLOW38goctn2bm4yg20Wt1xmp62g0bflod7pUXXhY0OJE V242aA9ysgQpZPcxoWhodDZN3R5/SjuisEPjgthkX4TinQBgHMD5MbBpyalkojY28RBj O0pzZd6eMOTii4N4WoQCvzx7upGBm6upNFmKGGaK9LYCg2KB8ASYiyNhShCmYi1dIikU n5cA== 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=lEB6wF7tPWN68KdK6KatxykV0btD2HTOJgl7jvQH6MM=; b=osTK/SEwA5xfNdcqZHCBMAwK//FbrIWTBD/vxWsxRlfh+qx4EVHprgp4mtD+t0d2sH oTHIe51WbqbOc/+cSADi09IQLjF4ZcgyeTVAUSj32Oq/IOYoIqXl5JrspkXGDLTuZc7Q lQaPfi3TtvcMKjvb0kB6Upp0rGBoECjaPBGnZkV1cl2bpSHkB/neqWYq+rVvyoXOg8p1 n0WrDQJhRYqG/bE+6ZlDnMe+wYlZ66YoIFT9dX2IWxS1CRmsZAil02CE+jXRYsh2Y2Z9 2Oqhr86nLVxwvHBf+KomGzpYPj01U1GByR2g7/c3id+KkF52KwGY3xCdINZ1XzYu4yGk /Fsw== X-Gm-Message-State: ABuFfohIscS8AJ6O6jfUXhBFNtbyghmlI/EbKKMdRgEytkYxkGtOO3M/ 4mKHuubxJAb+yBhkoN2MYhUCrNMv X-Google-Smtp-Source: ACcGV62lx1p47JzVpOkScQ0Fsul0LeJsE1arNd0NQMj/djNOxGyYW+uaNmQ1d/zPNrWgoSW3+d8CTQ== X-Received: by 2002:adf:df0f:: with SMTP id y15-v6mr2789274wrl.26.1537651507560; Sat, 22 Sep 2018 14:25:07 -0700 (PDT) Received: from localhost.localdomain ([85.119.94.113]) by smtp.gmail.com with ESMTPSA id 75-v6sm16110032wml.21.2018.09.22.14.25.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 22 Sep 2018 14:25:06 -0700 (PDT) From: Petr Vorel To: netdev@vger.kernel.org Cc: Petr Vorel , Stephen Hemminger Subject: [PATCH iproute2 5/7] configure: Code cleanup Date: Sat, 22 Sep 2018 23:24:49 +0200 Message-Id: <20180922212451.327-6-petr.vorel@gmail.com> X-Mailer: git-send-email 2.19.0.rc2 In-Reply-To: <20180922212451.327-1-petr.vorel@gmail.com> References: <20180922212451.327-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 | 65 +++++++++++++++---------------------------------------- 1 file changed, 18 insertions(+), 47 deletions(-) diff --git a/configure b/configure index 8f4a7f1e..86c4cf58 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 } @@ -85,10 +82,7 @@ EOF check_xt_old() { # bail if previous XT checks has already succeded. - if grep -q TC_CONFIG_XT $CONFIG - then - return - fi + grep -q TC_CONFIG_XT $CONFIG && return #check if we dont 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 +116,7 @@ EOF check_xt_old_internal_h() { # bail if previous XT checks has already succeded. - if grep -q TC_CONFIG_XT $CONFIG - then - return - fi + 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 +149,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 +163,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 +186,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 +217,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 +228,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 +242,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 +255,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 +277,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,9 +296,7 @@ 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 echo 'CFLAGS += -DNEED_STRLCPY' >>$CONFIG @@ -333,8 +307,7 @@ EOF check_cap() { - if ${PKG_CONFIG} libcap --exists - then + if ${PKG_CONFIG} libcap --exists; then echo "HAVE_CAP:=y" >>$CONFIG echo "yes" @@ -382,8 +355,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 @@ -395,8 +367,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