|
 |
049c96 |
From 1ded94f66819e69ddf8a3e68924d978873ac400e Mon Sep 17 00:00:00 2001
|
|
|
049c96 |
From: Phil Sutter <psutter@redhat.com>
|
|
|
049c96 |
Date: Sat, 9 Jul 2016 11:29:56 +0200
|
|
|
049c96 |
Subject: [PATCH] configure: Add check for the doc tools
|
|
|
049c96 |
|
|
|
049c96 |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1342515
|
|
|
049c96 |
Upstream Status: iproute2.git commit 10ed8b7f67513
|
|
|
049c96 |
|
|
|
049c96 |
commit 10ed8b7f6751305c78596bd5b8732bfccbd69e21
|
|
|
049c96 |
Author: vadimk <vadim4j@gmail.com>
|
|
|
049c96 |
Date: Sun Nov 30 18:08:25 2014 +0200
|
|
|
049c96 |
|
|
|
049c96 |
configure: Add check for the doc tools
|
|
|
049c96 |
|
|
|
049c96 |
Added checking existence of the doc files converters.
|
|
|
049c96 |
If the XXX tool exists then HAVE_XXX:=y will be written
|
|
|
049c96 |
to the Config file. Example of the configure script output:
|
|
|
049c96 |
|
|
|
049c96 |
TC schedulers
|
|
|
049c96 |
ATM no
|
|
|
049c96 |
IPT using xtables
|
|
|
049c96 |
IPSET yes
|
|
|
049c96 |
|
|
|
049c96 |
iptables modules directory: /usr/lib/iptables
|
|
|
049c96 |
libc has setns: yes
|
|
|
049c96 |
SELinux support: no
|
|
|
049c96 |
|
|
|
049c96 |
Docs
|
|
|
049c96 |
latex: no
|
|
|
049c96 |
WARNING: no docs can be built from LaTeX files
|
|
|
049c96 |
sgml2html: yes
|
|
|
049c96 |
|
|
|
049c96 |
Signed-off-by: Vadim Kochan <vadim4j@gmail.com>
|
|
|
049c96 |
---
|
|
|
049c96 |
configure | 23 ++++++++++++++++++++++-
|
|
|
049c96 |
1 file changed, 22 insertions(+), 1 deletion(-)
|
|
|
049c96 |
|
|
|
049c96 |
diff --git a/configure b/configure
|
|
|
049c96 |
index d5170f0..c3dacdb 100755
|
|
|
049c96 |
--- a/configure
|
|
|
049c96 |
+++ b/configure
|
|
|
049c96 |
@@ -7,6 +7,24 @@ INCLUDE=${1:-"$PWD/include"}
|
|
|
049c96 |
TMPDIR=$(mktemp -d config.XXXXXX)
|
|
|
049c96 |
trap 'status=$?; rm -rf $TMPDIR; exit $status' EXIT HUP INT QUIT TERM
|
|
|
049c96 |
|
|
|
049c96 |
+check_prog()
|
|
|
049c96 |
+{
|
|
|
049c96 |
+ echo -n "$2"
|
|
|
049c96 |
+ command -v $1 >/dev/null 2>&1 && (echo "$3:=y" >> Config; echo "yes") || (echo "no"; return 1)
|
|
|
049c96 |
+}
|
|
|
049c96 |
+
|
|
|
049c96 |
+check_docs()
|
|
|
049c96 |
+{
|
|
|
049c96 |
+ if check_prog latex " latex: " HAVE_LATEX; then
|
|
|
049c96 |
+ check_prog pdflatex " pdflatex: " HAVE_PDFLATEX || echo " WARNING: no PDF docs can be built from LaTeX files"
|
|
|
049c96 |
+ check_prog sgml2latex " sgml2latex: " HAVE_SGML2LATEX || echo " WARNING: no LaTeX files can be build from SGML files"
|
|
|
049c96 |
+ else
|
|
|
049c96 |
+ echo " WARNING: no docs can be built from LaTeX files"
|
|
|
049c96 |
+ fi
|
|
|
049c96 |
+
|
|
|
049c96 |
+ check_prog sgml2html " sgml2html: " HAVE_SGML2HTML || echo " WARNING: no HTML docs can be built from SGML"
|
|
|
049c96 |
+}
|
|
|
049c96 |
+
|
|
|
049c96 |
check_toolchain()
|
|
|
049c96 |
{
|
|
|
049c96 |
: ${PKG_CONFIG:=pkg-config}
|
|
|
049c96 |
@@ -260,7 +278,7 @@ check_ipt
|
|
|
049c96 |
echo -n " IPSET "
|
|
|
049c96 |
check_ipset
|
|
|
049c96 |
|
|
|
049c96 |
-echo -n "iptables modules directory: "
|
|
|
049c96 |
+echo -n -e "\niptables modules directory: "
|
|
|
049c96 |
check_ipt_lib_dir
|
|
|
049c96 |
|
|
|
049c96 |
echo -n "libc has setns: "
|
|
|
049c96 |
@@ -268,3 +286,6 @@ check_setns
|
|
|
049c96 |
|
|
|
049c96 |
echo -n "SELinux support: "
|
|
|
049c96 |
check_selinux
|
|
|
049c96 |
+
|
|
|
049c96 |
+echo -e "\nDocs"
|
|
|
049c96 |
+check_docs
|
|
|
049c96 |
--
|
|
|
049c96 |
1.8.3.1
|
|
|
049c96 |
|