X-Git-Url: http://git.onelab.eu/?p=util-vserver-pl.git;a=blobdiff_plain;f=Makefile.am;h=4cb1e6354dec5f739fdb20cab42bdfd80aef036d;hp=950d4895fcf1908145afd29dac93f19e80780021;hb=c3c5ad082213c2530b1f0c67d1fc5341a67b8e27;hpb=8031466ca085072b4bae958ddba3c422d80b1ffc

diff --git a/Makefile.am b/Makefile.am
index 950d489..4cb1e63 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,7 +17,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #  
 
-python_vserverimpl_la_SOURCES =	python/vserverimpl.c src/planetlab.c
+python_vserverimpl_la_SOURCES =	python/vserverimpl.c src/planetlab.c src/netns.c
 python_vserverimpl_la_LIBADD =	-lvserver
 python_vserverimpl_la_CFLAGS =	-Wno-redundant-decls -I$(top_srcdir)/src $(PYTHON_INCLUDES)
 python_vserverimpl_la_LDFLAGS =	-module -avoid-version
@@ -25,8 +25,7 @@ python_vserverimpl_la_LDFLAGS =	-module -avoid-version
 src_vip6_autod_SOURCES =	src/vip6-autod.c
 src_vip6_autod_LDADD =		-lvserver -lnl
 
-src_vsh_SOURCES =		src/vsh.c src/planetlab.c
-src_vsh_LDADD =			-lvserver
+src_vsh_SOURCES =		src/vsh.c
 
 noinst_HEADERS =		src/planetlab.h
 
@@ -43,13 +42,15 @@ sbin_SCRIPTS =			python/bwlimit \
 				scripts/vuseradd \
 				scripts/vuserdel
 
-#sbin_PROGRAMS =			src/vip6-autod \
-#				src/vsh
-sbin_PROGRAMS =			src/vsh
+sbin_PROGRAMS =			src/vsh	
 
-#sysv_SCRIPTS =			sysv/vip6-autod
 sysv_SCRIPTS =			
 
+if ENSC_HAVE_LIBNL
+sbin_PROGRAMS +=		src/vip6-autod
+sysv_SCRIPTS +=			sysv/vip6-autod
+endif
+
 crondir =			$(sysconfdir)/cron.d
 
 logrotatedir =			$(sysconfdir)/logrotate.d