Fix build with CCS disabled

Author: evan-charmworks

src/scripts/configure.ac

@@ -263,6 +263,21 @@ else
   AC_DEFINE_UNQUOTED(CMK_DRONE_MODE, 1, [enable drone mode])
 fi
 
+AC_ARG_ENABLE([ccs],
+            [AS_HELP_STRING([--enable-ccs],
+              [enable CCS])], ,
+            [enable_ccs=yes])
+
+if test "$enable_ccs" = "no" -o "$CMK_CCS_AVAILABLE" = '0'
+then
+  Echo "CCS is disabled"
+  AC_DEFINE_UNQUOTED(CMK_CCS_AVAILABLE, 0, [disable ccs])
+  CMK_CCS_AVAILABLE='0'
+else
+  Echo "CCS is enabled"
+  AC_DEFINE_UNQUOTED(CMK_CCS_AVAILABLE, 1, [enable ccs])
+fi
+
 AC_ARG_ENABLE([charmdebug],
             [AS_HELP_STRING([--enable-charmdebug],
               [enable charmDebug])], ,
@@ -302,20 +317,6 @@ else
   fi
 fi
 
-AC_ARG_ENABLE([ccs],
-            [AS_HELP_STRING([--enable-ccs],
-              [enable CCS])], ,
-            [enable_ccs=yes])
-
-if test "$enable_ccs" = "no" -o "$CMK_CCS_AVAILABLE" = '0'
-then
-  Echo "CCS is disabled" 
-  AC_DEFINE_UNQUOTED(CMK_CCS_AVAILABLE, 0, [disable ccs])
-else
-  Echo "CCS is enabled" 
-  AC_DEFINE_UNQUOTED(CMK_CCS_AVAILABLE, 1, [enable ccs])
-fi
-
 AC_ARG_ENABLE([controlpoint],
             [AS_HELP_STRING([--enable-controlpoint],
               [enable control point])],

src/util/charmrun-src/charmrun.C

@@ -1872,7 +1872,7 @@ static int req_ccs_reply_fw(ChMessage *msg, SOCKET srcFd)
 }
 
 #else
-static int req_ccs_reply_fw(ChMessage *msg, SOCKET srcFd) {}
+static inline void req_ccs_connect() { }
 #endif /*CMK_CCS_AVAILABLE*/
 
 /****************************************************************************
@@ -2158,23 +2158,29 @@ static int req_handle_print(ChMessage *msg, SOCKET fd)
 {
   checkPrintfError(printf("%s", msg->data));
   checkPrintfError(fflush(stdout));
+#if CMK_CCS_AVAILABLE
   write_stdio_duplicate(msg->data);
+#endif
   return REQ_OK;
 }
 
 static int req_handle_printerr(ChMessage *msg, SOCKET fd)
 {
   fprintf(stderr, "%s", msg->data);
   fflush(stderr);
+#if CMK_CCS_AVAILABLE
   write_stdio_duplicate(msg->data);
+#endif
   return REQ_OK;
 }
 
 static int req_handle_printsyn(ChMessage *msg, SOCKET fd)
 {
   checkPrintfError(printf("%s", msg->data));
   checkPrintfError(fflush(stdout));
+#if CMK_CCS_AVAILABLE
   write_stdio_duplicate(msg->data);
+#endif
 #ifdef HSTART
   if (arg_hierarchical_start)
     req_reply_child(fd, "printdone", "", 1);
@@ -2188,7 +2194,9 @@ static int req_handle_printerrsyn(ChMessage *msg, SOCKET fd)
 {
   fprintf(stderr, "%s", msg->data);
   fflush(stderr);
+#if CMK_CCS_AVAILABLE
   write_stdio_duplicate(msg->data);
+#endif
 #ifdef HSTART
   if (arg_hierarchical_start)
     req_reply_child(fd, "printdone", "", 1);