Ensure that the shell code generated by AC_PYTHON_MODULE() does not fail if
$PYTHON contains spaces or other separator or metacharacters. Use $() instead
of the obsolete ``. Surround expansion of macro arguments with "" before
passing these to the shell.
Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
---
configure | 42 ++++++++++++++++--------------------------
m4/ac_python_module.m4 | 19 +++++++------------
2 files changed, 23 insertions(+), 38 deletions(-)
diff --git a/configure b/configure
index c82a19b..0eef3a5 100755
--- a/configure
+++ b/configure
@@ -13419,21 +13419,17 @@ fi
if test "$BUILD_LVMDBUSD" = yes; then
# To get this macro, install autoconf-archive package then run autoreconf
- if test -z $PYTHON;
- then
- if test -z "python3";
- then
+ if test -z "$PYTHON"; then
+ if test -z "python3"; then
PYTHON="python3"
else
PYTHON="python3"
fi
fi
- PYTHON_NAME=`basename $PYTHON`
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking $PYTHON_NAME module: pyudev" >&5
-$as_echo_n "checking $PYTHON_NAME module: pyudev... " >&6; }
- $PYTHON -c "import pyudev" 2>/dev/null
- if test $? -eq 0;
- then
+ PYTHON_NAME=$(basename "$PYTHON")
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking \"$PYTHON_NAME module: pyudev\"" >&5
+$as_echo_n "checking \"$PYTHON_NAME module: pyudev\"... " >&6; }
+ if "$PYTHON" -c "import pyudev" 2>/dev/null; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
eval HAVE_PYMOD_PYUDEV=yes
@@ -13442,29 +13438,24 @@ $as_echo "yes" >&6; }
$as_echo "no" >&6; }
eval HAVE_PYMOD_PYUDEV=no
#
- if test -n "Required"
- then
- as_fn_error $? "failed to find required module pyudev" "$LINENO" 5
+ if test -n "Required"; then
+ as_fn_error $? "\"failed to find required module pyudev\"" "$LINENO" 5
exit 1
fi
fi
- if test -z $PYTHON;
- then
- if test -z "python3";
- then
+ if test -z "$PYTHON"; then
+ if test -z "python3"; then
PYTHON="python3"
else
PYTHON="python3"
fi
fi
- PYTHON_NAME=`basename $PYTHON`
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking $PYTHON_NAME module: dbus" >&5
-$as_echo_n "checking $PYTHON_NAME module: dbus... " >&6; }
- $PYTHON -c "import dbus" 2>/dev/null
- if test $? -eq 0;
- then
+ PYTHON_NAME=$(basename "$PYTHON")
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking \"$PYTHON_NAME module: dbus\"" >&5
+$as_echo_n "checking \"$PYTHON_NAME module: dbus\"... " >&6; }
+ if "$PYTHON" -c "import dbus" 2>/dev/null; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
eval HAVE_PYMOD_DBUS=yes
@@ -13473,9 +13464,8 @@ $as_echo "yes" >&6; }
$as_echo "no" >&6; }
eval HAVE_PYMOD_DBUS=no
#
- if test -n "Required"
- then
- as_fn_error $? "failed to find required module dbus" "$LINENO" 5
+ if test -n "Required"; then
+ as_fn_error $? "\"failed to find required module dbus\"" "$LINENO" 5
exit 1
fi
fi
diff --git a/m4/ac_python_module.m4 b/m4/ac_python_module.m4
index f182c48..9ed4eae 100755
--- a/m4/ac_python_module.m4
+++ b/m4/ac_python_module.m4
@@ -27,29 +27,24 @@
AU_ALIAS([AC_PYTHON_MODULE], [AX_PYTHON_MODULE])
AC_DEFUN([AX_PYTHON_MODULE],[
- if test -z $PYTHON;
- then
- if test -z "$3";
- then
+ if test -z "$PYTHON"; then
+ if test -z "$3"; then
PYTHON="python3"
else
PYTHON="$3"
fi
fi
- PYTHON_NAME=`basename $PYTHON`
- AC_MSG_CHECKING($PYTHON_NAME module: $1)
- $PYTHON -c "import $1" 2>/dev/null
- if test $? -eq 0;
- then
+ PYTHON_NAME=$(basename "$PYTHON")
+ AC_MSG_CHECKING(["$PYTHON_NAME module: $1"])
+ if "$PYTHON" -c "import $1" 2>/dev/null; then
AC_MSG_RESULT(yes)
eval AS_TR_CPP(HAVE_PYMOD_$1)=yes
else
AC_MSG_RESULT(no)
eval AS_TR_CPP(HAVE_PYMOD_$1)=no
#
- if test -n "$2"
- then
- AC_MSG_ERROR(failed to find required module $1)
+ if test -n "$2"; then
+ AC_MSG_ERROR(["failed to find required module $1"])
exit 1
fi
fi
--
2.10.1
_______________________________________________
linux-lvm mailing list
linux-lvm@redhat.com
https://www.redhat.com/mailman/listinfo/linux-lvm
read the LVM HOW-TO at http://tldp.org/HOWTO/LVM-HOWTO/
