Fix configure for RHEL and clean up for Arch.

Initial patch contributed by Scott Telford.

Change-Id: I3d6165027bd43e9c236f33398f59572899bab66c

2 files changed, 17 insertions, 11 deletions

diff --git a/configure b/configure
index f26adf46..e722bc34 100755
--- a/configure
+++ b/configure
@@ -661,6 +661,7 @@ infodir
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -753,6 +754,7 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1005,6 +1007,15 @@ do
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
+  -runstatedir | --runstatedir | --runstatedi | --runstated \
+  | --runstate | --runstat | --runsta | --runst | --runs \
+  | --run | --ru | --r)
+    ac_prev=runstatedir ;;
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+  | --run=* | --ru=* | --r=*)
+    runstatedir=$ac_optarg ;;
+
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1142,7 +1153,7 @@ fi
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
+		libdir localedir mandir runstatedir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1295,6 +1306,7 @@ Fine tuning of the installation directories:
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -3642,7 +3654,6 @@ fi
 
 # Figure out which packaging system is in use. Since it's possible to
 # install both on a system.
-rpm="`uname -a | grep -ic '\.fc[0-9].\.'`"
 deb="`uname -a | grep -ic 'ubuntu'`"
 deb=$(($deb + `uname -a | grep -ic 'debian'`))
 
@@ -3675,7 +3686,7 @@ $as_echo "yes" >&6; }
 
 ### RPM Packages ###
 else
-if test ${rpm} -eq 1; then
+if which rpm > /dev/null; then
     packages="${packages} ncurses-devel python-devel"
     for i in ${packages}; do
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $i is installed" >&5
@@ -3696,9 +3707,7 @@ $as_echo "yes" >&6; }
 
 ### Arch Packages ###
 else
-pacman="`which pacman 2> /dev/null`"
-result=$?
-if test ${result} -eq 0; then
+if which pacman > /dev/null; 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; }
diff --git a/configure.ac b/configure.ac
index f9dd7b7d..e08ea5e1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -149,7 +149,6 @@ AC_CHECK_LIB(z, gzread)
 
 # Figure out which packaging system is in use. Since it's possible to
 # install both on a system.
-rpm="`uname -a | grep -ic '\.fc[[0-9]].\.'`"
 deb="`uname -a | grep -ic 'ubuntu'`"
 deb=$(($deb + `uname -a | grep -ic 'debian'`))
 
@@ -182,7 +181,7 @@ if test ${deb} -ge 1; then
 
 ### RPM Packages ###
 else
-if test ${rpm} -eq 1; then
+if which rpm > /dev/null; then
     packages="${packages} ncurses-devel python-devel"
     for i in ${packages}; do
         AC_MSG_CHECKING([if $i is installed])
@@ -200,9 +199,7 @@ if test ${rpm} -eq 1; then
 
 ### Arch Packages ###
 else
-pacman="`which pacman 2> /dev/null`"
-result=$?
-if test ${result} -eq 0; then
+if which pacman > /dev/null; then
     for i in ${packages}; do
         AC_MSG_CHECKING([if $i is installed])
         exists="`pacman -Qs ${i} | wc -l`"