From 935234404fb85989fc36be1832b5fdd7b871e6ec Mon Sep 17 00:00:00 2001 From: Richard Yao Date: Tue, 28 Feb 2012 16:23:16 -0500 Subject: [PATCH] Fix distribution detection so that Ubuntu does not identify as Debian --- 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 823f332664e4..a40f91f41010 100644 --- a/config/zfs-build.m4 +++ b/config/zfs-build.m4 @@ -232,6 +232,8 @@ AC_DEFUN([ZFS_AC_DEFAULT_PACKAGE], [ VENDOR=fedora ; elif test -f /etc/gentoo-release ; then VENDOR=gentoo ; + elif test -f /etc/lsb-release ; then + VENDOR=ubuntu ; elif test -f /etc/debian_version ; then VENDOR=debian ; elif test -f /etc/SuSE-release ; then @@ -240,8 +242,6 @@ AC_DEFUN([ZFS_AC_DEFAULT_PACKAGE], [ 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 ; else diff --git a/configure b/configure index d63c1a1dc6f2..0c17a2ee5a24 100755 --- a/configure +++ b/configure @@ -11680,6 +11680,8 @@ $as_echo_n "checking linux distribution... " >&6; } VENDOR=fedora ; elif test -f /etc/gentoo-release ; then VENDOR=gentoo ; + elif test -f /etc/lsb-release ; then + VENDOR=ubuntu ; elif test -f /etc/debian_version ; then VENDOR=debian ; elif test -f /etc/SuSE-release ; then @@ -11688,8 +11690,6 @@ $as_echo_n "checking linux distribution... " >&6; } 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 ; else