This reverts commit 48328880fddf0145bdccc499160fb24dfabfbd41.
The --ninja option doesn't need anymore because of upgrade meson to 0.55.2
At that version we can use ninjatool
Signed-off-by: Yonggang Luo <luoyongg...@gmail.com>
---
configure | 16 +---------------
1 file changed, 1 insertion(+), 15 deletions(-)
diff --git a/configure b/configure
index af86ba1db3..dc7cc0f411 100755
--- a/configure
+++ b/configure
@@ -535,7 +535,6 @@ rng_none="no"
secret_keyring=""
libdaxctl=""
meson=""
-ninja=""
skip_meson=no
gettext=""
@@ -1003,8 +1002,6 @@ for opt do
;;
--meson=*) meson="$optarg"
;;
- --ninja=*) ninja="$optarg"
- ;;
--smbd=*) smbd="$optarg"
;;
--extra-cflags=*)
@@ -1777,7 +1774,6 @@ Advanced options (experts only):
--python=PYTHON use specified python [$python]
--sphinx-build=SPHINX use specified sphinx-build [$sphinx_build]
--meson=MESON use specified meson [$meson]
- --ninja=NINJA use specified ninja [$ninja]
--smbd=SMBD use specified smbd [$smbd]
--with-git=GIT use specified git [$git]
--static enable static build [$static]
@@ -2014,16 +2010,6 @@ case "$meson" in
*) meson=$(command -v meson) ;;
esac
-# Probe for ninja (used for compdb)
-
-if test -z "$ninja"; then
- for c in ninja ninja-build samu; do
- if has $c; then
- ninja=$(command -v "$c")
- break
- fi
- done
-fi
# Check that the C compiler works. Doing this here before testing
# the host CPU ensures that we had a valid CC to autodetect the
@@ -7952,7 +7938,7 @@ fi
mv $cross config-meson.cross
rm -rf meson-private meson-info meson-logs
-NINJA=${ninja:-$PWD/ninjatool} $meson setup \
+NINJA=$PWD/ninjatool $meson setup \
--prefix "${pre_prefix}$prefix" \
--libdir "${pre_prefix}$libdir" \
--libexecdir "${pre_prefix}$libexecdir" \
--
2.28.0.windows.1
