From cd2817f8a6a3c0f7675c3ce954800c29eade5319 Mon Sep 17 00:00:00 2001 From: Prakash Surya Date: Fri, 16 Dec 2011 22:16:47 -0800 Subject: [PATCH] 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 Signed-off-by: Brian Behlendorf Closes #72 --- config/spl-build.m4 | 4 ++-- configure | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/spl-build.m4 b/config/spl-build.m4 index 2297937c0a6..7b6653559e8 100644 --- 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 0546de45747..fc27ad18383 100755 --- 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 -- 2.45.2