ArduSub: correct compilation with rally disabled

ArduSub/Parameters.cpp

@@ -549,7 +549,7 @@ const AP_Param::Info Sub::var_info[] = {
     GOBJECT(avoid,      "AVOID_",   AC_Avoid),
 #endif
 
-#if AC_RALLY == ENABLED
+#if HAL_RALLY_ENABLED
     // @Group: RALLY_
     // @Path: ../libraries/AP_Rally/AP_Rally.cpp
     GOBJECT(rally,      "RALLY_",   AP_Rally),

ArduSub/Sub.h

@@ -95,10 +95,6 @@
 #include <AC_Avoidance/AC_Avoid.h>           // Stop at fence library
 #endif
 
-#if AC_RALLY == ENABLED
-#include <AP_Rally/AP_Rally.h>           // Rally point library
-#endif
-
 #include <AP_Camera/AP_Camera.h>          // Photo or video camera
 
 #if AP_SCRIPTING_ENABLED
@@ -348,7 +344,7 @@ private:
 #endif
 
     // Rally library
-#if AC_RALLY == ENABLED
+#if HAL_RALLY_ENABLED
     AP_Rally rally;
 #endif
 

ArduSub/config.h

@@ -214,7 +214,3 @@
     MASK_LOG_CAMERA | \
     MASK_LOG_MOTBATT
 #endif
-
-#ifndef AC_RALLY
-#define AC_RALLY   DISABLED
-#endif