From: Hangbin Liu <haliu@redhat.com>
To: David Ahern <dsahern@gmail.com>
Cc: Stephen Hemminger <stephen@networkplumber.org>,
netdev@vger.kernel.org, Hangbin Liu <haliu@redhat.com>
Subject: [PATCH iproute2-next 1/2] configure: add options ability
Date: Mon, 31 May 2021 17:47:39 +0800 [thread overview]
Message-ID: <20210531094740.2483122-2-haliu@redhat.com> (raw)
In-Reply-To: <20210531094740.2483122-1-haliu@redhat.com>
There are more and more global environment variables that land everywhere
in configure, which is making user hard to know which one does what.
Using command-line options would make it easier for users to learn or
remember the config options.
This patch converts the INCLUDE variable to command option first. Check
if the first variable has '-' to compile with the old INCLUDE path
setting method.
Signed-off-by: Hangbin Liu <haliu@redhat.com>
---
configure | 31 ++++++++++++++++++++++++++++++-
1 file changed, 30 insertions(+), 1 deletion(-)
diff --git a/configure b/configure
index 179eae08..c58419c2 100755
--- a/configure
+++ b/configure
@@ -7,7 +7,7 @@
# off: disable libbpf probing
# LIBBPF_DIR Path to libbpf DESTDIR to use
-INCLUDE=${1:-"$PWD/include"}
+INCLUDE="$PWD/include"
# Output file which is input to Makefile
CONFIG=config.mk
@@ -486,6 +486,35 @@ endif
EOF
}
+usage()
+{
+ cat <<EOF
+Usage: $0 [OPTIONS]
+ --include_dir Path to iproute2 include dir
+ -h | --help Show this usage info
+EOF
+ exit $1
+}
+
+# Compat with the old INCLUDE path setting method.
+if [ $# -eq 1 ] && [ "$(echo $1 | cut -c 1)" != '-' ]; then
+ INCLUDE="$1"
+else
+ while true; do
+ case "$1" in
+ --include_dir)
+ INCLUDE=$2
+ shift 2 ;;
+ -h | --help)
+ usage 0 ;;
+ "")
+ break ;;
+ *)
+ usage 1 ;;
+ esac
+ done
+fi
+
echo "# Generated config based on" $INCLUDE >$CONFIG
quiet_config >> $CONFIG
--
2.26.3
next prev parent reply other threads:[~2021-05-31 9:48 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-31 9:47 [PATCH iproute2-next 0/2] configure: convert global env to command-line options Hangbin Liu
2021-05-31 9:47 ` Hangbin Liu [this message]
2021-05-31 9:47 ` [PATCH iproute2-next 2/2] configure: convert LIBBPF environment variables " Hangbin Liu
2021-06-03 3:28 ` [PATCH iproute2-next 0/2] configure: convert global env " David Ahern
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210531094740.2483122-2-haliu@redhat.com \
--to=haliu@redhat.com \
--cc=dsahern@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=stephen@networkplumber.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).