From 8eaa020b46e80b09cc5f924b90809e219ce08e75 Mon Sep 17 00:00:00 2001 From: Prakash Surya Date: Fri, 16 Dec 2011 22:32:54 -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 --- config/zfs-build.m4 | 4 ++-- configure | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/zfs-build.m4 b/config/zfs-build.m4 index 5977131..b6a1800 100644 --- a/config/zfs-build.m4 +++ b/config/zfs-build.m4 @@ -234,12 +234,12 @@ AC_DEFUN([ZFS_AC_DEFAULT_PACKAGE], [ VENDOR=sles ; elif test -f /etc/slackware-version ; then VENDOR=slackware ; + elif test -f /etc/arch-release ; then + VENDOR=arch ; elif test -f /etc/lsb-release ; then VENDOR=ubuntu ; elif test -f /etc/lunar.release ; then VENDOR=lunar ; - elif test -f /etc/arch-release ; then - VENDOR=arch ; else VENDOR= ; fi diff --git a/configure b/configure index e9e2ec1..d6f405b 100755 --- a/configure +++ b/configure @@ -11859,12 +11859,12 @@ $as_echo_n "checking linux distribution... " >&6; } VENDOR=sles ; elif test -f /etc/slackware-version ; then VENDOR=slackware ; + elif test -f /etc/arch-release ; then + VENDOR=arch ; elif test -f /etc/lsb-release ; then VENDOR=ubuntu ; elif test -f /etc/lunar.release ; then VENDOR=lunar ; - elif test -f /etc/arch-release ; then - VENDOR=arch ; else VENDOR= ; fi -- 1.8.3.1