SPECS: aufs.spec - vserver bcond removed, autodetection

[zbyniu]

Author: zbyniu                       Date: Wed Mar 19 14:59:26 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- vserver bcond removed, autodetection

---- Files affected:
SPECS:
   aufs.spec (1.20 -> 1.21) 

---- Diffs:

================================================================
Index: SPECS/aufs.spec
diff -u SPECS/aufs.spec:1.20 SPECS/aufs.spec:1.21
--- SPECS/aufs.spec:1.20	Fri Mar 14 00:28:26 2008
+++ SPECS/aufs.spec	Wed Mar 19 15:59:21 2008
@@ -5,7 +5,6 @@
 %bcond_without	kernel		# don't build kernel modules
 %bcond_without	userspace	# don't build userspace programs
 %bcond_with	verbose		# verbose build (V=1)
-%bcond_without	vserver		# kernel build without vserver & grsecurity
 
 %if %{without kernel}
 %undefine	with_dist_kernel
@@ -75,9 +74,7 @@
 
 %prep
 %setup -qn %{name}
-%if %{with vserver}
 %patch0 -p1
-%endif
 %patch1 -p1
 
 sed '
@@ -91,6 +88,9 @@
 
 %build
 %if %{with kernel}
+if [ -f %{_kernelsrcdir}/include/linux/vs_base.h ]; then
+	isvserver="-DVSERVER"
+fi
 %build_kernel_modules -C fs/aufs -m aufs \
 	EXTRA_CFLAGS=" \
 		-DCONFIG_AUFS_BRANCH_MAX_127 \
@@ -100,7 +100,7 @@
 		-UCONFIG_AUFS_KSIZE_PATCH \
 		-UCONFIG_AUFS_DLGT \
 		%{?debug:-DCONFIG_AUFS_DEBUG} \
-		%{?with_vserver:-DVSERVER}"
+		$isvserver"
 %endif
 
 %if %{with userspace}
@@ -152,6 +152,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.21  2008-03-19 14:59:21  zbyniu
+- vserver bcond removed, autodetection
+
 Revision 1.20  2008-03-13 23:28:26  zbyniu
 - up to 20080313 snap
 - patch to disable security_inode_permission export in kernel (needs check)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/aufs.spec?r1=1.20&r2=1.21&f=u