Devel: Spindle Forest support

config.h.in

@@ -100,6 +100,9 @@
 /* The default port for Spindle */
 #undef SPINDLE_PORT
 
+/* The default number of roots in a cobo network */
+#undef SPINDLE_ROOTS
+
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 

configure

@@ -819,6 +819,7 @@ enable_fast_install
 with_gnu_ld
 with_sysroot
 enable_libtool_lock
+with_default_roots
 with_default_port
 with_default_num_ports
 with_localstorage
@@ -1526,6 +1527,8 @@ Optional Packages:
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
   --with-sysroot=DIR Search for dependent libraries within DIR
                         (or the compiler's sysroot if not specified).
+  --with-default-roots=NUM
+                          The number of roots in a cobo network
   --with-default-port=NUM TCP/IP Port for Spindle server communication
   --with-default-numports=NUM
                           Number of TCP/IP ports to scan for Spindle server
@@ -16192,11 +16195,20 @@ fi
 #Include common ops
 #Configure operations that are common between the Spindle and Spindle-client configurations
 #Network port and local storage location
+DEFAULT_ROOTS=1
 DEFAULT_PORT=21940
 DEFAULT_LOC='$TMPDIR'
 DEFAULT_NUM_COBO_PORTS=25
 
 
+# Check whether --with-default-roots was given.
+if test "${with_default_roots+set}" = set; then :
+  withval=$with_default_roots; SPINDLE_ROOTS=${withval}
+else
+  SPINDLE_ROOTS=$DEFAULT_ROOTS
+fi
+
+
 # Check whether --with-default-port was given.
 if test "${with_default_port+set}" = set; then :
   withval=$with_default_port; SPINDLE_PORT=${withval}
@@ -16221,6 +16233,11 @@ else
 fi
 
 
+cat >>confdefs.h <<_ACEOF
+#define SPINDLE_ROOTS $SPINDLE_ROOTS
+_ACEOF
+
+
 cat >>confdefs.h <<_ACEOF
 #define SPINDLE_PORT $SPINDLE_PORT
 _ACEOF

configure.common.ac

@@ -1,9 +1,14 @@
 #Configure operations that are common between the Spindle and Spindle-client configurations
 #Network port and local storage location
+DEFAULT_ROOTS=1
 DEFAULT_PORT=21940
 DEFAULT_LOC='$TMPDIR'
 DEFAULT_NUM_COBO_PORTS=25
 
+AC_ARG_WITH(default-roots,
+            [AS_HELP_STRING([--with-default-roots=NUM],[The number of roots in a cobo network])],
+            [SPINDLE_ROOTS=${withval}],
+            [SPINDLE_ROOTS=$DEFAULT_ROOTS])
 AC_ARG_WITH(default-port,
             [AS_HELP_STRING([--with-default-port=NUM],[TCP/IP Port for Spindle server communication])],
             [SPINDLE_PORT=${withval}],
@@ -16,6 +21,7 @@ AC_ARG_WITH(localstorage,
             [AS_HELP_STRING([--with-localstorage=DIR],[Directory on back-ends for storing relocated files])],
             [SPINDLE_LOC=${withval}],
             [SPINDLE_LOC=$DEFAULT_LOC])
+AC_DEFINE_UNQUOTED([SPINDLE_ROOTS],[$SPINDLE_ROOTS],[The default number of roots in a cobo network])
 AC_DEFINE_UNQUOTED([SPINDLE_PORT],[$SPINDLE_PORT],[The default port for Spindle])
 AC_DEFINE_UNQUOTED([NUM_COBO_PORTS],[$NUM_COBO_PORTS],[Number of ports for COBO to search for an open port])
 AC_DEFINE_UNQUOTED([SPINDLE_MAX_PORT],[$(($SPINDLE_PORT + $NUM_COBO_PORTS - 1))],[The maximum port value])

src/client/config.h.in

@@ -94,6 +94,9 @@
 /* The default port for Spindle */
 #undef SPINDLE_PORT
 
+/* The default number of roots in a cobo network */
+#undef SPINDLE_ROOTS
+
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 

src/client/configure

@@ -784,6 +784,7 @@ enable_fast_install
 with_gnu_ld
 with_sysroot
 enable_libtool_lock
+with_default_roots
 with_default_port
 with_default_num_ports
 with_localstorage
@@ -1469,6 +1470,8 @@ Optional Packages:
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
   --with-sysroot=DIR Search for dependent libraries within DIR
                         (or the compiler's sysroot if not specified).
+  --with-default-roots=NUM
+                          The number of roots in a cobo network
   --with-default-port=NUM TCP/IP Port for Spindle server communication
   --with-default-numports=NUM
                           Number of TCP/IP ports to scan for Spindle server
@@ -12401,11 +12404,20 @@ CC="$lt_save_CC"
 
 #Configure operations that are common between the Spindle and Spindle-client configurations
 #Network port and local storage location
+DEFAULT_ROOTS=1
 DEFAULT_PORT=21940
 DEFAULT_LOC='$TMPDIR'
 DEFAULT_NUM_COBO_PORTS=25
 
 
+# Check whether --with-default-roots was given.
+if test "${with_default_roots+set}" = set; then :
+  withval=$with_default_roots; SPINDLE_ROOTS=${withval}
+else
+  SPINDLE_ROOTS=$DEFAULT_ROOTS
+fi
+
+
 # Check whether --with-default-port was given.
 if test "${with_default_port+set}" = set; then :
   withval=$with_default_port; SPINDLE_PORT=${withval}
@@ -12430,6 +12442,11 @@ else
 fi
 
 
+cat >>confdefs.h <<_ACEOF
+#define SPINDLE_ROOTS $SPINDLE_ROOTS
+_ACEOF
+
+
 cat >>confdefs.h <<_ACEOF
 #define SPINDLE_PORT $SPINDLE_PORT
 _ACEOF