From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Fri, 13 Jan 2012 17:08:12 +0000 (-0800)
Subject: Run SPL_AC_PACMAN only if $VENDOR is "arch"
X-Git-Tag: spl-0.7.12~426
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=0b14b9f32729f0e4b2c9da8b19a2bd848781d683;p=mirror_spl.git

Run SPL_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, SPL_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 zfsonlinux/zfs#517
---

diff --git a/config/spl-build.m4 b/config/spl-build.m4
index 27b2c42..a20ee38 100644
--- a/config/spl-build.m4
+++ b/config/spl-build.m4
@@ -412,11 +412,12 @@ dnl #
 dnl # Default SPL user configuration
 dnl #
 AC_DEFUN([SPL_AC_PACKAGE], [
+	SPL_AC_DEFAULT_PACKAGE
 	SPL_AC_RPM
 	SPL_AC_DPKG
 	SPL_AC_ALIEN
-	SPL_AC_PACMAN
-	SPL_AC_DEFAULT_PACKAGE
+
+	AS_IF([test "$VENDOR" = "arch"], [SPL_AC_PACMAN])
 ])
 
 AC_DEFUN([SPL_AC_LICENSE], [
diff --git a/configure b/configure
index 621773d..7b93f56 100755
--- a/configure
+++ b/configure
@@ -799,8 +799,6 @@ LINUX_VERSION
 LINUX_OBJ
 LINUX
 SPL_CONFIG
-DEFAULT_PACKAGE
-VENDOR
 MAKEPKG_VERSION
 MAKEPKG
 HAVE_MAKEPKG
@@ -822,6 +820,8 @@ HAVE_RPMBUILD
 RPM_VERSION
 RPM
 HAVE_RPM
+DEFAULT_PACKAGE
+VENDOR
 LICENSE
 CPP
 OTOOL64
@@ -11485,6 +11485,49 @@ $as_echo "$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/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 ;
+	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
+		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 ;;
+	esac
+
+	{ $as_echo "$as_me:$LINENO: result: $DEFAULT_PACKAGE" >&5
+$as_echo "$DEFAULT_PACKAGE" >&6; }
+
+
+
 	RPM=rpm
 	RPMBUILD=rpmbuild
 
@@ -11607,6 +11650,8 @@ fi
 
 
 
+	if test "$VENDOR" = "arch"; then
+
 	PACMAN=pacman
 	MAKEPKG=makepkg
 
@@ -11658,48 +11703,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/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 ;
-	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
-		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 ;;
-	esac
-
-	{ $as_echo "$as_me:$LINENO: result: $DEFAULT_PACKAGE" >&5
-$as_echo "$DEFAULT_PACKAGE" >&6; }
-
+fi