Move Arch Linux's VENDOR check above Ubuntu's

If the lsb-release package is installed on an Arch Linux distribution,
the configure step will incorrectly detect the running distribution as
Ubuntu. This is a result of both distributions providing an
/etc/lsb-release file, and the Ubuntu VENDOR check being performed
first.

Since the Arch Linux test check's for a file more specific to the Arch
Linux distribution, moving Arch Linux's VENDOR check above Unbuntu's
check provides a quick and easy solution.

Signed-off-by: Prakash Surya <surya1@llnl.gov>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #72

diff --git a/config/spl-build.m4 b/config/spl-build.m4
index 2297937c0a6466913969f5a7c4ce45958f39fd3a..7b6653559e89a66d6f179f4a4df0f3b8716efc19 100644 (file)
--- a/config/spl-build.m4
+++ b/config/spl-build.m4
@@ -373,6 +373,8 @@ AC_DEFUN([SPL_AC_DEFAULT_PACKAGE], [
                VENDOR=redhat ;
        elif test -f /etc/fedora-release ; then
                VENDOR=fedora ;
+       elif test -f /etc/arch-release ; then
+               VENDOR=arch ;
        elif test -f /etc/lsb-release ; then
                VENDOR=ubuntu ;
        elif test -f /etc/debian_version ; then
@@ -383,8 +385,6 @@ AC_DEFUN([SPL_AC_DEFAULT_PACKAGE], [
                VENDOR=slackware ;
        elif test -f /etc/gentoo-release ; then
                VENDOR=gentoo ;
-       elif test -f /etc/arch-release ; then
-               VENDOR=arch ;
        else
                VENDOR= ;
        fi

diff --git a/configure b/configure
index 0546de4574728b6a4a4a555045c7ab5416588ce9..fc27ad1838389120c7056cabd08797e50dceb601 100755 (executable)
--- a/configure
+++ b/configure
@@ -11665,6 +11665,8 @@ $as_echo_n "checking linux distribution... " >&6; }
                VENDOR=redhat ;
        elif test -f /etc/fedora-release ; then
                VENDOR=fedora ;
+       elif test -f /etc/arch-release ; then
+               VENDOR=arch ;
        elif test -f /etc/lsb-release ; then
                VENDOR=ubuntu ;
        elif test -f /etc/debian_version ; then
@@ -11675,8 +11677,6 @@ $as_echo_n "checking linux distribution... " >&6; }
                VENDOR=slackware ;
        elif test -f /etc/gentoo-release ; then
                VENDOR=gentoo ;
-       elif test -f /etc/arch-release ; then
-               VENDOR=arch ;
        else
                VENDOR= ;
        fi