diff options
| author | Siddhesh Poyarekar <siddhesh.poyarekar@linaro.org> | 2017-11-14 19:21:03 +0530 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2017-12-05 17:30:41 +0000 |
| commit | 873be80c73a151015c7ce7d13d3d5b15550698e3 (patch) | |
| tree | 8db7398c793c7a1d876007c5e47424f1b16e6c7e | |
| parent | a96b53fcbd4da53eb97a831f60e3f2a41ce09053 (diff) | |
Fix python-devel check on Fedora
Change-Id: I87921bf18fa2dfbd44eb1540f40567e50ef0f406
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | configure.ac | 4 |
2 files changed, 4 insertions, 4 deletions
@@ -3616,14 +3616,14 @@ $as_echo "yes" >&6; } ### RPM Packages ### else if which rpm > /dev/null; then - packages="${packages} ncurses-devel python-devel" + packages="${packages} ncurses-devel python[23]?-devel" for i in ${packages}; do { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $i is installed" >&5 $as_echo_n "checking if $i is installed... " >&6; } # RPM based systems might install via meta-packages but the rpm database # can't be searched on meta-package name, so strip off any trailing # information when searching the rpm database. - exists="`rpm -q -a ${i//.*/}| grep -c ${i//.*/}`" + exists="`rpm -q -a ${i//.*/}| grep -c -E \"${i//.*/}\"`" if test ${exists:-0} -eq 0; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, install $i" >&5 $as_echo "no, install $i" >&6; } diff --git a/configure.ac b/configure.ac index cef91137..8710861f 100644 --- a/configure.ac +++ b/configure.ac @@ -161,13 +161,13 @@ if test ${deb} -ge 1; then ### RPM Packages ### else if which rpm > /dev/null; then - packages="${packages} ncurses-devel python-devel" + packages="${packages} ncurses-devel python[23]?-devel" for i in ${packages}; do AC_MSG_CHECKING([if $i is installed]) # RPM based systems might install via meta-packages but the rpm database # can't be searched on meta-package name, so strip off any trailing # information when searching the rpm database. - exists="`rpm -q -a ${i//.*/}| grep -c ${i//.*/}`" + exists="`rpm -q -a ${i//.*/}| grep -c -E \"${i//.*/}\"`" if test ${exists:-0} -eq 0; then AC_MSG_RESULT([no, install $i]) missing="${missing} $i" |