Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Run ZFS_AC_PACMAN only if $VENDOR is "arch" 

Unfortunately, Arch's package manager `pacman` shares it's name with a
popular arcade video game. Thus, in order to refrain from executing the
video game when we mean to execute the package manager, ZFS_AC_PACMAN is
now only run when $VENDOR is determined to be "arch".

Signed-off-by: Prakash Surya <surya1@llnl.gov>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #517
This commit is contained in:
Prakash Surya 2012-01-12 17:24:05 -08:00 committed by Brian Behlendorf
parent e18be9a637
commit 58d956b085
2 changed files with 87 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config/zfs-build.m4
View File

@ -294,9 +294,10 @@ dnl #
dnl # Default ZFS package configuration
dnl #
AC_DEFUN([ZFS_AC_PACKAGE], [
ZFS_AC_DEFAULT_PACKAGE
ZFS_AC_RPM
ZFS_AC_DPKG
ZFS_AC_ALIEN
ZFS_AC_PACMAN
ZFS_AC_DEFAULT_PACKAGE
AS_IF([test "$VENDOR" = "arch"], [ZFS_AC_PACMAN])
])

164
configure vendored
View File

@ -813,10 +813,6 @@ LINUX
NO_UNUSED_BUT_SET_VARIABLE
ZFS_CONFIG
TARGET_ASM_DIR
DEFAULT_INIT_SCRIPT
DEFAULT_INIT_DIR
DEFAULT_PACKAGE
VENDOR
MAKEPKG_VERSION
MAKEPKG
HAVE_MAKEPKG
@ -838,6 +834,10 @@ HAVE_RPMBUILD
RPM_VERSION
RPM
HAVE_RPM
DEFAULT_INIT_SCRIPT
DEFAULT_INIT_DIR
DEFAULT_PACKAGE
VENDOR
am__fastdepCCAS_FALSE
am__fastdepCCAS_TRUE
CCASDEPMODE
@ -11671,6 +11671,83 @@ $as_echo "$ZFS_META_LICENSE" >&6; }
{ $as_echo "$as_me:$LINENO: checking linux distribution" >&5
$as_echo_n "checking linux distribution... " >&6; }
if test -f /etc/redhat-release ; then
VENDOR=redhat ;
elif test -f /etc/fedora-release ; then
VENDOR=fedora ;
elif test -f /etc/gentoo-release ; then
VENDOR=gentoo ;
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/arch-release ; then
VENDOR=arch ;
elif test -f /etc/lsb-release ; then
VENDOR=ubuntu ;
elif test -f /etc/lunar.release ; then
VENDOR=lunar ;
else
VENDOR= ;
fi
{ $as_echo "$as_me:$LINENO: result: $VENDOR" >&5
$as_echo "$VENDOR" >&6; }
{ $as_echo "$as_me:$LINENO: checking default package type" >&5
$as_echo_n "checking default package type... " >&6; }
case "$VENDOR" in
redhat) DEFAULT_PACKAGE=rpm ;;
fedora) DEFAULT_PACKAGE=rpm ;;
ubuntu) DEFAULT_PACKAGE=deb ;;
debian) DEFAULT_PACKAGE=deb ;;
sles) DEFAULT_PACKAGE=rpm ;;
slackware) DEFAULT_PACKAGE=tgz ;;
gentoo) DEFAULT_PACKAGE=tgz ;;
lunar) DEFAULT_PACKAGE=tgz ;;
arch) DEFAULT_PACKAGE=arch;;
*) DEFAULT_PACKAGE=rpm ;;
esac
{ $as_echo "$as_me:$LINENO: result: $DEFAULT_PACKAGE" >&5
$as_echo "$DEFAULT_PACKAGE" >&6; }
{ $as_echo "$as_me:$LINENO: checking default init directory" >&5
$as_echo_n "checking default init directory... " >&6; }
case "$VENDOR" in
arch) DEFAULT_INIT_DIR=$sysconfdir/rc.d ;;
*) DEFAULT_INIT_DIR=$sysconfdir/init.d ;;
esac
{ $as_echo "$as_me:$LINENO: result: $DEFAULT_INIT_DIR" >&5
$as_echo "$DEFAULT_INIT_DIR" >&6; }
{ $as_echo "$as_me:$LINENO: checking default init script type" >&5
$as_echo_n "checking default init script type... " >&6; }
case "$VENDOR" in
redhat) DEFAULT_INIT_SCRIPT=redhat ;;
fedora) DEFAULT_INIT_SCRIPT=fedora ;;
ubuntu) DEFAULT_INIT_SCRIPT=lsb ;;
debian) DEFAULT_INIT_SCRIPT=lsb ;;
sles) DEFAULT_INIT_SCRIPT=lsb ;;
slackware) DEFAULT_INIT_SCRIPT=lsb ;;
gentoo) DEFAULT_INIT_SCRIPT=gentoo ;;
lunar) DEFAULT_INIT_SCRIPT=lunar ;;
arch) DEFAULT_INIT_SCRIPT=arch ;;
*) DEFAULT_INIT_SCRIPT=lsb ;;
esac
{ $as_echo "$as_me:$LINENO: result: $DEFAULT_INIT_SCRIPT" >&5
$as_echo "$DEFAULT_INIT_SCRIPT" >&6; }
RPM=rpm
RPMBUILD=rpmbuild
@ -11793,6 +11870,8 @@ fi
if test "$VENDOR" = "arch"; then
PACMAN=pacman
MAKEPKG=makepkg
@ -11844,82 +11923,7 @@ fi
{ $as_echo "$as_me:$LINENO: checking linux distribution" >&5
$as_echo_n "checking linux distribution... " >&6; }
if test -f /etc/redhat-release ; then
VENDOR=redhat ;
elif test -f /etc/fedora-release ; then
VENDOR=fedora ;
elif test -f /etc/gentoo-release ; then
VENDOR=gentoo ;
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/arch-release ; then
VENDOR=arch ;
elif test -f /etc/lsb-release ; then
VENDOR=ubuntu ;
elif test -f /etc/lunar.release ; then
VENDOR=lunar ;
else
VENDOR= ;
fi
{ $as_echo "$as_me:$LINENO: result: $VENDOR" >&5
$as_echo "$VENDOR" >&6; }
{ $as_echo "$as_me:$LINENO: checking default package type" >&5
$as_echo_n "checking default package type... " >&6; }
case "$VENDOR" in
redhat) DEFAULT_PACKAGE=rpm ;;
fedora) DEFAULT_PACKAGE=rpm ;;
ubuntu) DEFAULT_PACKAGE=deb ;;
debian) DEFAULT_PACKAGE=deb ;;
sles) DEFAULT_PACKAGE=rpm ;;
slackware) DEFAULT_PACKAGE=tgz ;;
gentoo) DEFAULT_PACKAGE=tgz ;;
lunar) DEFAULT_PACKAGE=tgz ;;
arch) DEFAULT_PACKAGE=arch;;
*) DEFAULT_PACKAGE=rpm ;;
esac
{ $as_echo "$as_me:$LINENO: result: $DEFAULT_PACKAGE" >&5
$as_echo "$DEFAULT_PACKAGE" >&6; }
{ $as_echo "$as_me:$LINENO: checking default init directory" >&5
$as_echo_n "checking default init directory... " >&6; }
case "$VENDOR" in
arch) DEFAULT_INIT_DIR=$sysconfdir/rc.d ;;
*) DEFAULT_INIT_DIR=$sysconfdir/init.d ;;
esac
{ $as_echo "$as_me:$LINENO: result: $DEFAULT_INIT_DIR" >&5
$as_echo "$DEFAULT_INIT_DIR" >&6; }
{ $as_echo "$as_me:$LINENO: checking default init script type" >&5
$as_echo_n "checking default init script type... " >&6; }
case "$VENDOR" in
redhat) DEFAULT_INIT_SCRIPT=redhat ;;
fedora) DEFAULT_INIT_SCRIPT=fedora ;;
ubuntu) DEFAULT_INIT_SCRIPT=lsb ;;
debian) DEFAULT_INIT_SCRIPT=lsb ;;
sles) DEFAULT_INIT_SCRIPT=lsb ;;
slackware) DEFAULT_INIT_SCRIPT=lsb ;;
gentoo) DEFAULT_INIT_SCRIPT=gentoo ;;
lunar) DEFAULT_INIT_SCRIPT=lunar ;;
arch) DEFAULT_INIT_SCRIPT=arch ;;
*) DEFAULT_INIT_SCRIPT=lsb ;;
esac
{ $as_echo "$as_me:$LINENO: result: $DEFAULT_INIT_SCRIPT" >&5
$as_echo "$DEFAULT_INIT_SCRIPT" >&6; }
fi