Reorg mobile networking support files/install

* Move common and client-side stuff to the clientside tree

* Update autconf configure scripts:

This commit bumps the version of the top-level auto-generated
script from 2.68 to 2.69.

clientside/GNUmakefile.in

@@ -23,6 +23,7 @@
 SRCDIR		= @srcdir@
 TESTBED_SRCDIR	= @top_srcdir@
 OBJDIR		= @top_builddir@
+MOBILESUPPORT   = @MOBILESUPPORT@
 SUBDIR		= $(subst $(TESTBED_SRCDIR)/,,$(SRCDIR))
 SYSTEM	       := $(shell uname -s)
 ARCH	       := $(shell uname -p)
@@ -34,6 +35,9 @@ SUBDIRS         = lib tools os sensors protogeni
 ifneq ($(EVENTSYS),0)
 SUBDIRS += event
 endif
+ifeq ($(MOBILESUPPORT),1)
+SUBDIRS += mobile
+endif
 # tmcc should be last as the freenas* install targets mess with the hierarchy
 SUBDIRS += tmcc
 

clientside/configure

@@ -622,6 +622,7 @@ ac_includes_default="\
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
 DISTCLEAN_FILES
+MOBILESUPPORT
 PYTHON_INCLUDE
 EGREP
 GREP
@@ -726,6 +727,7 @@ with_TBDEFS
 enable_windows
 enable_elvin_compat
 enable_TPM
+enable_mobile
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1353,6 +1355,7 @@ Optional Features:
   --enable-windows[=yes/no]  Enable Windows FAT/NTFS support in imagezip [default=no]
   --enable-elvin_compat[=yes/no]  Include Elvin Hash compat [default=no]
   --enable-TPM[=yes/no]           Include TPM support [default=no]
+  --enable-mobile[=yes/no]  Enable mobile support (PhantomNet) [default=no]
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -4490,6 +4493,34 @@ if test -n ${WINDOWS_KEY_7PRO_X86}; then
    winfiles="$winfiles tmcc/cygwinseven/unattend-7pro-x86.xml"
 fi
 
+# Mobile networking support
+
+MOBILESUPPORT=0
+
+# Check whether --enable-mobile was given.
+if test "${enable_mobile+set}" = set; then :
+  enableval=$enable_mobile;
+fi
+
+
+if test "$enable_mobile" = "no"; then
+	MOBILESUPPORT=0;
+elif test "$enable_mobile" = "yes"; then
+	MOBILESUPPORT=1;
+fi
+
+if test $MOBILESUPPORT -eq 0; then
+	mobilefiles=""
+else
+	mobilefiles="mobile/GNUmakefile"
+
+cat >>confdefs.h <<_ACEOF
+#define MOBILESUPPORT 1
+_ACEOF
+
+fi
+
+
 outfiles="Makeconf GNUmakefile setversion \
 	  lib/GNUmakefile \
           lib/libtb/GNUmakefile \
@@ -4566,7 +4597,8 @@ outfiles="Makeconf GNUmakefile setversion \
 	  os/imagezip/extfs/GNUmakefile \
 	  $winfiles \
 	  os/imagezip/hashmap/GNUmakefile \
-	  protogeni/GNUmakefile"
+	  protogeni/GNUmakefile \
+	  $mobilefiles"
 
 #
 # Do this for easy distclean.

clientside/configure.ac

@@ -227,6 +227,27 @@ if test -n ${WINDOWS_KEY_7PRO_X86}; then
    winfiles="$winfiles tmcc/cygwinseven/unattend-7pro-x86.xml"
 fi
 
+# Mobile networking support
+AC_SUBST(MOBILESUPPORT)
+MOBILESUPPORT=0
+
+AC_ARG_ENABLE(mobile,
+[  --enable-mobile[[=yes/no]]  Enable mobile support (PhantomNet) [[default=no]]])
+
+if test "$enable_mobile" = "no"; then
+	MOBILESUPPORT=0;
+elif test "$enable_mobile" = "yes"; then
+	MOBILESUPPORT=1;
+fi
+
+if test $MOBILESUPPORT -eq 0; then
+	mobilefiles=""
+else
+	mobilefiles="mobile/GNUmakefile"
+        AC_DEFINE_UNQUOTED(MOBILESUPPORT, 1, [Support mobile networking])
+fi
+
+
 outfiles="Makeconf GNUmakefile setversion \
 	  lib/GNUmakefile \
           lib/libtb/GNUmakefile \
@@ -303,7 +324,8 @@ outfiles="Makeconf GNUmakefile setversion \
 	  os/imagezip/extfs/GNUmakefile \
 	  $winfiles \
 	  os/imagezip/hashmap/GNUmakefile \
-	  protogeni/GNUmakefile"
+	  protogeni/GNUmakefile \
+	  $mobilefiles"
 
 #
 # Do this for easy distclean.

clientside/mobile/GNUmakefile.in

+#
+# Copyright (c) 2013-2014 University of Utah and the Flux Group.
+# 
+# {{{EMULAB-LICENSE
+# 
+# This file is part of the Emulab network testbed software.
+# 
+# This file is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+# 
+# This file is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public
+# License for more details.
+# 
+# You should have received a copy of the GNU Affero General Public License
+# along with this file.  If not, see <http://www.gnu.org/licenses/>.
+# 
+# }}}
+#
+SRCDIR		= @srcdir@
+TESTBED_SRCDIR	= @top_srcdir@
+OBJDIR		= @top_builddir@
+SUBDIR		= $(subst $(TESTBED_SRCDIR)/,,$(SRCDIR))
+TB_SBIN_DIR     = $(DESTDIR)/usr/testbed/sbin
+LIB_DIR         = $(DESTDIR)$(CLIENT_BINDIR)
+
+LIBSTUFF	= libjsonrpc.pm tbadb_rpc.pm
+SBINSTUFF	= tbadb_serv
+
+include $(OBJDIR)/Makeconf
+
+all: 
+
+include $(TESTBED_SRCDIR)/GNUmakerules
+
+client: $(LIBSTUFF) $(SBINSTUFF)
+
+client-install: client
+	-mkdir -p $(LIB_DIR) $(TB_SBIN_DIR)
+	$(INSTALL_PROGRAM) $(SRCDIR)/tbadb_serv $(TB_SBIN_DIR)
+	$(INSTALL) $(SRCDIR)/libjsonrpc.pm $(LIB_DIR)
+	$(INSTALL) $(SRCDIR)/tbadb_rpc.pm $(LIB_DIR)
+
+boss-install: $(addprefix $(INSTALL_LIBDIR)/,$(LIBSTUFF))
+
+control-install: 
+
+fs-install:
+
+subboss:
+
+subboss-install:
+
+post-install:
+
+clean:
+
+distclean:
+
+mfs:
+
+mfs-install:
+
+frisbee-mfs:
+
+frisbee-mfs-install:
+
+newnode-mfs:
+
+newnode-mfs-install:

configure.ac

@@ -1007,7 +1007,8 @@ fi
 if test $MOBILESUPPORT -eq 0; then
 	mobilefiles="";
 else
-	mobilefiles="mobile/GNUmakefile";
+	mobilefiles="mobile/GNUmakefile \
+	             clientside/mobile/GNUmakefile";
 	optional_subdirs="$optional_subdirs mobile";
 fi
 

mobile/GNUmakefile.in

@@ -25,28 +25,30 @@ SRCDIR		= @srcdir@
 TESTBED_SRCDIR	= @top_srcdir@
 OBJDIR		= ..
 SUBDIR		= mobile
+CLIENT_SRCDIR   = ${TESTBED_SRCDIR}/clientside/mobile
 
 include $(OBJDIR)/Makeconf
 
-LIB_FILES       = libjsonrpc.pm tbadb_rpc.pm
+BIN_SCRIPTS	 = tbadb
 
-BIN_SCRIPTS	= tbadb
-REMOTE_SCRIPTS  = tbadb_proxy
+# CLIENT_LIB stuff is just here to show an explicit dependency.  It
+# is installed via the Makefile in the corresponding directory.
+CLIENT_LIB_FILES = libjsonrpc.pm tbadb_rpc.pm
+CLIENT_LIBS      = $(addprefix $(CLIENT_SRCDIR)/, $(CLIENT_LIB_FILES))
 
 # These scripts installed setuid, with sudo. 
-SETUID_BIN_SCRIPTS   = tbadb
+SETUID_BIN_SCRIPTS = tbadb
 
 #
 # Force dependencies on the scripts so that they will be rerun through
 # configure if the .in file is changed.
 # 
-all:	$(BIN_SCRIPTS) $(LIB_FILES)
+all:	$(BIN_SCRIPTS) $(CLIENT_LIBS)
 
 include $(TESTBED_SRCDIR)/GNUmakerules
 
-install: \
-	$(addprefix $(INSTALL_BINDIR)/, $(BIN_SCRIPTS)) \
-	$(addprefix $(INSTALL_LIBDIR)/, $(LIB_FILES))
+install: $(BIN_SCRIPTS) \
+	$(addprefix $(INSTALL_BINDIR)/, $(BIN_SCRIPTS))
 
 post-install:
 	chown root $(INSTALL_BINDIR)/tbadb