aboutsummaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorRob Savoye <rob.savoye@linaro.org>2014-04-29 09:56:21 -0600
committerRob Savoye <rob.savoye@linaro.org>2014-04-29 09:56:21 -0600
commit84e68f4525062d3f38e7a54b59e46dc4a08c5cb9 (patch)
tree562ff79c70936c549bcb1c121ebbcb167f2afe12 /configure
parentfc084749ee486ac4ba0b48d23ffcb7877fb1d8e0 (diff)
regenerated
Change-Id: I2330dc8a0b7673d809af2ab06c0baa0bc6784eb6
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure75
1 files changed, 54 insertions, 21 deletions
diff --git a/configure b/configure
index 16b3ab29..079678a8 100755
--- a/configure
+++ b/configure
@@ -3543,7 +3543,9 @@ fi
#packages="git-svn bzr-fastimport svn-all-fast-exp libncurses5-dev texinfo"
packages="texinfo gawk"
-dpkg="`which dpkg`"
+
+### Debian packages ###
+dpkg="`which dpkg 2> /dev/null`"
result=$?
if test ${result} -eq 0; then
# add Ubuntu specific packages
@@ -3551,34 +3553,65 @@ if test ${result} -eq 0; then
packages="${packages} gcc-multilib g++-multilib"
fi
for i in ${packages}; do
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $i is installed" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $i is installed" >&5
$as_echo_n "checking if $i is installed... " >&6; }
-# exists=`dpkg --get-selections | grep -c "^$i\[[:space:]\]*install"`
- exists="`dpkg -l $i | tail -1| cut -d ' ' -f 1`"
- if test x"${exists}" != x'ii'; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, install $i" >&5
+ #exists=`dpkg --get-selections | grep -c "^$i\[[:space:]\]*install"`
+ exists="`dpkg -l $i | tail -1| cut -d ' ' -f 1`"
+ if test x"${exists}" != x'ii'; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, install $i" >&5
$as_echo "no, install $i" >&6; }
- missing="${missing} $i"
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ missing="${missing} $i"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- fi
+ fi
done
+
+### RPM Packages ###
else
- yum="`which yum`"
- result=$?
+yum="`which yum 2> /dev/null`"
+result=$?
+if test ${result} -eq 0; then
for i in ${packages}; do
- exists="`rpm -q -a $i| grep -c $i`"
- if test ${exists} -eq 0; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, install $i" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $i is installed" >&5
+$as_echo_n "checking if $i is installed... " >&6; }
+ exists="`rpm -q -a $i| grep -c $i`"
+ if test ${exists} -eq 0; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, install $i" >&5
$as_echo "no, install $i" >&6; }
- missing="${missing} $i"
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ missing="${missing} $i"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- fi
+ fi
done
-fi
+
+### Arch Packages ###
+else
+pacman="`which pacman 2> /dev/null`"
+result=$?
+if test ${result} -eq 0; then
+ 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; }
+ exists="`pacman -Qs ${i} | wc -l`"
+ if test ${exists} -eq 0; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, install $i" >&5
+$as_echo "no, install $i" >&6; }
+ missing="${missing} $i"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ fi
+ done
+
+### Unknown Packages ###
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unknown package management system" >&5
+$as_echo "$as_me: WARNING: Unknown package management system" >&2;}
+fi # Arch
+fi # RPM
+fi # Debian
BUILDDATE="`date +%Y%m%d`"
@@ -3997,7 +4030,7 @@ fi
if test `lsb_release -i -s` = "Ubuntu"; then
texversion="`dpkg-query -W -f='\${Version}' texinfo | cut -d '.' -f 1`"
if test "${texversion}" -gt 4; then
- MAKEINFO="missing"
+ MAKEINFO="echo"
fi
fi