ALL += fprobe-ulog
IN_NODEIMAGE += fprobe-ulog
-#################### using our own libvirt on all distros for now
-#local_libvirt=false
-#ifeq "$(DISTRONAME)" "f16"
+#################### using our own libvirt on f18, and the stock version later on
+local_libvirt=false
+ifeq "$(DISTRONAME)" "f18"
local_libvirt=true
-#endif
+endif
ifeq "$(local_libvirt)" "true"
#
# strictly speaking fuse-devel is not required anymore but we might wish to turn fuse back on again in the future
ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f18 f20)"
libvirt-STOCK-DEVEL-RPMS += fuse-devel libssh2-devel dbus-devel numad
-libvirt-STOCK-DEVEL-RPMS += systemd-devel libnl3-devel iptables-ipv6
+libvirt-STOCK-DEVEL-RPMS += systemd-devel libnl3-devel iptables-ipv6 libgcrypt-devel
endif
libvirt-RPMFLAGS := --define 'packager PlanetLab'
ALL += libvirt
sfa-SPEC := sfa.spec
ALL += sfa
-sface-MODULES := sface
-sface-SPEC := sface.spec
-ALL += sface
+#sface-MODULES := sface
+#sface-SPEC := sface.spec
+#ALL += sface
endif
##############################