diff options
| author | Brian Behlendorf <[email protected]> | 2012-03-05 10:22:23 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2012-03-05 10:38:38 -0800 |
| commit | a3a69b74cdeb955b6924a534b809810e831b94fa (patch) | |
| tree | 78448ccc800533255284523e640c4e14a4d8283e /config/spl-build.m4 | |
| parent | 3c208a5480960c9610676dbabeee35fd8b8bb3d8 (diff) | |
Fix distribution detection
Improve the distribution detection by moving the tests for
distribution specific files first. The Ubuntu and Debian
checks are left for last because they are the least likely
to be unique. This is particularly true in the case of Debian
since so many distributions are based on Debian.
Since this is currently only used to identify the correct
packaging method for this system the result in many instances
is simply cosmetic.
Signed-off-by: Brian Behlendorf <[email protected]>
Diffstat (limited to 'config/spl-build.m4')
| -rw-r--r-- | config/spl-build.m4 | 39 |
1 files changed, 23 insertions, 16 deletions
diff --git a/config/spl-build.m4 b/config/spl-build.m4 index eee950c67..6605b826d 100644 --- a/config/spl-build.m4 +++ b/config/spl-build.m4 @@ -371,22 +371,26 @@ dnl # package type for 'make pkg': (rpm | deb | tgz) dnl # AC_DEFUN([SPL_AC_DEFAULT_PACKAGE], [ AC_MSG_CHECKING([linux distribution]) - if test -f /etc/redhat-release ; then - VENDOR=redhat ; + if test -f /etc/toss-release ; then + VENDOR=toss ; elif test -f /etc/fedora-release ; then VENDOR=fedora ; + elif test -f /etc/redhat-release ; then + VENDOR=redhat ; + elif test -f /etc/gentoo-release ; then + VENDOR=gentoo ; 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 - VENDOR=debian ; elif test -f /etc/SuSE-release ; then VENDOR=sles ; elif test -f /etc/slackware-version ; then VENDOR=slackware ; - elif test -f /etc/gentoo-release ; then - VENDOR=gentoo ; + elif test -f /etc/lunar.release ; then + VENDOR=lunar ; + elif test -f /etc/lsb-release ; then + VENDOR=ubuntu ; + elif test -f /etc/debian_version ; then + VENDOR=debian ; else VENDOR= ; fi @@ -395,14 +399,17 @@ AC_DEFUN([SPL_AC_DEFAULT_PACKAGE], [ AC_MSG_CHECKING([default package type]) case "$VENDOR" in - fedora) DEFAULT_PACKAGE=rpm ;; - redhat) DEFAULT_PACKAGE=rpm ;; - sles) DEFAULT_PACKAGE=rpm ;; - ubuntu) DEFAULT_PACKAGE=deb ;; - debian) DEFAULT_PACKAGE=deb ;; - slackware) DEFAULT_PACKAGE=tgz ;; - arch) DEFAULT_PACKAGE=arch;; - *) DEFAULT_PACKAGE=rpm ;; + toss) DEFAULT_PACKAGE=rpm ;; + redhat) DEFAULT_PACKAGE=rpm ;; + fedora) DEFAULT_PACKAGE=rpm ;; + gentoo) DEFAULT_PACKAGE=tgz ;; + arch) DEFAULT_PACKAGE=arch ;; + sles) DEFAULT_PACKAGE=rpm ;; + slackware) DEFAULT_PACKAGE=tgz ;; + lunar) DEFAULT_PACKAGE=tgz ;; + ubuntu) DEFAULT_PACKAGE=deb ;; + debian) DEFAULT_PACKAGE=deb ;; + *) DEFAULT_PACKAGE=rpm ;; esac AC_MSG_RESULT([$DEFAULT_PACKAGE]) |