[channels,gfxredir] use common channel variables

channels/gfxredir/CMakeLists.txt

@@ -15,9 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-if(WITH_CHANNEL_GFXREDIR)
-  define_channel("gfxredir")
-  if(WITH_SERVER_CHANNELS)
-    add_channel_server(${MODULE_PREFIX} ${CHANNEL_NAME})
-  endif()
+define_channel("gfxredir")
+if(WITH_SERVER_CHANNELS)
+  add_channel_server(${MODULE_PREFIX} ${CHANNEL_NAME})
 endif()

channels/gfxredir/ChannelOptions.cmake

@@ -1,22 +1,20 @@
-if(WITH_CHANNEL_GFXREDIR)
-  set(OPTION_DEFAULT ON)
-  set(OPTION_CLIENT_DEFAULT OFF)
-  set(OPTION_SERVER_DEFAULT ON)
+set(OPTION_DEFAULT OFF)
+set(OPTION_CLIENT_DEFAULT ON)
+set(OPTION_SERVER_DEFAULT ON)
 
-  define_channel_options(
-    NAME
-    "gfxredir"
-    TYPE
-    "dynamic"
-    DESCRIPTION
-    "Graphics Redirection Virtual Channel Extension"
-    SPECIFICATIONS
-    "[MS-RDPXXXX]"
-    DEFAULT
-    ${OPTION_DEFAULT}
-    CLIENT_DEFAULT
-    ${OPTION_CLIENT_DEFAULT}
-    SERVER_DEFAULT
-    ${OPTION_SERVER_DEFAULT}
-  )
-endif()
+define_channel_options(
+  NAME
+  "gfxredir"
+  TYPE
+  "dynamic"
+  DESCRIPTION
+  "Graphics Redirection Virtual Channel Extension"
+  SPECIFICATIONS
+  "[MS-RDPXXXX]"
+  DEFAULT
+  ${OPTION_DEFAULT}
+  CLIENT_DEFAULT
+  ${OPTION_CLIENT_DEFAULT}
+  SERVER_DEFAULT
+  ${OPTION_SERVER_DEFAULT}
+)