New configure variable: PLABSUPPORT . If set to 1, the tbsetup/plab

tree gets installed. I've set it for our default defs, and for all
the *-emulab devel defs files.

configure

@@ -2,7 +2,7 @@
 
 # Guess values for system-dependent variables and create Makefiles.
 # Generated automatically using autoconf version 2.13 
-# Copyright (C) 1992, 93, 94, 95, 96, 03 Free Software Foundation, Inc.
+# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
 #
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
@@ -863,6 +863,7 @@ fi
 
 
 
+
 
 
 #
@@ -903,6 +904,7 @@ JAILIPBASE=172.17.0.0
 JAILIPMASK=255.240.0.0
 IPBASE=10
 SFSSUPPORT=1
+PLABSUPPORT=0
 
 #
 # Okay, I know this is improper usage of --with. Too bad.
@@ -1274,7 +1276,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1277: checking for a BSD compatible install" >&5
+echo "configure:1280: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1610,6 +1612,7 @@ s%@TBAUTHDOMAIN@%$TBAUTHDOMAIN%g
 s%@TBAUTHTIMEOUT@%$TBAUTHTIMEOUT%g
 s%@TBMAINSITE@%$TBMAINSITE%g
 s%@SFSSUPPORT@%$SFSSUPPORT%g
+s%@PLABSUPPORT@%$PLABSUPPORT%g
 s%@TBOPSEMAIL@%$TBOPSEMAIL%g
 s%@TBOPSEMAIL_NOSLASH@%$TBOPSEMAIL_NOSLASH%g
 s%@TBLOGSEMAIL@%$TBLOGSEMAIL%g

configure.in

@@ -56,6 +56,7 @@ AC_SUBST(TBAUTHDOMAIN)
 AC_SUBST(TBAUTHTIMEOUT)
 AC_SUBST(TBMAINSITE)
 AC_SUBST(SFSSUPPORT)
+AC_SUBST(PLABSUPPORT)
 
 #
 # Offer both versions of the email addresses that have the @ escaped
@@ -95,6 +96,7 @@ JAILIPBASE=172.17.0.0
 JAILIPMASK=255.240.0.0
 IPBASE=10
 SFSSUPPORT=1
+PLABSUPPORT=0
 
 #
 # Okay, I know this is improper usage of --with. Too bad.

defs-barb-emulab

@@ -20,3 +20,4 @@ TBTESTSUITEEMAIL=barb@cs.utah.edu
 WWWHOST=www.emulab.net
 WWW=www.emulab.net/~barb/www
 FS_WITH_QUOTAS="/q /users"
+PLABSUPPORT=1

defs-calfeld-emulab

@@ -23,3 +23,4 @@ TBTESTSUITEEMAIL=calfeld@flux.cs.utah.edu
 WWWHOST=www.emulab.net
 THISHOMEBASE=Emulab.Net
 FS_WITH_QUOTAS="/q /users"
+PLABSUPPORT=1

defs-default

@@ -32,3 +32,4 @@ FS_WITH_QUOTAS="/q /users"
 WWWHOST=www.emulab.net
 TBMAINSITE=1
 THISHOMEBASE=Emulab.Net
+PLABSUPPORT=1

defs-kwebb-emulab

@@ -19,3 +19,4 @@ TBTESTSUITEEMAIL=kwebb@cs.utah.edu
 WWWHOST=www.emulab.net
 WWW=www.emulab.net/~kwebb/www
 FS_WITH_QUOTAS="/q /users"
+PLABSUPPORT=1

defs-newbold-emulab

@@ -22,3 +22,4 @@ WWW=www.emulab.net/dev/mac
 THISHOMEBASE=Mac.Emulab.Net
 TBAUTHTIMEOUT=216000
 FS_WITH_QUOTAS="/q /users"
+PLABSUPPORT=1

defs-rchriste-emulab

@@ -20,3 +20,4 @@ TBTESTSUITEEMAIL=rchriste@cs.utah.edu
 WWWHOST=www.emulab.net
 WWW=www.emulab.net/~ricci/www
 FS_WITH_QUOTAS="/q /users"
+PLABSUPPORT=1

defs-ricci-emulab

@@ -24,3 +24,4 @@ FSDIR_USERS=/users
 WWWHOST=www.emulab.net
 WWW=www.emulab.net/dev/ricci
 FS_WITH_QUOTAS="/q /users"
+PLABSUPPORT=1

defs-shash-emulab

@@ -23,3 +23,4 @@ WWWHOST=www.emulab.net
 WWW=www.emulab.net/dev/shash
 THISHOMEBASE=Shash.Emulab.Net
 FS_WITH_QUOTAS="/q /users"
+PLABSUPPORT=1

defs-stoller-emulab

@@ -22,3 +22,4 @@ WWWHOST=www.emulab.net
 WWW=www.emulab.net/dev/stoller
 THISHOMEBASE=Stoller.Emulab.Net
 FS_WITH_QUOTAS="/q /users"
+PLABSUPPORT=1

tbsetup/GNUmakefile.in

@@ -9,6 +9,7 @@ TESTBED_SRCDIR	= @top_srcdir@
 OBJDIR		= ..
 SUBDIR		= tbsetup
 UNIFIED         = @UNIFIED_BOSS_AND_OPS@
+PLABSUPPORT     = @PLABSUPPORT@
 
 include $(OBJDIR)/Makeconf
 
@@ -76,13 +77,24 @@ plab:
 install: all script-install subdir-install
 	@echo "Don't forget to do a post-install as root"
 
+#
+# Only install the planetlab support if enabled in the defs file
+#
+ifeq ($(PLABSUPPORT),1)
+PLAB_INSTALL      = @$(MAKE) -C plab install
+PLAB_POST_INSTALL = @$(MAKE) -C plab post-install 
+else
+PLAB_INSTALL      =
+PLAB_POST_INSTALL =
+endif
+
 #
 # Automate this part at some point.
 # 
 subdir-install:
 	@$(MAKE) -C checkpass install	
 	@$(MAKE) -C ns2ir install
-#	@$(MAKE) -C plab install
+	$(PLAB_INSTALL)
 
 script-install:	$(addprefix $(INSTALL_BINDIR)/, $(BIN_STUFF)) \
 	 $(addprefix $(INSTALL_SBINDIR)/, $(SBIN_STUFF)) \
@@ -92,7 +104,7 @@ script-install:	$(addprefix $(INSTALL_BINDIR)/, $(BIN_STUFF)) \
 
 post-install: 
 	@$(MAKE) -C ns2ir post-install
-#	@$(MAKE) -C plab post-install
+	$(PLAB_POST_INSTALL)
 	chmod 775 $(INSTALL_BINDIR)
 	chmod 775 $(INSTALL_SBINDIR)
 	chmod 775 $(INSTALL_LIBDIR)